Try fix calcs after rework

Author: duncanspumpkin

loco-graphics-helper/frame.py

@@ -99,7 +99,7 @@ def prepare_scene(self):
             for c in self.target_object.children:
                 c.hide_render = False
 
-            object.location = self.target_object.location
+            object.location = self.target_object.matrix_world.translation
 
         # This is a little hacky...
         if self.layer == 'Top Down Shadow':

loco-graphics-helper/rct_graphics_helper_panel.py

@@ -248,6 +248,10 @@ def draw_vehicle_panel(self, scene, layout):
             anim_location = 0
             front_name = '' if front is None else front.name
             back_name = '' if back is None else back.name
+            mid_point_x = component.get_preferred_body_midpoint()
+            if not math.isclose(body.matrix_world.translation[0], mid_point_x, rel_tol=1e-4):
+                warning = "BODY LOCATION IS NOT AT PREFERRED MID X POINT! {}".format(mid_point_x)
+
             if not front is None:
                 front_position = component.get_bogie_position(SubComponent.FRONT)
                 back_position = component.get_bogie_position(SubComponent.BACK)
@@ -259,9 +263,7 @@ def draw_vehicle_panel(self, scene, layout):
                 if component.get_number_of_sprites(SubComponent.BACK) != 0:
                     back_idx = back.loco_graphics_helper_vehicle_properties.index - 1
                     back_idx = back_idx + 180 if front.loco_graphics_helper_vehicle_properties.is_inverted else back_idx
-                mid_point_x = (front.location[0] - back.location[0]) / 2 + back.location[0]
-                if not math.isclose(body.location[0], mid_point_x, rel_tol=1e-4):
-                    warning = "BODY LOCATION IS NOT AT MID X POINT BETWEEN BOGIES! {}".format(mid_point_x)
+
                 anim_location = component.get_animation_location()
                 if anim_location > 255 or anim_location < 0:
                     warning = "Animation is too far from bogies"

loco-graphics-helper/vehicle.py

@@ -35,6 +35,20 @@ def get_object(self, sub_component: SubComponent):
             SubComponent.BODY.value:self.body,
         }
         return object_mapping[sub_component.value]
+    
+    
+    def has_sprites(self, sub_component: SubComponent):
+        object = self.get_object(sub_component)
+        if object is None:
+            return False
+        props = object.loco_graphics_helper_vehicle_properties
+        if props.is_clone:
+            return False
+        
+        if all(v == 0 for v in props.sprite_track_flags):
+            return False
+        
+        return True
 
     def get_number_of_sprites(self, sub_component: SubComponent):
         object = self.get_object(sub_component)
@@ -64,16 +78,22 @@ def get_number_of_sprites(self, sub_component: SubComponent):
         return int(num_sprites)
 
     def _get_min_max_x_bound_box_corners_with_children(self, object):
+        return self._get_min_max_axis_bound_box_corners_with_children(object, 0)
+    
+    def _get_min_max_z_bound_box_corners_with_children(self, object):
+        return self._get_min_max_axis_bound_box_corners_with_children(object, 2)
+    
+    def _get_min_max_axis_bound_box_corners_with_children(self, object, axis):
         mins = []
         maxs = []
-        min_x, max_x = self._get_min_max_x_bound_box_corners(object)
+        min_x, max_x = self._get_min_max_axis_bound_box_corners(object, axis)
         # 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 = self._get_min_max_x_bound_box_corners_with_children(c)
+            min_x, max_x = self._get_min_max_axis_bound_box_corners_with_children(c, axis)
             if min_x != max_x:
                 mins.append(min_x)
                 maxs.append(max_x)
@@ -82,10 +102,10 @@ def _get_min_max_x_bound_box_corners_with_children(self, object):
 
         return (min(mins), max(maxs))
 
-    def _get_min_max_x_bound_box_corners(self, object):
+    def _get_min_max_axis_bound_box_corners(self, object, axis):
         bbox_corners = [object.matrix_world * Vector(corner) for corner in object.bound_box]
-        min_x = min([x[0] for x in bbox_corners])
-        max_x = max([x[0] for x in bbox_corners])
+        min_x = min([x[axis] for x in bbox_corners])
+        max_x = max([x[axis] for x in bbox_corners])
         return (min_x, max_x)
 
     def get_half_width(self):
@@ -110,6 +130,16 @@ def get_half_width(self):
         max_x = max(maxs) - self.body.matrix_world.translation[0]
 
         return max(min_x, max_x)
+    
+    def get_preferred_body_midpoint(self):
+        if self.has_sprites(SubComponent.FRONT) or self.has_sprites(SubComponent.BACK):
+            # If it has a real bogey we should put midpoint between the two bogies
+            mid_point_x = (self.front.location[0] - self.back.location[0]) / 2 + self.back.location[0]
+        else:
+            # If it has fake/no bogies we should put midpoint in the centre of the body
+            body_min_x, body_max_x = self._get_min_max_x_bound_box_corners_with_children(self.body)
+            mid_point_x = (body_min_x + body_max_x) / 2
+        return mid_point_x
 
     def get_bogie_position(self, sub_component: SubComponent):
         assert sub_component != SubComponent.BODY
@@ -123,10 +153,11 @@ def get_animation_location(self):
         if len(self.animations) == 0:
             return 0
         x_diff = self.front.location[0] - self.back.location[0]
+        print("front_x {} back_x {} anim_x {}".format(self.front.location[0], self.back.location[0], self.animations[0].location[0]))
         x_factor = (1 / x_diff)
         anim_diff = self.front.location[0] - self.animations[0].location[0]
         anim_factor = (anim_diff * x_factor) * 128
-        return int(anim_factor) + 128
+        return int(anim_factor) + 64
 
 
 def get_car_components(cars) -> List[VehicleComponent]: