From ec7dc2cb48ebb473058467c5e9a248d6969daa06 Mon Sep 17 00:00:00 2001 From: "kaosat.dev" Date: Wed, 17 Jul 2024 23:15:36 +0200 Subject: [PATCH] chore(Blenvy): tweaks, adjustements, moved examples etc --- README.md | 2 +- TODO.md | 3 ++- crates/blenvy/README.md | 2 +- examples/{ => blenvy}/demo/Cargo.toml | 0 examples/{ => blenvy}/demo/README.md | 0 examples/{ => blenvy}/demo/art/common.blend | Bin examples/{ => blenvy}/demo/art/level1.blend | Bin examples/{ => blenvy}/demo/art/level2.blend | Bin examples/{ => blenvy}/demo/art/start_level.blend | Bin .../assets/materials/common_materials_library.glb | Bin examples/{ => blenvy}/demo/assets/models/Level1.glb | Bin examples/{ => blenvy}/demo/assets/models/Level2.glb | Bin .../{ => blenvy}/demo/assets/models/StartLevel.glb | Bin .../demo/assets/models/library/Container.glb | Bin .../demo/assets/models/library/Crystal.glb | Bin .../demo/assets/models/library/Health_Pickup.glb | Bin .../demo/assets/models/library/Interactible.glb | Bin .../demo/assets/models/library/LevelTransition.glb | Bin .../demo/assets/models/library/MagicTeapot.glb | Bin .../demo/assets/models/library/Nest_test.glb | Bin .../demo/assets/models/library/Pillar.glb | Bin .../demo/assets/models/library/Player.glb | Bin .../demo/assets/models/library/Portal.glb | Bin .../demo/assets/models/library/Rock Pile.glb | Bin .../demo/assets/models/library/Rock.glb | Bin .../demo/assets/models/library/Sub_blueprint.glb | Bin .../demo/assets/models/library/Template_Demo.glb | Bin .../assets/models/library/Unused_in_level_test.glb | Bin .../demo/assets/models/library/Wall.glb | Bin examples/{ => blenvy}/demo/src/core/audio/mod.rs | 0 .../demo/src/core/camera/camera_replace_proxies.rs | 0 .../demo/src/core/camera/camera_tracking.rs | 0 examples/{ => blenvy}/demo/src/core/camera/mod.rs | 0 examples/{ => blenvy}/demo/src/core/mod.rs | 0 .../demo/src/core/physics_rapier/controls.rs | 0 .../demo/src/core/physics_rapier/mod.rs | 0 .../core/physics_rapier/physics_replace_proxies.rs | 0 .../demo/src/core/physics_rapier/utils.rs | 0 .../demo/src/core/physics_xpbd/controls.rs | 0 .../{ => blenvy}/demo/src/core/physics_xpbd/mod.rs | 0 .../core/physics_xpbd/physics_replace_proxies.rs | 0 .../demo/src/core/physics_xpbd/utils.rs | 0 .../{ => blenvy}/demo/src/core/relationships/mod.rs | 0 .../relationships_insert_dependant_components.rs | 0 examples/{ => blenvy}/demo/src/game/in_game.rs | 0 examples/{ => blenvy}/demo/src/game/in_main_menu.rs | 0 .../{ => blenvy}/demo/src/game/interactions/mod.rs | 0 .../{ => blenvy}/demo/src/game/level_transitions.rs | 0 examples/{ => blenvy}/demo/src/game/mod.rs | 0 examples/{ => blenvy}/demo/src/game/picking/mod.rs | 0 examples/{ => blenvy}/demo/src/game/player/mod.rs | 0 examples/{ => blenvy}/demo/src/main.rs | 0 examples/{ => blenvy}/demo/src/state.rs | 0 examples/{ => blenvy}/demo/src/test_components.rs | 0 examples/demo/assets/assets_core.assets.ron | 1 - examples/demo/assets/assets_game.assets.ron | 12 ------------ 56 files changed, 4 insertions(+), 16 deletions(-) rename examples/{ => blenvy}/demo/Cargo.toml (100%) rename examples/{ => blenvy}/demo/README.md (100%) rename examples/{ => blenvy}/demo/art/common.blend (100%) rename examples/{ => blenvy}/demo/art/level1.blend (100%) rename examples/{ => blenvy}/demo/art/level2.blend (100%) rename examples/{ => blenvy}/demo/art/start_level.blend (100%) rename examples/{ => blenvy}/demo/assets/materials/common_materials_library.glb (100%) rename examples/{ => blenvy}/demo/assets/models/Level1.glb (100%) rename examples/{ => blenvy}/demo/assets/models/Level2.glb (100%) rename examples/{ => blenvy}/demo/assets/models/StartLevel.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Container.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Crystal.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Health_Pickup.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Interactible.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/LevelTransition.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/MagicTeapot.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Nest_test.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Pillar.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Player.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Portal.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Rock Pile.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Rock.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Sub_blueprint.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Template_Demo.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Unused_in_level_test.glb (100%) rename examples/{ => blenvy}/demo/assets/models/library/Wall.glb (100%) rename examples/{ => blenvy}/demo/src/core/audio/mod.rs (100%) rename examples/{ => blenvy}/demo/src/core/camera/camera_replace_proxies.rs (100%) rename examples/{ => blenvy}/demo/src/core/camera/camera_tracking.rs (100%) rename examples/{ => blenvy}/demo/src/core/camera/mod.rs (100%) rename examples/{ => blenvy}/demo/src/core/mod.rs (100%) rename examples/{ => blenvy}/demo/src/core/physics_rapier/controls.rs (100%) rename examples/{ => blenvy}/demo/src/core/physics_rapier/mod.rs (100%) rename examples/{ => blenvy}/demo/src/core/physics_rapier/physics_replace_proxies.rs (100%) rename examples/{ => blenvy}/demo/src/core/physics_rapier/utils.rs (100%) rename examples/{ => blenvy}/demo/src/core/physics_xpbd/controls.rs (100%) rename examples/{ => blenvy}/demo/src/core/physics_xpbd/mod.rs (100%) rename examples/{ => blenvy}/demo/src/core/physics_xpbd/physics_replace_proxies.rs (100%) rename examples/{ => blenvy}/demo/src/core/physics_xpbd/utils.rs (100%) rename examples/{ => blenvy}/demo/src/core/relationships/mod.rs (100%) rename examples/{ => blenvy}/demo/src/core/relationships/relationships_insert_dependant_components.rs (100%) rename examples/{ => blenvy}/demo/src/game/in_game.rs (100%) rename examples/{ => blenvy}/demo/src/game/in_main_menu.rs (100%) rename examples/{ => blenvy}/demo/src/game/interactions/mod.rs (100%) rename examples/{ => blenvy}/demo/src/game/level_transitions.rs (100%) rename examples/{ => blenvy}/demo/src/game/mod.rs (100%) rename examples/{ => blenvy}/demo/src/game/picking/mod.rs (100%) rename examples/{ => blenvy}/demo/src/game/player/mod.rs (100%) rename examples/{ => blenvy}/demo/src/main.rs (100%) rename examples/{ => blenvy}/demo/src/state.rs (100%) rename examples/{ => blenvy}/demo/src/test_components.rs (100%) delete mode 100644 examples/demo/assets/assets_core.assets.ron delete mode 100644 examples/demo/assets/assets_game.assets.ron diff --git a/README.md b/README.md index 530ec1f..1e41299 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ It also allows you to setup 'blueprints' in Blender by using collections (the re One crate to rule them all ! -- [blenvy](./crates/blenvu/) This crate allows you to +- [blenvy](./crates/blenvy/) This crate allows you to * define components direclty inside gltf files and instanciate/inject the components on the Bevy side. * export your project's Bevy registry to json, in order to be able to generate custom component UIs on the Blender side in the Blender [blenvy](./tools/blenvy/README.md) add-on * define Blueprints/Prefabs for Bevy inside gltf files and spawn them in Bevy. With the ability to override and add components when spawning, efficient "level" loading etc diff --git a/TODO.md b/TODO.md index 10d9a3d..03f0397 100644 --- a/TODO.md +++ b/TODO.md @@ -301,7 +301,8 @@ Bevy Side: - [x] remove "Library" component & co - [x] make "InBlueprint" non optional, -- [ ] and perhaps rename it to "FromBlueprint(BlueprintInfo)" +- [x] and perhaps rename it to "FromBlueprint" +- [ ] perhaps change it to FromBlueprint(BlueprintInfo) - [x] BlueprintInstanceDisabled => BlueprintInstanceDisabled - [x] fix "remove component" operator from the rename/fix/update components panel diff --git a/crates/blenvy/README.md b/crates/blenvy/README.md index dcffd1b..75ebbcf 100644 --- a/crates/blenvy/README.md +++ b/crates/blenvy/README.md @@ -199,7 +199,7 @@ There is also a ```BluePrintBundle``` for convenience , which just has ## Additional information -- When a blueprint is spawned, an ```InBlueprint``` component is inserted into all its children entities (and nested children etc) +- When a blueprint is spawned, an ```FromBlueprint``` component is inserted into all its children entities (and nested children etc) - this crate also provides a special optional ```GameWorldTag``` component: this is useful when you want to keep all your spawned entities inside a root entity You can use it in your queries to add your entities as children of this "world" diff --git a/examples/demo/Cargo.toml b/examples/blenvy/demo/Cargo.toml similarity index 100% rename from examples/demo/Cargo.toml rename to examples/blenvy/demo/Cargo.toml diff --git a/examples/demo/README.md b/examples/blenvy/demo/README.md similarity index 100% rename from examples/demo/README.md rename to examples/blenvy/demo/README.md diff --git a/examples/demo/art/common.blend b/examples/blenvy/demo/art/common.blend similarity index 100% rename from examples/demo/art/common.blend rename to examples/blenvy/demo/art/common.blend diff --git a/examples/demo/art/level1.blend b/examples/blenvy/demo/art/level1.blend similarity index 100% rename from examples/demo/art/level1.blend rename to examples/blenvy/demo/art/level1.blend diff --git a/examples/demo/art/level2.blend b/examples/blenvy/demo/art/level2.blend similarity index 100% rename from examples/demo/art/level2.blend rename to examples/blenvy/demo/art/level2.blend diff --git a/examples/demo/art/start_level.blend b/examples/blenvy/demo/art/start_level.blend similarity index 100% rename from examples/demo/art/start_level.blend rename to examples/blenvy/demo/art/start_level.blend diff --git a/examples/demo/assets/materials/common_materials_library.glb b/examples/blenvy/demo/assets/materials/common_materials_library.glb similarity index 100% rename from examples/demo/assets/materials/common_materials_library.glb rename to examples/blenvy/demo/assets/materials/common_materials_library.glb diff --git a/examples/demo/assets/models/Level1.glb b/examples/blenvy/demo/assets/models/Level1.glb similarity index 100% rename from examples/demo/assets/models/Level1.glb rename to examples/blenvy/demo/assets/models/Level1.glb diff --git a/examples/demo/assets/models/Level2.glb b/examples/blenvy/demo/assets/models/Level2.glb similarity index 100% rename from examples/demo/assets/models/Level2.glb rename to examples/blenvy/demo/assets/models/Level2.glb diff --git a/examples/demo/assets/models/StartLevel.glb b/examples/blenvy/demo/assets/models/StartLevel.glb similarity index 100% rename from examples/demo/assets/models/StartLevel.glb rename to examples/blenvy/demo/assets/models/StartLevel.glb diff --git a/examples/demo/assets/models/library/Container.glb b/examples/blenvy/demo/assets/models/library/Container.glb similarity index 100% rename from examples/demo/assets/models/library/Container.glb rename to examples/blenvy/demo/assets/models/library/Container.glb diff --git a/examples/demo/assets/models/library/Crystal.glb b/examples/blenvy/demo/assets/models/library/Crystal.glb similarity index 100% rename from examples/demo/assets/models/library/Crystal.glb rename to examples/blenvy/demo/assets/models/library/Crystal.glb diff --git a/examples/demo/assets/models/library/Health_Pickup.glb b/examples/blenvy/demo/assets/models/library/Health_Pickup.glb similarity index 100% rename from examples/demo/assets/models/library/Health_Pickup.glb rename to examples/blenvy/demo/assets/models/library/Health_Pickup.glb diff --git a/examples/demo/assets/models/library/Interactible.glb b/examples/blenvy/demo/assets/models/library/Interactible.glb similarity index 100% rename from examples/demo/assets/models/library/Interactible.glb rename to examples/blenvy/demo/assets/models/library/Interactible.glb diff --git a/examples/demo/assets/models/library/LevelTransition.glb b/examples/blenvy/demo/assets/models/library/LevelTransition.glb similarity index 100% rename from examples/demo/assets/models/library/LevelTransition.glb rename to examples/blenvy/demo/assets/models/library/LevelTransition.glb diff --git a/examples/demo/assets/models/library/MagicTeapot.glb b/examples/blenvy/demo/assets/models/library/MagicTeapot.glb similarity index 100% rename from examples/demo/assets/models/library/MagicTeapot.glb rename to examples/blenvy/demo/assets/models/library/MagicTeapot.glb diff --git a/examples/demo/assets/models/library/Nest_test.glb b/examples/blenvy/demo/assets/models/library/Nest_test.glb similarity index 100% rename from examples/demo/assets/models/library/Nest_test.glb rename to examples/blenvy/demo/assets/models/library/Nest_test.glb diff --git a/examples/demo/assets/models/library/Pillar.glb b/examples/blenvy/demo/assets/models/library/Pillar.glb similarity index 100% rename from examples/demo/assets/models/library/Pillar.glb rename to examples/blenvy/demo/assets/models/library/Pillar.glb diff --git a/examples/demo/assets/models/library/Player.glb b/examples/blenvy/demo/assets/models/library/Player.glb similarity index 100% rename from examples/demo/assets/models/library/Player.glb rename to examples/blenvy/demo/assets/models/library/Player.glb diff --git a/examples/demo/assets/models/library/Portal.glb b/examples/blenvy/demo/assets/models/library/Portal.glb similarity index 100% rename from examples/demo/assets/models/library/Portal.glb rename to examples/blenvy/demo/assets/models/library/Portal.glb diff --git a/examples/demo/assets/models/library/Rock Pile.glb b/examples/blenvy/demo/assets/models/library/Rock Pile.glb similarity index 100% rename from examples/demo/assets/models/library/Rock Pile.glb rename to examples/blenvy/demo/assets/models/library/Rock Pile.glb diff --git a/examples/demo/assets/models/library/Rock.glb b/examples/blenvy/demo/assets/models/library/Rock.glb similarity index 100% rename from examples/demo/assets/models/library/Rock.glb rename to examples/blenvy/demo/assets/models/library/Rock.glb diff --git a/examples/demo/assets/models/library/Sub_blueprint.glb b/examples/blenvy/demo/assets/models/library/Sub_blueprint.glb similarity index 100% rename from examples/demo/assets/models/library/Sub_blueprint.glb rename to examples/blenvy/demo/assets/models/library/Sub_blueprint.glb diff --git a/examples/demo/assets/models/library/Template_Demo.glb b/examples/blenvy/demo/assets/models/library/Template_Demo.glb similarity index 100% rename from examples/demo/assets/models/library/Template_Demo.glb rename to examples/blenvy/demo/assets/models/library/Template_Demo.glb diff --git a/examples/demo/assets/models/library/Unused_in_level_test.glb b/examples/blenvy/demo/assets/models/library/Unused_in_level_test.glb similarity index 100% rename from examples/demo/assets/models/library/Unused_in_level_test.glb rename to examples/blenvy/demo/assets/models/library/Unused_in_level_test.glb diff --git a/examples/demo/assets/models/library/Wall.glb b/examples/blenvy/demo/assets/models/library/Wall.glb similarity index 100% rename from examples/demo/assets/models/library/Wall.glb rename to examples/blenvy/demo/assets/models/library/Wall.glb diff --git a/examples/demo/src/core/audio/mod.rs b/examples/blenvy/demo/src/core/audio/mod.rs similarity index 100% rename from examples/demo/src/core/audio/mod.rs rename to examples/blenvy/demo/src/core/audio/mod.rs diff --git a/examples/demo/src/core/camera/camera_replace_proxies.rs b/examples/blenvy/demo/src/core/camera/camera_replace_proxies.rs similarity index 100% rename from examples/demo/src/core/camera/camera_replace_proxies.rs rename to examples/blenvy/demo/src/core/camera/camera_replace_proxies.rs diff --git a/examples/demo/src/core/camera/camera_tracking.rs b/examples/blenvy/demo/src/core/camera/camera_tracking.rs similarity index 100% rename from examples/demo/src/core/camera/camera_tracking.rs rename to examples/blenvy/demo/src/core/camera/camera_tracking.rs diff --git a/examples/demo/src/core/camera/mod.rs b/examples/blenvy/demo/src/core/camera/mod.rs similarity index 100% rename from examples/demo/src/core/camera/mod.rs rename to examples/blenvy/demo/src/core/camera/mod.rs diff --git a/examples/demo/src/core/mod.rs b/examples/blenvy/demo/src/core/mod.rs similarity index 100% rename from examples/demo/src/core/mod.rs rename to examples/blenvy/demo/src/core/mod.rs diff --git a/examples/demo/src/core/physics_rapier/controls.rs b/examples/blenvy/demo/src/core/physics_rapier/controls.rs similarity index 100% rename from examples/demo/src/core/physics_rapier/controls.rs rename to examples/blenvy/demo/src/core/physics_rapier/controls.rs diff --git a/examples/demo/src/core/physics_rapier/mod.rs b/examples/blenvy/demo/src/core/physics_rapier/mod.rs similarity index 100% rename from examples/demo/src/core/physics_rapier/mod.rs rename to examples/blenvy/demo/src/core/physics_rapier/mod.rs diff --git a/examples/demo/src/core/physics_rapier/physics_replace_proxies.rs b/examples/blenvy/demo/src/core/physics_rapier/physics_replace_proxies.rs similarity index 100% rename from examples/demo/src/core/physics_rapier/physics_replace_proxies.rs rename to examples/blenvy/demo/src/core/physics_rapier/physics_replace_proxies.rs diff --git a/examples/demo/src/core/physics_rapier/utils.rs b/examples/blenvy/demo/src/core/physics_rapier/utils.rs similarity index 100% rename from examples/demo/src/core/physics_rapier/utils.rs rename to examples/blenvy/demo/src/core/physics_rapier/utils.rs diff --git a/examples/demo/src/core/physics_xpbd/controls.rs b/examples/blenvy/demo/src/core/physics_xpbd/controls.rs similarity index 100% rename from examples/demo/src/core/physics_xpbd/controls.rs rename to examples/blenvy/demo/src/core/physics_xpbd/controls.rs diff --git a/examples/demo/src/core/physics_xpbd/mod.rs b/examples/blenvy/demo/src/core/physics_xpbd/mod.rs similarity index 100% rename from examples/demo/src/core/physics_xpbd/mod.rs rename to examples/blenvy/demo/src/core/physics_xpbd/mod.rs diff --git a/examples/demo/src/core/physics_xpbd/physics_replace_proxies.rs b/examples/blenvy/demo/src/core/physics_xpbd/physics_replace_proxies.rs similarity index 100% rename from examples/demo/src/core/physics_xpbd/physics_replace_proxies.rs rename to examples/blenvy/demo/src/core/physics_xpbd/physics_replace_proxies.rs diff --git a/examples/demo/src/core/physics_xpbd/utils.rs b/examples/blenvy/demo/src/core/physics_xpbd/utils.rs similarity index 100% rename from examples/demo/src/core/physics_xpbd/utils.rs rename to examples/blenvy/demo/src/core/physics_xpbd/utils.rs diff --git a/examples/demo/src/core/relationships/mod.rs b/examples/blenvy/demo/src/core/relationships/mod.rs similarity index 100% rename from examples/demo/src/core/relationships/mod.rs rename to examples/blenvy/demo/src/core/relationships/mod.rs diff --git a/examples/demo/src/core/relationships/relationships_insert_dependant_components.rs b/examples/blenvy/demo/src/core/relationships/relationships_insert_dependant_components.rs similarity index 100% rename from examples/demo/src/core/relationships/relationships_insert_dependant_components.rs rename to examples/blenvy/demo/src/core/relationships/relationships_insert_dependant_components.rs diff --git a/examples/demo/src/game/in_game.rs b/examples/blenvy/demo/src/game/in_game.rs similarity index 100% rename from examples/demo/src/game/in_game.rs rename to examples/blenvy/demo/src/game/in_game.rs diff --git a/examples/demo/src/game/in_main_menu.rs b/examples/blenvy/demo/src/game/in_main_menu.rs similarity index 100% rename from examples/demo/src/game/in_main_menu.rs rename to examples/blenvy/demo/src/game/in_main_menu.rs diff --git a/examples/demo/src/game/interactions/mod.rs b/examples/blenvy/demo/src/game/interactions/mod.rs similarity index 100% rename from examples/demo/src/game/interactions/mod.rs rename to examples/blenvy/demo/src/game/interactions/mod.rs diff --git a/examples/demo/src/game/level_transitions.rs b/examples/blenvy/demo/src/game/level_transitions.rs similarity index 100% rename from examples/demo/src/game/level_transitions.rs rename to examples/blenvy/demo/src/game/level_transitions.rs diff --git a/examples/demo/src/game/mod.rs b/examples/blenvy/demo/src/game/mod.rs similarity index 100% rename from examples/demo/src/game/mod.rs rename to examples/blenvy/demo/src/game/mod.rs diff --git a/examples/demo/src/game/picking/mod.rs b/examples/blenvy/demo/src/game/picking/mod.rs similarity index 100% rename from examples/demo/src/game/picking/mod.rs rename to examples/blenvy/demo/src/game/picking/mod.rs diff --git a/examples/demo/src/game/player/mod.rs b/examples/blenvy/demo/src/game/player/mod.rs similarity index 100% rename from examples/demo/src/game/player/mod.rs rename to examples/blenvy/demo/src/game/player/mod.rs diff --git a/examples/demo/src/main.rs b/examples/blenvy/demo/src/main.rs similarity index 100% rename from examples/demo/src/main.rs rename to examples/blenvy/demo/src/main.rs diff --git a/examples/demo/src/state.rs b/examples/blenvy/demo/src/state.rs similarity index 100% rename from examples/demo/src/state.rs rename to examples/blenvy/demo/src/state.rs diff --git a/examples/demo/src/test_components.rs b/examples/blenvy/demo/src/test_components.rs similarity index 100% rename from examples/demo/src/test_components.rs rename to examples/blenvy/demo/src/test_components.rs diff --git a/examples/demo/assets/assets_core.assets.ron b/examples/demo/assets/assets_core.assets.ron deleted file mode 100644 index 8d0a099..0000000 --- a/examples/demo/assets/assets_core.assets.ron +++ /dev/null @@ -1 +0,0 @@ -({}) \ No newline at end of file diff --git a/examples/demo/assets/assets_game.assets.ron b/examples/demo/assets/assets_game.assets.ron deleted file mode 100644 index 7ca7d51..0000000 --- a/examples/demo/assets/assets_game.assets.ron +++ /dev/null @@ -1,12 +0,0 @@ -({ - "world":File (path: "models/StartLevel.glb"), - "level1":File (path: "models/Level1.glb"), - "level2":File (path: "models/Level2.glb"), - - "models": Folder ( - path: "models/library", - ), - "materials": Folder ( - path: "materials", - ), -}) \ No newline at end of file