Fix the problem of state.led_part_length_map

Author: ExuberantIris

editor-blender/core/actions/property/animation_data/control.py

@@ -411,7 +411,7 @@ def _update_no_change_keyframe(
         part_obj = data_objects[part_obj_name]
         dancer_name = getattr(part_obj, "ld_dancer_name")
         part_name = getattr(part_obj, "ld_part_name")
-        part_length = state.led_part_length_map[part_name]
+        part_length = state.led_part_length_map[dancer_name][part_name]
 
         led_effect_table = state.led_effect_id_table
 

editor-blender/core/actions/state/control_editor.py

@@ -214,13 +214,20 @@ def take_ctrl_data_from_model(
                 ld_alpha: int = getattr(part_obj, "ld_alpha")
                 partControlData.append((effect_id, ld_alpha))
                 if effect_id == 0:
+                    part_length = part.length
+
                     bulb_objs: list[bpy.types.Object] = list(
                         getattr(part_obj, "children")
                     )
                     bulb_objs.sort(key=lambda _obj: getattr(_obj, "ld_led_pos"))
                     bulb_color_list: list[tuple[int, int]] = [
                         (obj["ld_color"], getattr(obj, "ld_alpha")) for obj in bulb_objs
                     ]
+                    if len(bulb_color_list) != part_length:
+                        raise Exception(
+                            f"Bulb number {len(bulb_color_list)} does not match actual part length {part_length}"
+                        )
+
                     partLEDControlData.append(bulb_color_list)
                 else:
                     partLEDControlData.append([])
@@ -287,6 +294,7 @@ async def save_control_frame(start: int | None = None):
 
     with send_request():
         try:
+            print(controlData, ledControlData, fadeData, hasEffectData, start)
             await control_agent.save_frame(
                 id,
                 controlData,

editor-blender/core/actions/state/initialize.py

@@ -362,10 +362,11 @@ async def init_dancers():
     led_part_length_map: LEDPartLengthMap = {}
 
     for dancer in dancers_array:
+        led_part_length_map[dancer.name] = {}
         for part in dancer.parts:
             part_type_map[part.name] = part.type
             if part.type == PartType.LED and part.length is not None:
-                led_part_length_map[part.name] = part.length
+                led_part_length_map[dancer.name][part.name] = part.length
 
     dancer_part_index_map: DancerPartIndexMap = {}
 

editor-blender/core/models/__init__.py

@@ -167,7 +167,7 @@ class PartType(Enum):
 
 
 PartTypeMap = dict[PartName, PartType]
-LEDPartLengthMap = dict[LEDPartName, int]
+LEDPartLengthMap = dict[DancerName, dict[LEDPartName, int]]
 
 
 Dancers = dict[DancerName, list[PartName]]

editor-blender/core/utils/convert.py

@@ -1068,7 +1068,6 @@ def control_modify_to_animation_data(
                             ]
                         )
                     else:
-                        part_length = state.led_part_length_map[part_name]
                         led_rgb_floats = [(0.0, 0.0, 0.0)] * part_length
 
                     for i in range(part_length):
@@ -1127,7 +1126,6 @@ def control_modify_to_animation_data(
                             ]
                         )
                     else:
-                        part_length = state.led_part_length_map[part_name]
                         led_rgb_floats = [(0.0, 0.0, 0.0)] * part_length
 
                     if len(part_map) == 0:
@@ -1228,6 +1226,25 @@ def control_map_to_animation_data(
                             (led_data.color_id, led_data.alpha)
                             for led_data in part_led_status
                         ]
+                        # try:
+                        #     led_rgb_floats = gradient_to_rgb_float(
+                        #         [
+                        #             (led_data.color_id, led_data.alpha)
+                        #             for led_data in part_led_status
+                        #         ]
+                        #     )
+                        #     prev_effect_id[0] = 0
+                        #     prev_led_bulbs[0] = [
+                        #         (led_data.color_id, led_data.alpha)
+                        #         for led_data in part_led_status
+                        #     ]
+                        # except:
+                        #     print(dancer_name, part_name, frame.start, part_data.effect_id)
+                        #     print(part_led_status, [
+                        #         (led_data.color_id, led_data.alpha)
+                        #         for led_data in part_led_status
+                        #     ])
+                        #     led_rgb_floats = [(0.0, 0.0, 0.0)] * part_length
 
                     elif prev_effect_id[0] > 0:
                         prev_effect = led_effect_table[prev_effect_id[0]].effect
@@ -1240,13 +1257,27 @@ def control_map_to_animation_data(
                         led_rgb_floats = gradient_to_rgb_float(prev_led_bulbs[0])
 
                     else:
-                        led_rgb_floats = [(0, 0, 0)] * part_length
+                        led_rgb_floats = [(0.0, 0.0, 0.0)] * part_length
 
                     if len(part_map) == 0:
                         part_map.extend([[] for _ in range(part_length)])  # type: ignore
 
+                    # FIXME: delete this
+                    if len(led_rgb_floats) != part_length:
+                        print(
+                            frame.start,
+                            dancer_name,
+                            part_name,
+                            len(led_rgb_floats),
+                            part_length,
+                        )
                     for i in range(part_length):
                         part_map[i].append((frame.start, part_fade, led_rgb_floats[i]))  # type: ignore
+                        # try:
+                        #     part_map[i].append((frame.start, part_fade, led_rgb_floats[i]))  # type: ignore
+                        # except Exception as _:
+                        #     #FIXME: This is just a quickfix, find a better way to do this!
+                        #     part_map[i].append((frame.start, part_fade, (0.0, 0.0, 0.0)))  # type: ignore
 
                 else:
                     part_rgb = color_map[part_data.color_id].rgb