Rework to add a car parent

Author: duncanspumpkin

loco-graphics-helper/loco_object_helper_panel.py

@@ -32,6 +32,23 @@ def draw(self, context):
         if object_properties.object_type == "BOGIE":
             self.draw_bogie_panel(context, layout)
 
+        if object_properties.object_type == "CAR":
+            self.draw_car_panel(context, layout)
+
+    def draw_car_panel(self, context, layout):
+        scene = context.scene
+        general_properties = scene.loco_graphics_helper_general_properties
+        row = layout.row()
+
+        if not general_properties.render_mode == "VEHICLE":
+            row.label("Vehicle Render Mode Required")
+            return
+
+        vehicle_properties = context.object.loco_graphics_helper_vehicle_properties
+
+        row.prop(vehicle_properties, "index")
+        row = layout.row()
+
     def draw_bogie_panel(self, context, layout):
         scene = context.scene
         general_properties = scene.loco_graphics_helper_general_properties
@@ -49,9 +66,6 @@ def draw_bogie_panel(self, context, layout):
         if vehicle_properties.is_clone_bogie:
             row.prop(vehicle_properties, "index",text="Clone of bogie index:")
             row = layout.row()
-            
-            row.prop(vehicle_properties, "bogie_parent_index")
-            row = layout.row()
             return
 
         box = layout.box()
@@ -78,9 +92,6 @@ def draw_bogie_panel(self, context, layout):
         row.prop(vehicle_properties, "index")
         row = layout.row()
 
-        row.prop(vehicle_properties, "bogie_parent_index")
-        row = layout.row()
-
         row.prop(vehicle_properties, "number_of_animation_frames")
         row = layout.row()
 

loco-graphics-helper/properties/object_properties.py

@@ -36,6 +36,7 @@ class ObjectProperties(bpy.types.PropertyGroup):
             ("BODY", "Body", "", 1),
             ("BOGIE", "Bogie", "", 2),
             ("CARGO", "Cargo", "", 3),
+            ("CAR", "Car", "", 4),
         ),
         default="NONE",
         update=object_type_update_func

loco-graphics-helper/properties/vehicle_properties.py

@@ -122,12 +122,6 @@ class VehicleProperties(bpy.types.PropertyGroup):
         default=False
     )
 
-    bogie_parent_index = bpy.props.IntProperty(
-        name="Parent Body Index",
-        description="Set to the parent body index",
-        default=1,
-        min=1)
-
 
 def register_vehicles_properties():
     bpy.types.Object.loco_graphics_helper_vehicle_properties = bpy.props.PointerProperty(

loco-graphics-helper/rct_graphics_helper_panel.py

@@ -238,6 +238,25 @@ def get_number_of_sprites(object):
             num_sprites = num_sprites + int(props.flat_viewing_angles) * multiplier / 2
         return int(num_sprites)
 
+    @staticmethod
+    def get_min_max_x_bound_box_corners_with_children(object):
+        mins = []
+        maxs = []
+        min_x, max_x = GraphicsHelperPanel.get_min_max_x_bound_box_corners(object)
+        # This can happen if there are no dimensions to this object (or if its 0 width)
+        if min_x != max_x:
+            mins.append(min_x)
+            maxs.append(max_x)
+
+        for c in object.children:
+            min_x, max_x = GraphicsHelperPanel.get_min_max_x_bound_box_corners_with_children(c)
+            if min_x != max_x:
+                mins.append(min_x)
+                maxs.append(max_x)
+        if len(mins) == 0 or len(maxs) == 0:
+            return (0, 0)
+        return (min(mins), max(maxs))
+
     @staticmethod
     def get_min_max_x_bound_box_corners(object):
         bbox_corners = [object.matrix_world * Vector(corner) for corner in object.bound_box]
@@ -250,19 +269,20 @@ def get_longest_component_edge(front, back, body):
         mins = []
         maxs = []
         if not front is None:
-            min_x, max_x = GraphicsHelperPanel.get_min_max_x_bound_box_corners(front)
-            mins.append(min_x)
-            maxs.append(max_x)
+            min_x, max_x = GraphicsHelperPanel.get_min_max_x_bound_box_corners_with_children(front)
+            if min_x != max_x:
+                mins.append(min_x)
+                maxs.append(max_x)
 
         if not back is None:
-            min_x, max_x = GraphicsHelperPanel.get_min_max_x_bound_box_corners(back)
-            mins.append(min_x)
-            maxs.append(max_x)
+            min_x, max_x = GraphicsHelperPanel.get_min_max_x_bound_box_corners_with_children(back)
+            if min_x != max_x:
+                mins.append(min_x)
+                maxs.append(max_x)
 
-        body_min_x, body_max_x = GraphicsHelperPanel.get_min_max_x_bound_box_corners(body)
+        body_min_x, body_max_x = GraphicsHelperPanel.get_min_max_x_bound_box_corners_with_children(body)
         mins.append(body_min_x)
         maxs.append(body_max_x)
-
         min_x = body.location[0] - min(mins)
         max_x = max(maxs) - body.location[0]
         return max(min_x, max_x)
@@ -275,18 +295,24 @@ def get_bogie_position_from_component(bogie, body, half_width):
         return half_width - position_from_centre
 
     @staticmethod 
-    def get_car_components(bogies, bodies):
+    def get_car_components(cars):
         components = []
-        for body in bodies:
-            component_bogies = [x for x in bogies if x.loco_graphics_helper_vehicle_properties.bogie_parent_index == body.loco_graphics_helper_vehicle_properties.index]
+        for car in cars:
+            component_bogies = [x for x in car.children if x.loco_graphics_helper_object_properties.object_type == 'BOGIE']
+            component_bodies = [x for x in car.children if x.loco_graphics_helper_object_properties.object_type == 'BODY']
+
+            if len(component_bodies) != 1:
+                print("Malformed car {}".format(car.name))
+                continue
+
             if len(component_bogies) != 2:
-                components.append((None, None, body))
+                components.append((None, None, component_bodies[0]))
                 continue
 
             front_bogie = component_bogies[0] if component_bogies[0].location[0] > component_bogies[1].location[0] else component_bogies[1]
             back_bogie = component_bogies[1] if component_bogies[0].location[0] > component_bogies[1].location[0] else component_bogies[0]
 
-            components.append((front_bogie, back_bogie, body))
+            components.append((front_bogie, back_bogie, component_bodies[0]))
         return components
 
     @staticmethod
@@ -295,21 +321,21 @@ def blender_to_loco_dist(dist):
 
     def draw_vehicle_panel(self, scene, layout):
         general_properties = scene.loco_graphics_helper_general_properties
-        bodies = [x for x in scene.objects if x.loco_graphics_helper_object_properties.object_type == "BODY"]
-        bodies = sorted(bodies, key=lambda x: x.loco_graphics_helper_vehicle_properties.index)
-        bogies = [x for x in scene.objects if x.loco_graphics_helper_object_properties.object_type == "BOGIE"]
-        bogies = sorted(bogies, key=lambda x: x.loco_graphics_helper_vehicle_properties.index)
+        
+        cars = [x for x in scene.objects if x.loco_graphics_helper_object_properties.object_type == "CAR"]
+        cars = sorted(cars, key=lambda x: x.loco_graphics_helper_vehicle_properties.index)
 
         total_number_of_sprites = 0
 
-        components = self.get_car_components(bogies, bodies)
+        components = self.get_car_components(cars)
         if len(components) > 0:     
             row = layout.row()
             row.label("Car(s) details:")
 
             for component in components:
                 front, back, body = component
                 idx = body.loco_graphics_helper_vehicle_properties.index
+                print("Car {}".format(idx))
                 half_width = self.get_longest_component_edge(front, back, body)
 
                 front_position = 0
@@ -337,6 +363,11 @@ def draw_vehicle_panel(self, scene, layout):
                     row = layout.row()
                     row.label("    WARNING: {},".format(warning))
 
+        bodies = [x for x in scene.objects if x.loco_graphics_helper_object_properties.object_type == "BODY"]
+        bodies = sorted(bodies, key=lambda x: x.loco_graphics_helper_vehicle_properties.index)
+        bogies = [x for x in scene.objects if x.loco_graphics_helper_object_properties.object_type == "BOGIE"]
+        bogies = sorted(bogies, key=lambda x: x.loco_graphics_helper_vehicle_properties.index)
+
         if len(bodies) > 0:
             row = layout.row()
             row.label("Body(s) details:")