From ebf82b902f493373d82e3df45653b9abfa224fb4 Mon Sep 17 00:00:00 2001 From: "kaosat.dev" Date: Sun, 5 May 2024 22:18:16 +0200 Subject: [PATCH] feat(bevy_components): more tweaks --- tools/bevy_components/TODO.md | 3 ++- tools/bevy_components/components/metadata.py | 14 +++++++++++--- tools/bevy_components/components/operators.py | 9 ++++----- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tools/bevy_components/TODO.md b/tools/bevy_components/TODO.md index 0a6cb93..7b79172 100644 --- a/tools/bevy_components/TODO.md +++ b/tools/bevy_components/TODO.md @@ -214,8 +214,9 @@ Restructuring of storage of components - [x] marking of invalid root propgroups/components should be based on long name - [ ] overhaul & check each prop group type's use of short names => long names - [ ] lists +- [ ] property_name = short_name in process enum: will likely require to use another indirection helper to keep the propery names short -- [ ] in conversions from propgroups +- [x] in conversions from propgroups component_name = definition["short_name"] - [ ] fix is_component_valid that is used in gltf_auto_export diff --git a/tools/bevy_components/components/metadata.py b/tools/bevy_components/components/metadata.py index 2b2db58..1b43175 100644 --- a/tools/bevy_components/components/metadata.py +++ b/tools/bevy_components/components/metadata.py @@ -120,9 +120,17 @@ def upsert_bevy_component(object, long_name, value): def remove_bevy_component(object, long_name): if 'bevy_components' in object: - current = json.loads(object['bevy_components']) - del current[long_name] - object['bevy_components'] = json.dumps(current) + bevy_components = json.loads(object['bevy_components']) + del bevy_components[long_name] + object['bevy_components'] = json.dumps(bevy_components) + +def rename_bevy_component(object, original_long_name, new_long_name): + if 'bevy_components' in object: + bevy_components = json.loads(object['bevy_components']) + original_component = bevy_components.get(original_long_name, None) + bevy_components[new_long_name] = original_component + del bevy_components[original_long_name] + object['bevy_components'] = json.dumps(bevy_components) def get_bevy_components(object): if 'bevy_components' in object: diff --git a/tools/bevy_components/components/operators.py b/tools/bevy_components/components/operators.py index 643accf..e249955 100644 --- a/tools/bevy_components/components/operators.py +++ b/tools/bevy_components/components/operators.py @@ -4,7 +4,7 @@ import bpy from bpy_types import Operator from bpy.props import (StringProperty) -from .metadata import add_component_from_custom_property, add_component_to_object, add_metadata_to_components_without_metadata, apply_customProperty_values_to_object_propertyGroups, apply_propertyGroup_values_to_object_customProperties_for_component, copy_propertyGroup_values_to_another_object, get_bevy_component_value_by_long_name, get_bevy_components, is_bevy_component_in_object, remove_component_from_object, toggle_component +from .metadata import add_component_from_custom_property, add_component_to_object, apply_propertyGroup_values_to_object_customProperties_for_component, copy_propertyGroup_values_to_another_object, get_bevy_component_value_by_long_name, get_bevy_components, is_bevy_component_in_object, remove_component_from_object, rename_bevy_component, toggle_component class AddComponentOperator(Operator): """Add Bevy component to object""" @@ -214,11 +214,11 @@ class OT_rename_component(Operator): if original_name != '' and new_name != '' and original_name != new_name and len(target_objects) > 0: for index, object_name in enumerate(target_objects): object = bpy.data.objects[object_name] - if object and original_name in object: + if object and original_name in get_bevy_components(object): # copy data to new component, remove the old one try: - object[new_name] = object[original_name] + rename_bevy_component(object=object, original_long_name=original_name, new_long_name=new_name) remove_component_from_object(object, original_name) except Exception as error: if '__disable__update' in object: @@ -238,7 +238,7 @@ class OT_rename_component(Operator): # attempt conversion long_name = new_name component_definition = type_infos[long_name] - add_component_to_object(object, component_definition, object[new_name]) + add_component_to_object(object, component_definition, get_bevy_component_value_by_long_name(new_name)) except Exception as error: if '__disable__update' in object: del object["__disable__update"] # make sure custom properties are updateable afterwards, even in the case of failure @@ -270,7 +270,6 @@ class OT_rename_component(Operator): context.window_manager.bevy_component_rename_helper.original_name = "" context.window_manager.components_rename_progress = -1.0 - return {'FINISHED'}