crates/blenvy/src/components/blender_settings/lighting.rs

@@ -119,13 +119,13 @@ fn process_background_shader(
 
 // FIXME: this logic should not depend on if toneMapping or Cameras where added first
 fn process_tonemapping(
-    tonemappings: Query<(Entity, &BlenderToneMapping) , Added<BlenderToneMapping>>,
+    tonemappings: Query<&BlenderToneMapping , Added<BlenderToneMapping>>,
     cameras: Query<Entity, With<Camera>>,
     mut commands: Commands,
 ){
 
     for entity in cameras.iter(){
-        for (scene_id, tone_mapping) in tonemappings.iter(){
+        for tone_mapping in tonemappings.iter(){
             match tone_mapping {
                 BlenderToneMapping::None => {
                     println!("TONEMAPPING NONE");
@@ -140,21 +140,19 @@ fn process_tonemapping(
                     commands.entity(entity).insert(Tonemapping::BlenderFilmic);
                 }
             }
-            commands.entity(scene_id).remove::<BlenderToneMapping>();
         }
     }
-
 }
 
 // FIXME: this logic should not depend on if toneMapping or Cameras where added first
 fn process_colorgrading(
-    blender_colorgradings: Query<(Entity, &BlenderColorGrading) , Added<BlenderColorGrading>>,
+    blender_colorgradings: Query<&BlenderColorGrading , Added<BlenderColorGrading>>,
     cameras: Query<Entity, With<Camera>>,
     mut commands: Commands,
 ){
 
     for entity in cameras.iter(){
-        for (scene_id, blender_colorgrading) in blender_colorgradings.iter(){
+        for blender_colorgrading in blender_colorgradings.iter(){
             commands.entity(entity).insert(
                 ColorGrading{
                     global: ColorGradingGlobal{
@@ -177,8 +175,6 @@ fn process_colorgrading(
                     ..Default::default()
                 }
             );
-            commands.entity(scene_id).remove::<ColorGrading>();
-
         }
     }
 }

testing/bevy_example/assets/registry.json

@@ -4019,25 +4019,6 @@
       "type": "array",
       "typeInfo": "TupleStruct"
     },
-    "bevy_example::test_components::HashmapTestStringEnum": {
-      "additionalProperties": false,
-      "isComponent": true,
-      "isResource": false,
-      "long_name": "bevy_example::test_components::HashmapTestStringEnum",
-      "properties": {
-        "inner": {
-          "type": {
-            "$ref": "#/$defs/bevy_utils::hashbrown::HashMap<alloc::string::String, bevy_example::test_components::EnumComplex, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>"
-          }
-        }
-      },
-      "required": [
-        "inner"
-      ],
-      "short_name": "HashmapTestStringEnum",
-      "type": "object",
-      "typeInfo": "Struct"
-    },
     "bevy_example::test_components::HashmapTestStringFloat": {
       "additionalProperties": false,
       "isComponent": true,
@@ -4057,25 +4038,6 @@
       "type": "object",
       "typeInfo": "Struct"
     },
-    "bevy_example::test_components::HashmapTestStringStruct": {
-      "additionalProperties": false,
-      "isComponent": true,
-      "isResource": false,
-      "long_name": "bevy_example::test_components::HashmapTestStringStruct",
-      "properties": {
-        "inner": {
-          "type": {
-            "$ref": "#/$defs/bevy_utils::hashbrown::HashMap<alloc::string::String, bevy_example::test_components::BasicTest, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>"
-          }
-        }
-      },
-      "required": [
-        "inner"
-      ],
-      "short_name": "HashmapTestStringStruct",
-      "type": "object",
-      "typeInfo": "Struct"
-    },
     "bevy_example::test_components::NestedTupleStuff": {
       "isComponent": true,
       "isResource": false,
@@ -11918,42 +11880,6 @@
         }
       }
     },
-    "bevy_utils::hashbrown::HashMap<alloc::string::String, bevy_example::test_components::BasicTest, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>": {
-      "isComponent": false,
-      "isResource": false,
-      "keyType": {
-        "type": {
-          "$ref": "#/$defs/alloc::string::String"
-        }
-      },
-      "long_name": "bevy_utils::hashbrown::HashMap<alloc::string::String, bevy_example::test_components::BasicTest, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>",
-      "short_name": "HashMap<String, BasicTest, DefaultHashBuilder>",
-      "type": "object",
-      "typeInfo": "Map",
-      "valueType": {
-        "type": {
-          "$ref": "#/$defs/bevy_example::test_components::BasicTest"
-        }
-      }
-    },
-    "bevy_utils::hashbrown::HashMap<alloc::string::String, bevy_example::test_components::EnumComplex, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>": {
-      "isComponent": false,
-      "isResource": false,
-      "keyType": {
-        "type": {
-          "$ref": "#/$defs/alloc::string::String"
-        }
-      },
-      "long_name": "bevy_utils::hashbrown::HashMap<alloc::string::String, bevy_example::test_components::EnumComplex, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>",
-      "short_name": "HashMap<String, EnumComplex, DefaultHashBuilder>",
-      "type": "object",
-      "typeInfo": "Map",
-      "valueType": {
-        "type": {
-          "$ref": "#/$defs/bevy_example::test_components::EnumComplex"
-        }
-      }
-    },
     "bevy_utils::hashbrown::HashMap<alloc::string::String, bevy_utils::hashbrown::HashMap<u32, alloc::vec::Vec<alloc::string::String>, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>": {
       "isComponent": false,
       "isResource": false,

testing/bevy_example/src/hierarchy_debug.rs

@@ -1,7 +1,7 @@
 use bevy::{gltf::{GltfMaterialExtras, GltfMeshExtras, GltfSceneExtras}, prelude::*};
 use blenvy::{BlueprintAssets, BlueprintInstanceReady};
 
-use crate::{BasicTest, EnumComplex};
+use crate::BasicTest;
 
 #[derive(Component)]
 pub struct HiearchyDebugTag;
@@ -13,7 +13,7 @@ pub fn setup_hierarchy_debug(mut commands: Commands, asset_server: Res<AssetServ
             "",
             TextStyle {
                 color: LinearRgba { red: 1.0, green:0.0, blue: 0.0, alpha: 1.0}.into(),
-                font_size: 20.,
+                font_size: 10.,
                 ..default()
             },
         )
@@ -133,31 +133,12 @@ for (id, name, scene_extras, extras, mesh_extras, material_extras) in
 }
 }
 
-fn check_for_component(
-    foo: Query<(Entity, Option<&Name>, &EnumComplex)>,
-    mut display: Query<&mut Text, With<HiearchyDebugTag>>,
-
-){
-    let mut info_lines: Vec<String> = vec![];
-    for (entiity, name , enum_complex) in foo.iter(){
-        let data = format!(" We have a 'EnumComplex' component: {:?} (on {:?})", enum_complex, name);
-        info_lines.push(data);
-        println!("yoho component");
-
-    }
-    let mut display = display.single_mut();
-    display.sections[0].value = info_lines.join("\n");
-
-}
-
-
 pub struct HiearchyDebugPlugin;
 impl Plugin for HiearchyDebugPlugin {
     fn build(&self, app: &mut App) {
         app
             .add_systems(Startup, setup_hierarchy_debug)
-            .add_systems(Update, check_for_component)
-            //.add_systems(Update, draw_hierarchy_debug)
+            .add_systems(Update, draw_hierarchy_debug)
             //.add_systems(Update, check_for_gltf_extras)
             
            ;

testing/bevy_example/src/test_components.rs

@@ -188,18 +188,6 @@ pub struct HashmapTestStringColor {
     pub inner: HashMap<String, Color>,
 }
 
-#[derive(Component, Reflect, Default, Debug)]
-#[reflect(Component)]
-pub struct HashmapTestStringEnum {
-    pub inner: HashMap<String, EnumComplex>,
-}
-
-#[derive(Component, Reflect, Default, Debug)]
-#[reflect(Component)]
-pub struct HashmapTestStringStruct {
-    pub inner: HashMap<String, BasicTest>,
-}
-
 #[derive(Component, Reflect, Default, Debug)]
 #[reflect(Component)]
 pub struct HashmapTestStringColorFlat(HashMap<String, Color>);
@@ -271,9 +259,6 @@ impl Plugin for ComponentsTestPlugin {
             .register_type::<HashMap<String, Color>>()
             .register_type::<HashmapTestStringColor>()
             .register_type::<HashmapTestStringColorFlat>()
-            .register_type::<HashmapTestStringEnum>()
-            .register_type::<HashmapTestStringStruct>()
-
             .register_type::<ComponentAToFilterOut>()
             .register_type::<ComponentBToFilterOut>()
             .register_type::<ComponentWithFieldsOfIdenticalType>()

tools/blenvy/TODO.md

@@ -166,26 +166,12 @@ Blender side:
             - export split dynamic/static: YES
             - export merge mode : YES
             - materials: YES
-- [x] blenvy tooling not appearing in library scenes ?? (edit: was actually , it was not appearing in anything but object mode)
-- [x] find a solution for the new color handling 
-    - [x] in theory, srgba, linearrgba , and hsva should be able to be represented visually
-    - [x] bevy_render::color::Color => bevy_color::color::Color
-- [x] fix weird issue with hashmaps with enums as values
-- [ ] prevent attempting to add unexisting components to targets (ie when using the component search)
-
-
 - [ ] inject_export_path_into_internal_blueprints should be called on every asset/blueprint scan !! Not just on export
 - [ ] undo after a save removes any saved "serialized scene" data ? DIG into this
 - [ ] handle scene renames between saves (breaks diffing) => very hard to achieve
-- [ ] add tests for
-    - [ ] disabled components 
-    - [ ] blueprint instances as children of blueprint instances
-    - [ ] blueprint instances as children of empties
-
-- [ ] hidden objects/collections not respected at export !!!?
-    - [ ] verify based on gltf settings
-    - [ ] add "hidden" component otherwise ?
-        https://devtalk.blender.org/t/how-to-get-render-visibility-for-object/23717
+- [ ] add tests for disabled components 
+- [ ] find a solution for the new color handling 
+- [ ] hidden objects/collections not respected at export !!!
 - [ ] add option to 'split out' meshes from blueprints ? 
     - [ ] ie considering meshletts etc , it would make sense to keep blueprints seperate from purely mesh gltfs
 - [ ] persist exported materials path in blueprints so that it can be read from library file users

tools/blenvy/add_ons/auto_export/common/serialize_scene.py

@@ -332,12 +332,9 @@ def serialize_scene(settings):
         
         custom_properties = custom_properties_hash(scene) if len(scene.keys()) > 0 else None
         eevee_settings = generic_fields_hasher_evolved(scene.eevee, fields_to_ignore=fields_to_ignore_generic) # TODO: ignore most of the fields
-        view_settings = generic_fields_hasher_evolved(scene.view_settings, fields_to_ignore=fields_to_ignore_generic)
-        
         scene_field_hashes = {
             "custom_properties": custom_properties,
-            "eevee": eevee_settings,
-            "view_settings": view_settings,
+            "eevee": eevee_settings
         }
         #generic_fields_hasher_evolved(scene.eevee, fields_to_ignore=fields_to_ignore_generic)
         # FIXME: how to deal with this cleanly

tools/blenvy/add_ons/bevy_components/components/maps.py

@@ -87,18 +87,20 @@ class BLENVY_OT_component_map_actions(Operator):
             propertyGroup.list_index = min(max(0, index - 1), len(keys_list) - 1) 
             propertyGroup.values_index = min(max(0, index - 1), len(keys_list) - 1) 
 
-        if self.action == 'ADD':            
+        if self.action == 'ADD':
+            print("keys_list", keys_list)
+            
             # first we gather all key/value pairs
             hashmap = {}
             for index, key in enumerate(keys_list):
-                print("key", key)
                 key_entry = {}
                 for field_name in key.field_names:
                     key_entry[field_name] = getattr(key, field_name, None)
-                """value_entry = {}
+                value_entry = {}
                 for field_name in values_list[index].field_names:
-                    value_entry[field_name] = values_list[index][field_name]"""
+                    value_entry[field_name] = values_list[index][field_name]
                 hashmap[json.dumps(key_entry)] = index
+            print("hashmap", hashmap )
 
             # then we need to find the index of a specific value if it exists
             key_entry = {}
@@ -106,9 +108,10 @@ class BLENVY_OT_component_map_actions(Operator):
                 key_entry[field_name] = getattr(key_setter, field_name, None)
             key_to_add = json.dumps(key_entry)
             existing_index = hashmap.get(key_to_add, None)
+            print("existing_index", existing_index)
 
             if existing_index is None:
-                #print("adding new value", "key field names", key_setter.field_names, "value_setter", value_setter, "field names", value_setter.field_names)
+                print("adding new value")
                 key = keys_list.add()
                 # copy the values over 
                 for field_name in key_setter.field_names:
@@ -119,28 +122,16 @@ class BLENVY_OT_component_map_actions(Operator):
 
                 value = values_list.add()
                 # copy the values over 
-                is_enum = getattr(value_setter, "with_enum", False)
-                if not is_enum:
-                    for field_name in list(value_setter.field_names):
-                        val = getattr(value_setter, field_name, None)
-                        if val is not None:
-                            value[field_name] = val
-                else:
-                    selection = getattr(value_setter, "selection", None)
-                    setattr(value, 'selection', selection)
-                    selector = "variant_" + selection
-                    try:
-                        val = getattr(value_setter, selector, None)
-                        for field_name in val.field_names:
-                            source = getattr(val, field_name)
-                            setattr(getattr(value, selector), field_name, source)
-                    except Exception as inst:
-                        print("EROOR", inst)
-                       
+                for field_name in value_setter.field_names:
+                    val = getattr(value_setter, field_name, None)
+                    if val is not None:
+                        value[field_name] = val 
                     # TODO: add error handling
+                
                 propertyGroup.list_index = index + 1 # we use this to force the change detection
                 propertyGroup.values_index = index + 1 # we use this to force the change detection
             else:
+                print("overriding value")
                 for field_name in value_setter.field_names:
                     values_list[existing_index][field_name] = value_setter[field_name]
 

tools/blenvy/add_ons/bevy_components/propGroups/conversions_from_prop_group.py

@@ -22,9 +22,7 @@ conversion_tables = {
 
     "glam::Quat":  lambda value: "Quat(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+ ", w:"+str(value[3])+")",
 
-    "bevy_color::srgba::Srgba":  lambda value: "Srgba(red:"+str(value[0])+ ", green:"+str(value[1])+ ", blue:"+str(value[2])+ ", alpha:"+str(value[3])+   ")",
-    "bevy_color::linear_rgba::LinearRgba":  lambda value: "LinearRgba(red:"+str(value[0])+ ", green:"+str(value[1])+ ", blue:"+str(value[2])+ ", alpha:"+str(value[3])+   ")",
-    "bevy_color::hsva::Hsva":  lambda value: "Hsva(hue:"+str(value[0])+ ", saturation:"+str(value[1])+ ", value:"+str(value[2])+ ", alpha:"+str(value[3])+   ")",
+    "bevy_render::color::Color": lambda value: "Rgba(red:"+str(value[0])+ ", green:"+str(value[1])+ ", blue:"+str(value[2])+ ", alpha:"+str(value[3])+   ")",
 }
 
 #converts the value of a property group(no matter its complexity) into a single custom property value

tools/blenvy/add_ons/bevy_components/propGroups/conversions_to_prop_group.py

@@ -118,14 +118,10 @@ def parse_vec4(value, caster, typeName):
     parsed = parse_struct_string(value.replace(typeName,"").replace("(", "").replace(")","") )
     return [caster(parsed['x']), caster(parsed['y']), caster(parsed['z']), caster(parsed['w'])]
 
-def parse_color_rgba(value, caster, typeName):
+def parse_color(value, caster, typeName):
     parsed = parse_struct_string(value.replace(typeName,"").replace("(", "").replace(")","") )
     return [caster(parsed['red']), caster(parsed['green']), caster(parsed['blue']), caster(parsed['alpha'])]
 
-def parse_color_hsva(value, caster, typeName):
-    parsed = parse_struct_string(value.replace(typeName,"").replace("(", "").replace(")","") )
-    return [caster(parsed['hue']), caster(parsed['saturation']), caster(parsed['value']), caster(parsed['alpha'])]
-
 def to_int(input):
     return int(float(input))
 
@@ -167,11 +163,7 @@ type_mappings = {
     'alloc::string::String': lambda value: str(value.replace('"', "")),
     'alloc::borrow::Cow<str>': lambda value: str(value.replace('"', "")),
 
-    "bevy_color::srgba::Srgba":  lambda value: parse_color_rgba(value, float, "Srgba"),
-    "bevy_color::linear_rgba::LinearRgba":  lambda value: parse_color_rgba(value, float, "LinearRgba"),
-    "bevy_color::hsva::Hsva":  lambda value: parse_color_hsva(value, float, "Hsva"),
-
-
+    'bevy_render::color::Color': lambda value: parse_color(value, float, "Rgba"),
     'bevy_ecs::entity::Entity': lambda value: int(value),
 }
 

tools/blenvy/add_ons/bevy_components/propGroups/process_map.py

@@ -43,14 +43,10 @@ def process_map(registry, definition, update, nesting_long_names=[]):
 
         #if the content of the list is a unit type, we need to generate a fake wrapper, otherwise we cannot use layout.prop(group, "propertyName") as there is no propertyName !
         if is_value_value_type:
-            print("WRAPPPER,  property group", definition["short_name"])
             values_property_group_class = generate_wrapper_propertyGroup(f"{long_name}_values", original_long_name, definition_link, registry, update, nesting_long_names)
         else:
-
             (_, list_content_group_class) = process_component.process_component(registry, value_definition, update, {"nested": True, "long_name": original_long_name}, nesting_long_names)
             values_property_group_class = list_content_group_class
-            print("COMPONENT,  property group", definition["short_name"], values_property_group_class)
-
 
         values_collection = CollectionProperty(type=values_property_group_class)
         values_property_group_pointer = PointerProperty(type=values_property_group_class)

tools/blenvy/add_ons/bevy_components/registry/registry.py

@@ -79,21 +79,22 @@ class ComponentsRegistry(PropertyGroup):
 
         "glam::Quat": {"type": FloatVectorProperty, "presets": {"size":4} },
 
-        "bevy_color::srgba::Srgba": dict(type = FloatVectorProperty, presets=dict(subtype='COLOR', size=4)),
-        "bevy_color::linear_rgba::LinearRgba": dict(type = FloatVectorProperty, presets=dict(subtype='COLOR', size=4)),
-        "bevy_color::hsva::Hsva": dict(type = FloatVectorProperty, presets=dict(subtype='COLOR', size=4)),
+        "bevy_render::color::Color": dict(type = FloatVectorProperty, presets=dict(subtype='COLOR', size=4)),
 
         "char": dict(type=StringProperty, presets=dict()),
         "str":  dict(type=StringProperty, presets=dict()),
         "alloc::string::String":  dict(type=StringProperty, presets=dict()),
         "alloc::borrow::Cow<str>": dict(type=StringProperty, presets=dict()),
 
+
         "enum":  dict(type=EnumProperty, presets=dict()), 
 
         'bevy_ecs::entity::Entity': {"type": IntProperty, "presets": {"min":0} },
         'bevy_utils::Uuid':  dict(type=StringProperty, presets=dict()),
+
     }
 
+
     value_types_defaults = {
         "string":" ",
         "boolean": True,
@@ -140,9 +141,7 @@ class ComponentsRegistry(PropertyGroup):
 
         "glam::Quat":  [0.0, 0.0, 0.0, 0.0], 
 
-        "bevy_color::srgba::Srgba": [1.0, 1.0, 0.0, 1.0],
-        "bevy_color::linear_rgba::LinearRgba": [1.0, 1.0, 0.0, 1.0],
-        "bevy_color::hsva::Hsva": [1.0, 1.0, 0.0, 1.0],
+        "bevy_render::color::Color": [1.0, 1.0, 0.0, 1.0],
 
         'bevy_ecs::entity::Entity': 0,#4294967295, # this is the same as Bevy's Entity::Placeholder, too big for Blender..sigh
         'bevy_utils::Uuid': '"'+str(uuid.uuid4())+'"'

tools/blenvy/core/ui/ui.py

@@ -27,7 +27,8 @@ class BLENVY_PT_SidePanel(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
     bl_region_type = 'UI'
     bl_category = "Bevy"
-    #bl_context = "objectmode"
+    bl_context = "objectmode"
+
 
     def draw_header(self, context):
         layout = self.layout

tools/blenvy/tests/component_values_shuffler.py

@@ -61,10 +61,7 @@ type_mappings = {
 
     "glam::Quat": lambda : random_vec(4, 'float'),
 
-    'bevy_color::srgba::Srgba': lambda : random_vec(4, 'float'),
-    'bevy_color::linear_rgba::LinearRgba': lambda : random_vec(4, 'float'),
-    'bevy_color::hsva::Hsva': lambda : random_vec(4, 'float'),
-    
+    'bevy_render::color::Color': lambda : random_vec(4, 'float'),
     'alloc::string::String': lambda : random_word(8),
     'alloc::borrow::Cow<str>': lambda : random_word(8),