tools/bevy_components/TODO.md

@@ -217,7 +217,3 @@ Restructuring of storage of components
 
 - [ ] in conversions from propgroups
         component_name = definition["short_name"]
-
-- Hashmap Support
-    - [ ] fix parsing of keys's type either on Bevy side (prefered, unlikely to be possible) or on the Blender side 
-    - [ ] handle missing types in registry for keys & values

tools/bevy_components/components/definitions_list.py

@@ -11,6 +11,17 @@ class ComponentDefinitionsList(bpy.types.PropertyGroup):
         #print("add components to ui_list")
         items = []
         type_infos = context.window_manager.components_registry.type_infos
+        short_names = context.window_manager.components_registry.short_names_to_long_names
+        """for short_name in sorted(short_names.keys()):
+            long_name = short_names[short_name]
+            definition = type_infos[long_name]
+            is_component = definition['isComponent']  if "isComponent" in definition else False
+
+            if self.filter in short_name and is_component:
+                if not 'Handle' in short_name and not "Cow" in short_name and not "AssetId" in short_name and short_name not in self.exclude: # FIXME: hard coded, seems wrong
+                    items.append((long_name, short_name, long_name))"""
+
+
         for long_name in type_infos.keys():
             definition = type_infos[long_name]
             short_name = definition["short_name"]

tools/bevy_components/components/maps.py

@@ -5,7 +5,7 @@ from bpy.props import (StringProperty, EnumProperty, PointerProperty, FloatVecto
 class GENERIC_MAP_OT_actions(Operator):
     """Move items up and down, add and remove"""
     bl_idname = "generic_map.map_action"
-    bl_label = "Map Actions"
+    bl_label = "List Actions"
     bl_description = "Move items up and down, add and remove"
     bl_options = {'REGISTER', 'UNDO'}
 
@@ -26,8 +26,6 @@ class GENERIC_MAP_OT_actions(Operator):
         description="",
     ) # type: ignore
 
-    target_index: IntProperty(name="target index", description="index of item to manipulate")# type: ignore
-
     def invoke(self, context, event):
         object = context.object
         # information is stored in component meta
@@ -38,74 +36,33 @@ class GENERIC_MAP_OT_actions(Operator):
         for path_item in json.loads(self.property_group_path):
             propertyGroup = getattr(propertyGroup, path_item)
 
-        keys_list = getattr(propertyGroup, "list")
+        target_list = getattr(propertyGroup, "list")
         index = getattr(propertyGroup, "list_index")
 
         values_list = getattr(propertyGroup, "values_list")
         values_index = getattr(propertyGroup, "values_list_index")
 
-        key_setter = getattr(propertyGroup, "keys_setter")
-        value_setter = getattr(propertyGroup, "values_setter")
 
-
+        if self.action == 'DOWN' and index < len(target_list) - 1:
-        if self.action == 'DOWN' and index < len(keys_list) - 1:
             #item_next = scn.rule_list[index + 1].name
-            keys_list.move(index, index + 1)
+            target_list.move(index, index + 1)
             propertyGroup.list_index += 1
         
         elif self.action == 'UP' and index >= 1:
             #item_prev = scn.rule_list[index - 1].name
-            keys_list.move(index, index - 1)
+            target_list.move(index, index - 1)
             propertyGroup.list_index -= 1
 
         elif self.action == 'REMOVE':
-            index = self.target_index
+            target_list.remove(index)
-            keys_list.remove(index)
+            propertyGroup.list_index = min(max(0, index - 1), len(target_list) - 1) 
-            values_list.remove(index)
-            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':
-            print("keys_list", keys_list)
+            key = target_list.add()
-            hashmap = {}
-            for index, key in enumerate(keys_list):
-                key_entry = {}
-                for field_name in key.field_names:
-                    print("field name", field_name, key)
-                    key_entry[field_name] = key[field_name]
-                value_entry = {}
-                for field_name in values_list[index].field_names:
-                    value_entry[field_name] = values_list[index][field_name]
-                
-                hashmap[json.dumps(key_entry)] = index #{"value": json.dumps(value_entry), "index": index}
-            print("hashmap", hashmap )
-
-            # we need to find the index of a specific value
-            key_entry = {}
-            for field_name in key_setter.field_names:
-                key_entry[field_name] = key_setter[field_name]
-            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 = keys_list.add()
-                # copy the values over 
-                for field_name in key_setter.field_names:
-                    key[field_name] = key_setter[field_name]
-
             value = values_list.add()
-                # copy the values over 
-                for field_name in value_setter.field_names:
-                    value[field_name] = value_setter[field_name]
             
             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]
 
 
             #info = '"%s" added to list' % (item.name)

tools/bevy_components/components/metadata.py

@@ -225,7 +225,7 @@ def upsert_component_in_object(object, long_name, registry):
         
         # now deal with property groups details
         if propertyGroup != None:
-            if long_name in registry.invalid_components:
+            if short_name in registry.invalid_components:
                 component_meta.enabled = False
                 component_meta.invalid = True
                 component_meta.invalid_details = "component contains fields that are not in the schema, disabling"

tools/bevy_components/components/ui.py

@@ -85,65 +85,55 @@ def draw_propertyGroup( propertyGroup, layout, nesting =[], rootName=None):
         op.property_group_path = json.dumps(nesting)
 
     elif is_map:
-        root = layout.row().column()
-        if hasattr(propertyGroup, "list"): # TODO: improve handling of non drawable UI
         keys_list = getattr(propertyGroup, "list")
         values_list = getattr(propertyGroup, "values_list")
-            box = root.box()
+        box = layout.box()
         row = box.row()
-            row.label(text="Add entry:")
+        row.label(text="key")
-            keys_setter = getattr(propertyGroup, "keys_setter")
+        row.label(text="value")
-            draw_propertyGroup(keys_setter, row, nesting, rootName)
+        #values_setter = getattr(propertyGroup, "values_setter")
+        # draw_propertyGroup(values_setter, row, nesting, rootName)
 
-            values_setter = getattr(propertyGroup, "values_setter")
-            draw_propertyGroup(values_setter, row, nesting, rootName)
-
-            op = row.operator('generic_map.map_action', icon='ADD', text="")
-            op.action = 'ADD'
-            op.component_name = rootName
-            op.property_group_path = json.dumps(nesting)
-
-            box = root.box()
         split = box.split(factor=0.9)
         list_column, buttons_column = (split.column(),split.column())
         list_column = list_column.box()
 
         for index, item  in enumerate(keys_list):
             row = list_column.row()
+            #row.label(text=str(index))
             draw_propertyGroup(item, row, nesting, rootName)
 
             value = values_list[index]
             draw_propertyGroup(value, row, nesting, rootName)
 
-                op = row.operator('generic_map.map_action', icon='REMOVE', text="")
-                op.action = 'REMOVE'
-                op.component_name = rootName
-                op.property_group_path = json.dumps(nesting)
-                op.target_index = index
-
 
         #various control buttons
         buttons_column.separator()
         row = buttons_column.row()
+        op = row.operator('generic_map.map_action', icon='ADD', text="")
+        op.action = 'ADD'
+        op.component_name = rootName
+        op.property_group_path = json.dumps(nesting)
 
+        row = buttons_column.row()
+        op = row.operator('generic_map.map_action', icon='REMOVE', text="")
+        op.action = 'REMOVE'
+        op.component_name = rootName
+        op.property_group_path = json.dumps(nesting)
 
     else: 
         for fname in field_names:
-            #subrow = layout.row()
+            subrow = layout.row()
             nestedPropertyGroup = getattr(propertyGroup, fname)
             nested = getattr(nestedPropertyGroup, "nested", False)
             display_name = fname if propertyGroup.tupple_or_struct == "struct" else ""
 
             if nested:
                 layout.separator()
-                layout.separator()
-
                 layout.label(text=display_name) #  this is the name of the field/sub field
                 layout.separator()
-                subrow = layout.row()
+                draw_propertyGroup(nestedPropertyGroup, subrow.column(), nesting + [fname], rootName )
-                draw_propertyGroup(nestedPropertyGroup, subrow, nesting + [fname], rootName )
             else:
-                subrow = layout.row()
                 subrow.prop(propertyGroup, fname, text=display_name)
                 subrow.separator()
 
@@ -226,8 +216,8 @@ class BEVY_COMPONENTS_PT_ComponentsPanel(bpy.types.Panel):
 
                 # we fetch the matching ui property group
                 root_propertyGroup_name =  registry.get_propertyGroupName_from_longName(component_name)
-                """print("root_propertyGroup_name", root_propertyGroup_name)"""
+                """print("root_propertyGroup_name", root_propertyGroup_name)
-                print("component_meta", component_meta, component_invalid)
+                print("component_meta", component_meta, component_invalid)"""
 
                 if root_propertyGroup_name:
                     propertyGroup = getattr(component_meta, root_propertyGroup_name, None)
@@ -236,8 +226,8 @@ class BEVY_COMPONENTS_PT_ComponentsPanel(bpy.types.Panel):
                         # if the component has only 0 or 1 field names, display inline, otherwise change layout
                         single_field = len(propertyGroup.field_names) < 2
                         prop_group_location = box.row(align=True).column()
-                        """if single_field:
+                        if single_field:
-                            prop_group_location = row.column(align=True)#.split(factor=0.9)#layout.row(align=False)"""
+                            prop_group_location = row.column(align=True)#.split(factor=0.9)#layout.row(align=False)
                         
                         if component_visible:
                             if component_invalid:

tools/bevy_components/propGroups/conversions_from_prop_group.py

@@ -33,15 +33,17 @@ def property_group_value_to_custom_property_value(property_group, definition, re
     type_def = definition["type"] if "type" in definition else None
     type_name = definition["title"]
     is_value_type = type_name in conversion_tables
-    # print("computing custom property: component name:", component_name, "type_info", type_info, "type_def", type_def, "type_name", type_name)
+    print("computing custom property: component name:", component_name, "type_info", type_info, "type_def", type_def, "type_name", type_name)
 
     if is_value_type:
         value = conversion_tables[type_name](value)
     elif type_info == "Struct":
+        print("generating string for struct")
         values = {}
         if len(property_group.field_names) ==0:
             value = '()'
         else:
+            print("toto", type_def, definition, property_group)
             for index, field_name in enumerate(property_group.field_names):
                 item_type_name = definition["properties"][field_name]["type"]["$ref"].replace("#/$defs/", "")
                 item_definition = registry.type_infos[item_type_name] if item_type_name in registry.type_infos else None
@@ -139,6 +141,7 @@ def property_group_value_to_custom_property_value(property_group, definition, re
             value.append(item_value) 
 
     elif type_info == "Map":
+        print("MAAAAAP", property_group)
         keys_list = getattr(property_group, "list", {})
         values_list = getattr(property_group, "values_list")
         value = {}
@@ -156,6 +159,7 @@ def property_group_value_to_custom_property_value(property_group, definition, re
             val = values_list[index]
             value_type_name = getattr(val, "type_name")
             definition = registry.type_infos[value_type_name] if value_type_name in registry.type_infos else None
+            print("value definition", definition)
             if definition != None:
                 val_value = property_group_value_to_custom_property_value(val, definition, registry, component_name, None)
                 if value_type_name.startswith("wrapper_"): #if we have a "fake" tupple for aka for value types, we need to remove one nested level
@@ -163,8 +167,10 @@ def property_group_value_to_custom_property_value(property_group, definition, re
             else:
                 val_value = '""'
 
+
             value[key_value] = val_value
-        value = str(value).replace('{','@').replace('}','²') # FIXME: eeek !!
+        print("MAP VALUES", value)
+
     else:
         value = conversion_tables[type_name](value) if is_value_type else value
         value = '""' if isinstance(value, PropertyGroup) else value
@@ -174,11 +180,9 @@ def property_group_value_to_custom_property_value(property_group, definition, re
         value = value.replace("'", "")
 
     if parent == None:
-        print("transforming value", value, definition)
         value = str(value).replace("'",  "")
         value = value.replace(",)",")")
         value = value.replace("{", "(").replace("}", ")") # FIXME: deal with hashmaps
         value = value.replace("True", "true").replace("False", "false")
-        value = value.replace('@', '{').replace('²', '}')
     return value
 

tools/bevy_components/propGroups/process_map.py

@@ -1,8 +1,9 @@
-from bpy.props import (StringProperty, IntProperty, CollectionProperty, PointerProperty)
+from bpy.props import (StringProperty, IntProperty, CollectionProperty)
 from .utils import generate_wrapper_propertyGroup
 from . import process_component
 
 def process_map(registry, definition, update, nesting=[], nesting_long_names=[]):
+    print("IS HASHMAP")
     value_types_defaults = registry.value_types_defaults 
     type_infos = registry.type_infos
 
@@ -12,74 +13,59 @@ def process_map(registry, definition, update, nesting=[], nesting_long_names=[])
     nesting = nesting + [short_name]
     nesting_long_names = nesting_long_names + [long_name]
 
+    #ref_name = definition["items"]["type"]["$ref"].replace("#/$defs/", "")
     value_ref_name = definition["additionalProperties"]["type"]["$ref"].replace("#/$defs/", "")
     key_ref_name = long_name.split(',')[0].split('<')[1]# FIXME: hack !!!
-
+    key_type = ''
+    value_type = ''
+    print("infos", short_name, "long name", long_name)
+    print("value ref", value_ref_name, "key ref", key_ref_name)
     #print("definition", definition)
-    __annotations__ = {}
+
+    if value_ref_name in type_infos:
+        value_definition = type_infos[value_ref_name]
+        original_type_name = value_definition["title"]
+        original_short_name = value_definition["short_name"]
+        is_value_value_type = original_type_name in value_types_defaults
+        definition_link = definition["additionalProperties"]["type"]["$ref"]#f"#/$defs/{value_ref_name}"
+
+        print("hashmap VALUE type", original_type_name)
+
+        #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:
+            values_property_group_class = generate_wrapper_propertyGroup(long_name, original_type_name, definition_link, registry, update)
+        else:
+            (_, list_content_group_class) = process_component.process_component(registry, value_definition, update, {"nested": True, "type_name": original_type_name}, nesting)
+            values_property_group_class = list_content_group_class
+
+        values_collection = CollectionProperty(type=values_property_group_class)
+
     if key_ref_name in type_infos:
         key_definition = type_infos[key_ref_name]
         original_type_name = key_definition["title"]
+        original_short_name = key_definition["short_name"]
         is_key_value_type = original_type_name in value_types_defaults
         definition_link = f"#/$defs/{key_ref_name}"
 
         #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_key_value_type:
-            keys_property_group_class = generate_wrapper_propertyGroup(f"{long_name}_values", original_type_name, definition_link, registry, update)
+            keys_property_group_class = generate_wrapper_propertyGroup(long_name+'_values', original_type_name, definition_link, registry, update)
         else:
-            (_, list_content_group_class) = process_component.process_component(registry, key_definition, update, {"nested": True, "type_name": original_type_name}, nesting, nesting_long_names)
+            (_, list_content_group_class) = process_component.process_component(registry, key_definition, update, {"nested": True, "type_name": original_type_name}, nesting)
             keys_property_group_class = list_content_group_class
 
         keys_collection = CollectionProperty(type=keys_property_group_class)
-        keys_property_group_pointer = PointerProperty(type=keys_property_group_class)
-    else:
-        __annotations__["list"] = StringProperty(default="N/A")
-        registry.add_missing_typeInfo(key_ref_name)
-        # the root component also becomes invalid (in practice it is not always a component, but good enough)
-        registry.add_invalid_component(nesting_long_names[0])
 
-    if value_ref_name in type_infos:
-        value_definition = type_infos[value_ref_name]
-        original_type_name = value_definition["title"]
-        is_value_value_type = original_type_name in value_types_defaults
-        definition_link = definition["additionalProperties"]["type"]["$ref"]#f"#/$defs/{value_ref_name}"
-
-        #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:
-            values_property_group_class = generate_wrapper_propertyGroup(f"{long_name}_keys", original_type_name, definition_link, registry, update)
-        else:
-            (_, list_content_group_class) = process_component.process_component(registry, value_definition, update, {"nested": True, "type_name": original_type_name}, nesting, nesting_long_names)
-            values_property_group_class = list_content_group_class
-
-        values_collection = CollectionProperty(type=values_property_group_class)
-        values_property_group_pointer = PointerProperty(type=values_property_group_class)
-
-    else:
-        #__annotations__["list"] = StringProperty(default="N/A")
-        registry.add_missing_typeInfo(value_ref_name)
-        # the root component also becomes invalid (in practice it is not always a component, but good enough)
-        registry.add_invalid_component(nesting_long_names[0])
-
-
-    if key_ref_name in type_infos and value_ref_name in type_infos:
     __annotations__ = {
         "list": keys_collection,
         "list_index": IntProperty(name = "Index for keys", default = 0,  update=update),
-            "keys_setter":keys_property_group_pointer,
-
         "values_list": values_collection,
         "values_list_index": IntProperty(name = "Index for values", default = 0,  update=update),
-            "values_setter":values_property_group_pointer,
     }
-    
+    '''
-    """__annotations__["list"] = StringProperty(default="N/A")
+    "values_setter": values_setter,
-    __annotations__["values_list"] = StringProperty(default="N/A")
+        "values_list": values_collection,
-    __annotations__["keys_setter"] = StringProperty(default="N/A")"""
+        "values_list_index": IntProperty(name = "Index for values", default = 0,  update=update),
-    
+    '''
-    """registry.add_missing_typeInfo(key_ref_name)
-    registry.add_missing_typeInfo(value_ref_name)
-    # the root component also becomes invalid (in practice it is not always a component, but good enough)
-    registry.add_invalid_component(nesting_long_names[0])
-    print("setting invalid flag for", nesting_long_names[0])"""
 
     return __annotations__

tools/bevy_components/propGroups/utils.py

@@ -14,7 +14,10 @@ def generate_wrapper_propertyGroup(wrapped_type_long_name_name, item_long_name,
     is_item_value_type = item_long_name in value_types_defaults
 
     wrapper_name = "wrapper_" + wrapped_type_long_name_name
+    print("WRAPPER NAME", wrapper_name)
 
+
+    # FIXME: this is not a correct generic value for hashmaps !!?
     wrapper_definition = {
         "isComponent": False,
         "isResource": False,

tools/bevy_components/registry/ui.py

@@ -132,18 +132,17 @@ class BEVY_COMPONENTS_PT_AdvancedToolsPanel(bpy.types.Panel):
                     comp_names = []
                     for index, component_meta in enumerate(components_metadata):
                         short_name = component_meta.name
-                        long_name = component_meta.long_name
                         if component_meta.invalid:
-                            self.draw_invalid_or_unregistered(layout, "Invalid", long_name, object)
+                            self.draw_invalid_or_unregistered(layout, "Invalid", short_name, object)
                         
                             if not object.name in objects_with_invalid_components:
                                 objects_with_invalid_components.append(object.name)
                             
-                            if not long_name in invalid_component_names:
+                            if not short_name in invalid_component_names:
-                                invalid_component_names.append(long_name)
+                                invalid_component_names.append(short_name)
 
 
-                        comp_names.append(long_name) 
+                        comp_names.append(short_name) 
 
                     for custom_property in object.keys():
                         if custom_property != 'components_meta' and custom_property not in comp_names:
@@ -151,7 +150,7 @@ class BEVY_COMPONENTS_PT_AdvancedToolsPanel(bpy.types.Panel):
 
                             if not object.name in objects_with_invalid_components:
                                 objects_with_invalid_components.append(object.name)
-                            if not long_name in invalid_component_names:
+                            if not short_name in invalid_component_names:
                                 invalid_component_names.append(custom_property)
         layout.separator()
         layout.separator()