Fix space in path not working. Add configurable palette

Author: oli414

RCT Graphics Helper Addon/rct_graphics_helper/general_panel.py

@@ -12,6 +12,28 @@
 import os
 
 class GeneralProperties(bpy.types.PropertyGroup):
+    script_file = os.path.realpath(__file__)
+    directory = os.path.dirname(script_file)
+    default_palette_path = directory + "\\res\\palette.gif"
+    palette_path = bpy.props.StringProperty(
+        name="Palette Path",
+        description="Palette to dither to",
+        maxlen= 1024,
+        subtype='FILE_PATH',
+        default= default_palette_path)
+
+    number_of_rider_sets = bpy.props.IntProperty(
+        name = "Rider Sets",
+        description = "Number of unqique sets of riders. Usually just the amount of peeps for this vehicle/ride. Some rides for example only expect peeps in sets of 2 to lower the amount of required graphics. This is often done on vehicles which carry 4 or more riders.",
+        default = 0,
+        min = 0)
+        
+    number_of_animation_frames = bpy.props.IntProperty(
+        name = "Animation Frames",
+        description = "Number of animation frames. For example in use for swinging, rotating or animated ride vehicles, animated rides, and animated scenery.",
+        default = 1,
+        min = 1)
+        
     out_start_index = bpy.props.IntProperty(
         name = "Output Starting Index",
         description = "Number to start counting from for the output file names",
@@ -38,6 +60,15 @@ def draw(self, context):
         scene = context.scene
         properties = scene.rct_graphics_helper_general_properties
 
+        row = layout.row()
+        row.prop(properties, "palette_path")
+        
+        row = layout.row()
+        row.prop(properties, "number_of_rider_sets")
+
+        row = layout.row()
+        row.prop(properties, "number_of_animation_frames")
+        
         row = layout.row()
         row.prop(properties, "out_start_index")
 

RCT Graphics Helper Addon/rct_graphics_helper/render_task.py

@@ -41,13 +41,11 @@ def rotate_rig(context, angle, verAngle=0, bankedAngle=0, midAngle=0):
         return True
 
 def post_render(context, index):
-    magickPath = "magick"
-    outputPath = get_output_path(context, index)
+    magick_path = "magick"
+    output_path = get_output_path(context, index)
 
-    script_file = os.path.realpath(__file__)
-    directory = os.path.dirname(script_file)
-    palettePath = directory + "\\res\\palette.gif"
-    result = str(subprocess.check_output(magickPath + " " + outputPath + " -fuzz 0 -fill none -opaque rgb(57,59,57)  -quantize RGB -dither FloydSteinberg -define dither:diffusion-amount=30% -remap \"" + palettePath + "\" -colorspace sRGB -bordercolor none -border 1 -trim -format  \"%[fx:page.x - page.width/2] %[fx:page.y - page.height/2]\" -write info: " + outputPath, shell=True))
+    palette_path = context.scene.rct_graphics_helper_general_properties.palette_path
+    result = str(subprocess.check_output(magick_path + " \"" + output_path + "\" -fuzz 0 -fill none -opaque rgb(57,59,57)  -quantize RGB -dither FloydSteinberg -define dither:diffusion-amount=30% -remap \"" + palette_path + "\" -colorspace sRGB -bordercolor none -border 1 -trim -format  \"%[fx:page.x - page.width/2] %[fx:page.y - page.height/2]\" -write info: \"" + output_path + "\"", shell=True))
 
     offset_file = open(get_offset_output_path(context, index), "w")
     offset_file.write(result[2:][:-1])

RCT Graphics Helper Addon/rct_graphics_helper/res/palette_remap1.gif

@@ -28,8 +28,8 @@ def execute(self, context):
 
         self.renderTask = RenderTask(context.scene.rct_graphics_helper_general_properties.out_start_index, context)
 
-        for i in range(self.props.number_of_rider_sets + 1):
-            self.renderTask.add([[ False, context.scene.rct_graphics_helper_static_properties.viewing_angles, 0, 0, 0 ]], i, False, 0, self.props.number_of_animation_frames)
+        for i in range(context.scene.rct_graphics_helper_general_properties.number_of_rider_sets + 1):
+            self.renderTask.add([[ False, context.scene.rct_graphics_helper_static_properties.viewing_angles, 0, 0, 0 ]], i, False, 0, context.scene.rct_graphics_helper_general_properties.number_of_animation_frames)
 
         return super(RenderStatic, self).execute(context)
 
@@ -43,18 +43,6 @@ class StaticProperties(bpy.types.PropertyGroup):
         description = "Number of viewing angles to render for",
         default = 4,
         min = 1)
-        
-    number_of_rider_sets = bpy.props.IntProperty(
-        name = "Rider Sets",
-        description = "Number of unqique sets of riders. Usually just the amount of riders for this vehicle. Some rides for example only expect rides in sets of 2 to lower the amount of required graphics. This is often done on vehicles which carry 4 or more riders.",
-        default = 0,
-        min = 0)
-        
-    number_of_animation_frames = bpy.props.IntProperty(
-        name = "Animation Frames",
-        description = "Number of animation frames. For example in use for animated scenery and/or rides.",
-        default = 1,
-        min = 1)
 
 
 class StaticPanel(bpy.types.Panel):
@@ -71,12 +59,6 @@ def draw(self, context):
 
         row = layout.row()
         row.prop(properties, "viewing_angles")
-
-        row = layout.row()
-        row.prop(properties, "number_of_rider_sets")
-        
-        row = layout.row()
-        row.prop(properties, "number_of_animation_frames")
 
         row = layout.row()
         row.operator("render.rct_static", text = "Render Static Object")

RCT Graphics Helper Addon/rct_graphics_helper/res/palette_remap2.gif

@@ -37,9 +37,9 @@ def property_value(self, key):
 
     def append_angles_to_rendertask(self, render_layer, inverted):
         start_anim = 0
-        if self.props.number_of_animation_frames != 1:
+        if self.scene.rct_graphics_helper_general_properties.number_of_animation_frames != 1:
             start_anim = 4
-        anim_count = self.props.number_of_animation_frames
+        anim_count = self.scene.rct_graphics_helper_general_properties.number_of_animation_frames
         for i in range(len(track_angle_sections_names)):
             key = track_angle_sections_names[i]
             track_section = track_angle_sections[key]
@@ -70,7 +70,7 @@ def execute(self, context):
         self.renderTask = RenderTask(context.scene.rct_graphics_helper_general_properties.out_start_index, context)
 
 
-        for i in range(self.props.number_of_rider_sets + 1):
+        for i in range(context.scene.rct_graphics_helper_general_properties.number_of_rider_sets + 1):
             self.append_angles_to_rendertask(i, False)
 
             if self.props.inverted_set:
@@ -160,25 +160,13 @@ class VehicleProperties(bpy.types.PropertyGroup):
 
     restraint_animation = bpy.props.BoolProperty(
         name = "Restraint Animation",
-        description = "Render restraint animation",
+        description = "Render with restraint animation. The restrain animation is 3 frames long and starts at frame 1",
         default = False)
 
     inverted_set = bpy.props.BoolProperty(
         name = "Inverted Set",
         description = "Used for rides which can invert for an extended amount of time like the flying and lay-down rollercoasters",
         default = False)
-        
-    number_of_rider_sets = bpy.props.IntProperty(
-        name = "Rider Sets",
-        description = "Number of unqique sets of riders. Usually just the amount of riders for this vehicle. Some rides for example only expect rides in sets of 2 to lower the amount of required graphics. This is often done on vehicles which carry 4 or more riders.",
-        default = 0,
-        min = 0)
-        
-    number_of_animation_frames = bpy.props.IntProperty(
-        name = "Animation Frames",
-        description = "Number of animation frames. For example in use for swinging, rotating or animated ride vehicles.",
-        default = 1,
-        min = 1)
 
 class VehiclesPanel(bpy.types.Panel):
     bl_label = "RCT Vehicles"
@@ -210,12 +198,6 @@ def draw(self, context):
         row = layout.row()
         row.prop(properties, "inverted_set")
 
-        row = layout.row()
-        row.prop(properties, "number_of_rider_sets")
-
-        row = layout.row()
-        row.prop(properties, "number_of_animation_frames")
-
         row = layout.row()
         row.operator("render.rct_vehicle", text = "Render Vehicle")