feat(Blenvy:blender):

* fixed handling of colors according to changes in v0.14
 * fixed issues with hashmaps having enums as values

tools/blenvy/TODO.md

@@ -166,12 +166,26 @@ 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 
-- [ ] find a solution for the new color handling 
-- [ ] hidden objects/collections not respected at export !!!
+- [ ] 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 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,9 +332,12 @@ 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
+            "eevee": eevee_settings,
+            "view_settings": view_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

@@ -88,19 +88,17 @@ class BLENVY_OT_component_map_actions(Operator):
             propertyGroup.values_index = min(max(0, index - 1), len(keys_list) - 1) 
 
         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 = {}
@@ -108,10 +106,9 @@ 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")
+                #print("adding new value", "key field names", key_setter.field_names, "value_setter", value_setter, "field names", value_setter.field_names)
                 key = keys_list.add()
                 # copy the values over 
                 for field_name in key_setter.field_names:
@@ -122,16 +119,28 @@ class BLENVY_OT_component_map_actions(Operator):
 
                 value = values_list.add()
                 # copy the values over 
-                for field_name in value_setter.field_names:
+                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
-                    # TODO: add error handling
+                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)
                        
+                    # 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,7 +22,9 @@ conversion_tables = {
 
     "glam::Quat":  lambda value: "Quat(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+ ", w:"+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])+   ")",
+    "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])+   ")",
 }
 
 #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,10 +118,14 @@ 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(value, caster, typeName):
+def parse_color_rgba(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))
 
@@ -163,7 +167,11 @@ type_mappings = {
     'alloc::string::String': lambda value: str(value.replace('"', "")),
     'alloc::borrow::Cow<str>': lambda value: str(value.replace('"', "")),
 
-    'bevy_render::color::Color': lambda value: parse_color(value, float, "Rgba"),
+    "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_ecs::entity::Entity': lambda value: int(value),
 }
 

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

@@ -43,10 +43,14 @@ 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,22 +79,21 @@ class ComponentsRegistry(PropertyGroup):
 
         "glam::Quat": {"type": FloatVectorProperty, "presets": {"size":4} },
 
-        "bevy_render::color::Color": dict(type = FloatVectorProperty, presets=dict(subtype='COLOR', 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)),
 
         "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,
@@ -141,7 +140,9 @@ class ComponentsRegistry(PropertyGroup):
 
         "glam::Quat":  [0.0, 0.0, 0.0, 0.0], 
 
-        "bevy_render::color::Color": [1.0, 1.0, 0.0, 1.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_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,8 +27,7 @@ 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,7 +61,10 @@ type_mappings = {
 
     "glam::Quat": lambda : random_vec(4, 'float'),
 
-    'bevy_render::color::Color': 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'),
+    
     'alloc::string::String': lambda : random_word(8),
     'alloc::borrow::Cow<str>': lambda : random_word(8),