Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-16 21:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix missing task types for animations color scheme

Browse Source
This commit is contained in:
Sigma Dimensions (Yass)
2023-09-26 16:35:00 +01:00
parent 7ed4301c6c
commit c85e4e7ceb
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/tool/sequence.py
+11 -8
View File
@@ -1070,9 +1070,9 @@ class Sequence(blenderbim.core.tool.Sequence):
for predefined_type in data["PredefinedType"]: for predefined_type in data["PredefinedType"]:
if group in ["CREATION", "OPERATION", "MOVEMENT_TO"]: if group in ["CREATION", "OPERATION", "MOVEMENT_TO"]:
predefined_type_item = props.task_output_colors.add() predefined_type_item = props.task_output_colors.add()
elif group in ["MOVEMENT_FROM", "DESTRUCTION"]: elif group in ["MOVEMENT_FROM"]:
predefined_type_item = props.task_input_colors.add() predefined_type_item = props.task_input_colors.add()
elif group == "USERDEFINED": elif group in ["USERDEFINED", "DESTRUCTION"]:
predefined_type_item = props.task_input_colors.add() predefined_type_item = props.task_input_colors.add()
predefined_type_item2 = props.task_output_colors.add() predefined_type_item2 = props.task_output_colors.add()
predefined_type_item2.name = predefined_type predefined_type_item2.name = predefined_type
@@ -1299,19 +1299,17 @@ class Sequence(blenderbim.core.tool.Sequence):
cls.display_object(obj) cls.display_object(obj)
@classmethod @classmethod
def animate_objects(cls, settings, frames, clear_previous=True, animation_type=""): def animate_objects(cls, settings, frames, animation_type=""):
for obj in bpy.data.objects: for obj in bpy.data.objects:
if not obj.BIMObjectProperties.ifc_definition_id: if not obj.BIMObjectProperties.ifc_definition_id:
continue continue
if clear_previous:
cls.clear_object_animation(obj)
cls.earliest_frame = None cls.earliest_frame = None
product_frames = frames.get(obj.BIMObjectProperties.ifc_definition_id, []) product_frames = frames.get(obj.BIMObjectProperties.ifc_definition_id, [])
for product_frame in product_frames: for product_frame in product_frames:
if product_frame["relationship"] == "input": if product_frame["relationship"] == "input":
cls.animate_input(obj, settings["start_frame"], product_frame, animation_type) cls.animate_input(obj, settings["start_frame"], product_frame, animation_type)
elif product_frame["relationship"] == "output": elif product_frame["relationship"] == "output":
cls.animate_output(obj, settings["start_frame"], product_frame) cls.animate_output(obj, settings["start_frame"], product_frame, animation_type)
area = next(area for area in bpy.context.screen.areas if area.type == "VIEW_3D") area = next(area for area in bpy.context.screen.areas if area.type == "VIEW_3D")
area.spaces[0].shading.color_type = "OBJECT" area.spaces[0].shading.color_type = "OBJECT"
bpy.context.scene.frame_start = settings["start_frame"] bpy.context.scene.frame_start = settings["start_frame"]
@@ -1321,14 +1319,19 @@ class Sequence(blenderbim.core.tool.Sequence):
def animate_input(cls, obj, start_frame, product_frame, animation_type): def animate_input(cls, obj, start_frame, product_frame, animation_type):
props = bpy.context.scene.BIMAnimationProperties props = bpy.context.scene.BIMAnimationProperties
color = props.task_input_colors[product_frame["type"]].color color = props.task_input_colors[product_frame["type"]].color
cls.animate_destruction(obj, start_frame, product_frame, color, animation_type) if product_frame["type"] in ["LOGISTIC", "MOVE", "DISPOSAL"]:
cls.animate_destruction(obj, start_frame, product_frame, color, animation_type)
else:
cls.animate_consumption(obj, start_frame, product_frame, color, animation_type)
@classmethod @classmethod
def animate_output(cls, obj, start_frame, product_frame): def animate_output(cls, obj, start_frame, product_frame, animation_type):
props = bpy.context.scene.BIMAnimationProperties props = bpy.context.scene.BIMAnimationProperties
color = props.task_output_colors[product_frame["type"]].color color = props.task_output_colors[product_frame["type"]].color
if product_frame["type"] in ["CONSTRUCTION", "INSTALLATION", "NOTDEFINED"]: if product_frame["type"] in ["CONSTRUCTION", "INSTALLATION", "NOTDEFINED"]:
cls.animate_creation(obj, start_frame, product_frame, color) cls.animate_creation(obj, start_frame, product_frame, color)
elif product_frame["type"] in ["DEMOLITION", "DISMANTLE", "DISPOSAL", "REMOVAL"]:
cls.animate_destruction(obj, start_frame, product_frame, color, animation_type)
elif product_frame["type"] in ["ATTENDANCE", "MAINTENANCE", "OPERATION", "RENOVATION"]: elif product_frame["type"] in ["ATTENDANCE", "MAINTENANCE", "OPERATION", "RENOVATION"]:
cls.animate_operation(obj, start_frame, product_frame, color) cls.animate_operation(obj, start_frame, product_frame, color)
elif product_frame["type"] in ["LOGISTIC", "MOVE"]: elif product_frame["type"] in ["LOGISTIC", "MOVE"]: