fix(bevy components): fix handling of unit/empty structs (kaosat-dev#151

)

* closes kaosat-dev#133 
* fix(gltf_auto_export): corrected ron value for "spawnHere" components
* fix(bevy_components): fixed handling of empty/ unit structs
   * updated to/from prop_groups
   * updated tests/ expected files
   * bumped version
   * removed verbose "watching schema file for changes"
* fix(bevy_gltf_components): fixed issue of incorect handling of empty component values in non legacy mode:
   * aka: replacing empty component values (ron strings) with '()' should ONLY happen in legacy mode
   * even more aka: ron strings for component values should not be altered when not in legacy mode (provided ron
  strings should be valid)
* tests():
   * changed bevy_component tests to use testing/bevy_example as source for registry data
   * removed testing/bevy_registry_export, as it is redudant
   * related tweaks & cleanups
* chore(crates): bumped up versions because of breaking change
* chore(examples): updated registry export example to use up-to-date / fixed components data
* chore(bevy_gltf_components): added back warning about legacy mode, in a less spammy way
* docs(bevy_components): added notes about v0.3 breaking changes

Cargo.toml

@@ -16,9 +16,7 @@ members = [
     "examples/bevy_gltf_save_load/basic/",
     "examples/bevy_registry_export/basic",
 
-    "testing/bevy_registry_export/basic",
     "testing/bevy_example"
-
 ]
 resolver = "2"
 

crates/bevy_gltf_blueprints/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_gltf_blueprints"
-version = "0.7.3"
+version = "0.8.0"
 authors = ["Mark 'kaosat-dev' Moissette"]
 description = "Adds the ability to define Blueprints/Prefabs for [Bevy](https://bevyengine.org/) inside gltf files and spawn them in Bevy."
 homepage = "https://github.com/kaosat-dev/Blender_bevy_components_workflow"
@@ -17,6 +17,6 @@ workspace = true
 bevy = { version = "0.12", default-features = false, features = ["bevy_asset", "bevy_scene", "bevy_gltf", "bevy_animation", "animation"] }
 
 [dependencies]
-bevy_gltf_components = "0.3"
+bevy_gltf_components = "0.4"
 #bevy_gltf_components = { path = "../bevy_gltf_components" }
 bevy = { version = "0.12", default-features = false, features = ["bevy_asset", "bevy_scene", "bevy_gltf", "bevy_animation", "animation"] }

crates/bevy_gltf_blueprints/README.md

@@ -26,7 +26,7 @@ Here's a minimal usage example:
 # Cargo.toml
 [dependencies]
 bevy="0.12"
-bevy_gltf_blueprints = { version = "0.7"} 
+bevy_gltf_blueprints = { version = "0.8"} 
 
 ```
 
@@ -64,7 +64,7 @@ fn spawn_blueprint(
 Add the following to your `[dependencies]` section in `Cargo.toml`:
 
 ```toml
-bevy_gltf_blueprints = "0.7"
+bevy_gltf_blueprints = "0.8"
 ```
 
 Or use `cargo add`:
@@ -346,7 +346,7 @@ The main branch is compatible with the latest Bevy release, while the branch `be
 Compatibility of `bevy_gltf_blueprints` versions:
 | `bevy_gltf_blueprints` | `bevy` |
 | :--                 | :--    |
-| `0.3 - 0.7`         | `0.12` |
+| `0.3 - 0.8`         | `0.12` |
 | `0.1 - 0.2`         | `0.11` |
 | branch `main`       | `0.12` |
 | branch `bevy_main`  | `main` |

crates/bevy_gltf_components/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_gltf_components"
-version = "0.3.2"
+version = "0.4.0"
 authors = ["Mark 'kaosat-dev' Moissette"]
 description = "Allows you to define [Bevy](https://bevyengine.org/) components direclty inside gltf files and instanciate the components on the Bevy side."
 homepage = "https://github.com/kaosat-dev/Blender_bevy_components_workflow"

crates/bevy_gltf_components/README.md

@@ -24,7 +24,7 @@ Here's a minimal usage example:
 # Cargo.toml
 [dependencies]
 bevy="0.12"
-bevy_gltf_components = { version = "0.3"} 
+bevy_gltf_components = { version = "0.4"} 
 
 ```
 
@@ -60,7 +60,7 @@ bevy_gltf_components = { version = "0.3"}
 Add the following to your `[dependencies]` section in `Cargo.toml`:
 
 ```toml
-bevy_gltf_components = "0.3"
+bevy_gltf_components = "0.4"
 ```
 
 Or use `cargo add`:
@@ -117,7 +117,7 @@ The main branch is compatible with the latest Bevy release, while the branch `be
 Compatibility of `bevy_gltf_components` versions:
 | `bevy_gltf_components` | `bevy` |
 | :--                 | :--    |
-| `0.2 - 0.3`         | `0.12` |
+| `0.2 - 0.4`         | `0.12` |
 | `0.1`               | `0.11` |
 | branch `main`       | `0.12` |
 | branch `bevy_main`  | `main` |

crates/bevy_gltf_components/src/lib.rs

@@ -8,7 +8,9 @@ pub mod process_gltfs;
 pub use process_gltfs::*;
 
 use bevy::{
-    ecs::system::Resource,
+    app::Startup,
+    ecs::system::{Res, Resource},
+    log::warn,
     prelude::{App, IntoSystemConfigs, Plugin, SystemSet, Update},
 };
 
@@ -66,11 +68,18 @@ impl Default for ComponentsFromGltfPlugin {
     }
 }
 
+fn check_for_legacy_mode(gltf_components_config: Res<GltfComponentsConfig>) {
+    if gltf_components_config.legacy_mode {
+        warn!("using simplified component definitions is deprecated since 0.3, prefer defining components with real ron values (use the bevy_components tool for Blender for simplicity) ");
+    }
+}
+
 impl Plugin for ComponentsFromGltfPlugin {
     fn build(&self, app: &mut App) {
         app.insert_resource(GltfComponentsConfig {
             legacy_mode: self.legacy_mode,
         })
+        .add_systems(Startup, check_for_legacy_mode)
         .add_systems(
             Update,
             (add_components_from_gltf_extras).in_set(GltfComponentsSet::Injection),

crates/bevy_gltf_components/src/ronstring_to_reflect_component.rs

@@ -91,22 +91,19 @@ pub fn ronstring_to_reflect_component(
                         parsed_value = format!("({formated})");
                     }
                 }
-            }
 
-            // FIXME: waaait this should be part of the legacy mode as it modifies the ron data ???
-            // so it means the values generated by the Blende add-on are incomplete (trivial to fix, but still)
-            if parsed_value.is_empty() {
-                parsed_value = "()".to_string();
+                if parsed_value.is_empty() {
+                    parsed_value = "()".to_string();
+                }
             }
-
             let ron_string = format!(
                 "{{ \"{}\":{} }}",
                 type_registration.type_info().type_path(),
                 parsed_value
             );
 
             // usefull to determine what an entity looks like Serialized
-            /*let test_struct = VecOfColors(vec![Color::Rgba { red: 0., green: 0.0, blue: 0.0, alpha: 0.0 }]);//TuppleTestColor(Color::Rgba { red: 0., green: 0.0, blue: 0.0, alpha: 0.0 });
+            /*let test_struct = CameraRenderGraph::new("name");
             let serializer = ReflectSerializer::new(&test_struct, &type_registry);
             let serialized =
                 ron::ser::to_string_pretty(&serializer, ron::ser::PrettyConfig::default()).unwrap();

crates/bevy_gltf_save_load/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_gltf_save_load"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Mark 'kaosat-dev' Moissette"]
 description = "Save & load your bevy games"
 homepage = "https://github.com/kaosat-dev/Blender_bevy_components_workflow"
@@ -18,4 +18,5 @@ bevy = { version = "0.12", default-features = false, features = ["bevy_asset", "
 
 [dependencies]
 bevy = { version = "0.12", default-features = false, features = ["bevy_asset", "bevy_scene", "bevy_gltf"] }
-bevy_gltf_blueprints = "0.7"
+bevy_gltf_blueprints = "0.8"
+#bevy_gltf_blueprints = { path = "../bevy_gltf_blueprints" }

crates/bevy_gltf_save_load/README.md

@@ -35,7 +35,7 @@ Here's a minimal usage example:
 # Cargo.toml
 [dependencies]
 bevy="0.12"
-bevy_gltf_save_load = "0.1"
+bevy_gltf_save_load = "0.3"
 bevy_gltf_blueprints = "0.6" // also needed
 ```
 
@@ -141,7 +141,7 @@ take a look at the [example]('https://github.com/kaosat-dev/Blender_bevy_compone
 Add the following to your `[dependencies]` section in `Cargo.toml`:
 
 ```toml
-bevy_gltf_save_load = "0.1"
+bevy_gltf_save_load = "0.3"
 bevy_gltf_blueprints = "0.6" // also needed, as bevy_gltf_save_load does not re-export it at this time
 
 ```
@@ -299,7 +299,7 @@ The main branch is compatible with the latest Bevy release, while the branch `be
 Compatibility of `bevy_gltf_save_load` versions:
 | `bevy_gltf_save_load` | `bevy` |
 | :--                 | :--    |
-| `0.1 `              | `0.12` |
+| `0.1 -0.3`          | `0.12` |
 | branch `main`       | `0.12` |
 | branch `bevy_main`  | `main` |
 

crates/bevy_registry_export/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_registry_export"
-version = "0.1.1"
+version = "0.2.0"
 authors = ["Mark 'kaosat-dev' Moissette", "Pascal 'Killercup' Hertleif"]
 description = "Allows you to define [Bevy](https://bevyengine.org/) components direclty inside gltf files and instanciate the components on the Bevy side."
 homepage = "https://github.com/kaosat-dev/Blender_bevy_components_workflow"

crates/bevy_registry_export/README.md

@@ -18,7 +18,7 @@ Here's a minimal usage example:
 # Cargo.toml
 [dependencies]
 bevy="0.12"
-bevy_registry_export = "0.1"
+bevy_registry_export = "0.2"
 ```
 
 ```rust no_run
@@ -44,7 +44,7 @@ take a look at the [example]('https://github.com/kaosat-dev/Blender_bevy_compone
 Add the following to your `[dependencies]` section in `Cargo.toml`:
 
 ```toml
-bevy_registry_export = "0.1"
+bevy_registry_export = "0.2"
 
 ```
 
@@ -112,8 +112,9 @@ The main branch is compatible with the latest Bevy release, while the branch `be
 Compatibility of `bevy_registry_export` versions:
 | `bevy_registry_export` | `bevy` |  `bevy_components (Blender add-on)` |
 | :--                 | :--    |:--    |
-| `0.1 `              | `0.12` | `0.1.0` |
-| branch `main`       | `0.12` | `0.1.0` |
+| `0.2 `              | `0.12` | `0.3` |
+| `0.1 `              | `0.12` | `0.1 -0.2` |
+| branch `main`       | `0.12` | `0.1` |
 | branch `bevy_main`  | `main` | `n/a` |