Various fixes:

* Fix bogies drawing transition frames
* Reset ambient occlusion on init (fix over exposure)
* Reset number of recolorables to 2 when selecting VEHICLE render
* Removed sprites.json merging

Author: duncanspumpkin

loco-graphics-helper/__init__.py

@@ -25,7 +25,7 @@
     "name": "Loco Graphics Helper",
     "description": "Render tool to replicate Locomotion graphics (based on RCT Graphics Helper)",
     "author": "Olivier Wervers & OpenLoco Team",
-    "version": (0, 1, 4),
+    "version": (0, 1, 5),
     "blender": (2, 79, 0),
     "location": "Render",
     "support": "COMMUNITY",

loco-graphics-helper/builders/scene_builder.py

@@ -73,11 +73,13 @@ def build(self, context):
         dome_light_obj.parent = vertical_joint_obj
 
         # Environment lighting
-        bpy.data.worlds["World"].light_settings.use_environment_light = True
-        bpy.data.worlds["World"].light_settings.environment_energy = 0.15
-        bpy.data.worlds["World"].light_settings.gather_method = "RAYTRACE"
-        bpy.data.worlds["World"].light_settings.distance = 0
-        bpy.data.worlds["World"].light_settings.samples = 1
+        light_settings = scene.world.light_settings
+        light_settings.use_ambient_occlusion = False
+        light_settings.use_environment_light = True
+        light_settings.environment_energy = 0.15
+        light_settings.gather_method = "RAYTRACE"
+        light_settings.distance = 0
+        light_settings.samples = 1
 
     def create_camera(self, context):
         name = self.prefix + "Camera" + self.suffix

loco-graphics-helper/operators/vehicle_render_operator.py

@@ -66,8 +66,10 @@ def should_render_feature(self, key, props):
 
     def add_render_angles(self, car_object):
         props = car_object.loco_graphics_helper_vehicle_properties
+        is_bogie = car_object.loco_graphics_helper_object_properties.object_type == "BOGIE"
         animation_frames = props.number_of_animation_frames
         roll_frames = 1 if props.roll_angle == 0 else 3
+        
         for i in range(len(track_angle_sections_names)):
             key = track_angle_sections_names[i]
             if self.should_render_feature(key, props):
@@ -79,6 +81,10 @@ def add_render_angles(self, car_object):
                         base_view_angle, 0, vertical_angle=track_section[2])
 
                     num_viewing_angles = track_section[1]
+                    if track_section[0] and is_bogie:
+                        # Bogies have no transition sprites
+                        continue
+
                     if not track_section[0]:
                         if i == 0:
                             num_viewing_angles = int(props.flat_viewing_angles)

loco-graphics-helper/processors/sub_processes/sprites_manifest_processor.py

@@ -37,14 +37,8 @@ def get_index(output_info):
 
         output_info_list.sort(key=get_index)
 
-        images = []
-        if os.path.exists(file_path):
-            with open(file_path, "r") as images_file:
-                images = json.loads(images_file.read(),
-                                    object_pairs_hook=OrderedDict)
-                images_file.close()
-
         with open(file_path, "w") as images_file:
+            images = []
             for output_info in output_info_list:
                 while len(images) <= output_info.index:
                     images.append("")

loco-graphics-helper/properties/general_properties.py

@@ -13,6 +13,13 @@
 
 from ..models.palette import palette_colors, palette_colors_details
 
+def render_mode_update_func(self, context):
+    scene = context.scene
+    props = scene.loco_graphics_helper_general_properties
+    
+    # Vehicles **always** draw in game with 2 recolorables
+    if props.render_mode == "VEHICLE":
+        props.number_of_recolorables = 2
 
 class GeneralProperties(bpy.types.PropertyGroup):
     script_file = os.path.realpath(__file__)
@@ -96,7 +103,8 @@ class GeneralProperties(bpy.types.PropertyGroup):
              "Renders a wall piece.", 3),
             ("TRACK", "Track",
              "Renders track pieces.", 4)
-        )
+        ),
+        update=render_mode_update_func
     )
 
     rendering = bpy.props.BoolProperty(

loco-graphics-helper/rct_graphics_helper_panel.py

@@ -213,6 +213,7 @@ def draw_track_panel(self, scene, layout):
         #    row.operator("render.loco_track", text=text)
     @staticmethod
     def get_number_of_sprites(object):
+        is_bogie = object.loco_graphics_helper_object_properties.object_type == "BOGIE"
         props = object.loco_graphics_helper_vehicle_properties
 
         multiplier = props.number_of_animation_frames
@@ -223,13 +224,14 @@ def get_number_of_sprites(object):
         if props.rotational_symmetry:
             multiplier = multiplier / 2
 
+        num_transition_sprites = 0 if is_bogie else 4 + 4
         num_sprites = 0
         if props.sprite_track_flags[0]:
             num_sprites = int(props.flat_viewing_angles) * multiplier
         if props.sprite_track_flags[1]:
-            num_sprites = num_sprites + (int(props.sloped_viewing_angles) * 2 + 8) * multiplier
+            num_sprites = num_sprites + (int(props.sloped_viewing_angles) * 2 + num_transition_sprites) * multiplier
         if props.sprite_track_flags[2]:
-            num_sprites = num_sprites + (int(props.sloped_viewing_angles) * 2 + 8) * multiplier
+            num_sprites = num_sprites + (int(props.sloped_viewing_angles) * 2 + num_transition_sprites) * multiplier
         return int(num_sprites)
 
     def draw_vehicle_panel(self, scene, layout):