Fix IM compatibility with 7.1. Render to custom recolor 1 colorfor better color accuracy. Improve recolorable materials base colors. Fix cross platform paranthesees in IM command

Author: oli414

README.md

@@ -39,13 +39,7 @@ Please check the [guidelines](https://github.com/oli414/Blender-RCT-Graphics/wik
 
 **Lighting**
 
-The lighting intensity of the three light sources (dome, filler and main) are not yet final, an may be tweaked in the future for better results. 
-
-**Primary Remap**
-
-The primary remap relies on the orange color group defined by OpenRCT2. This color group is suboptimal for dithering as the range (low to high) is drastically different from the color groups defined by the original game.
-
-This in practice means that the primary remap may turn out darker then expected. This will be fixed with a future update.
+The lighting intensity of the three light sources (dome, filler and main) are not yet final, an may be tweaked in the future for better results.
 
 **Animated Materials**
 

rct-graphics-helper/__init__.py

@@ -22,7 +22,7 @@
     "name": "RCT Graphics Helper",
     "description": "Render tool to replicate RCT graphics",
     "author": "Olivier Wervers",
-    "version": (0, 0, 3),
+    "version": (0, 3, 1),
     "blender": (2, 79, 0),
     "location": "Render",
     "support": "COMMUNITY",

rct-graphics-helper/builders/materials_builder.py

@@ -25,8 +25,8 @@ def __init__(self):
     def build(self, context):
         self.create_world_position_material(context)
 
-        self.create_recolorable_material("Recolorable 1", (1, 0.1, 0), 1)
-        self.create_recolorable_material("Recolorable 2", (0.8, 0, 0.3), 2)
+        self.create_recolorable_material("Recolorable 1", (0.1, 0.9, 0.3), 1)
+        self.create_recolorable_material("Recolorable 2", (0.9, 0.1, 0.4), 2)
         self.create_recolorable_material("Recolorable 3", (0.9, 0.6, 0), 3)
 
     def create_recolorable_material(self, name, color, pass_index):

rct-graphics-helper/builders/scene_builder.py

@@ -98,7 +98,7 @@ def create_camera(self, context):
     def create_main_light(self, context):
         lamp_data = self.create_lamp_data(context, "MainLight", "SUN")
 
-        lamp_data.energy = 1.5
+        lamp_data.energy = 1.3
         lamp_data.use_specular = True
         lamp_data.use_diffuse = True
         lamp_data.shadow_method = "RAY_SHADOW"
@@ -140,7 +140,7 @@ def create_filler_light(self, context):
 
     def create_light_dome(self, context):
         lamp_data = self.create_lamp_data(context, "LightDome", "HEMI")
-        lamp_data.energy = 0.2
+        lamp_data.energy = 0.3
         lamp_data.use_specular = False
 
         lamp_object = self.create_scene_object(context, 'LightDome', lamp_data)

rct-graphics-helper/magick_command.py

@@ -1,4 +1,7 @@
 # Class for building magick commands
+import os
+
+
 class MagickCommand(object):
     full_command = ""
 
@@ -49,6 +52,10 @@ def id_mask(self, r, g, b):
             color + "\" -fill \"#ffffffff\" -opaque \"" + \
             color + "\""
 
+    # Replaces all instances of color with color2
+    def replace_color(self, color, color2):
+        self.full_command += " -fill " + color2 + " -opaque " + color
+
     # Mixes between the current source, and source B given a mask
     def mask_mix(self, sourceB, mask):
         self.full_command = "( " + self.full_command + " ) " + \
@@ -90,7 +97,10 @@ def output(self, file):
     def get_command_string(self, magick_path, output):
         if self.use_repage:
             self.full_command = self.full_command + " +repage"
-        return magick_path + " " + self.full_command + " \"" + output + "\""
+        final_command = magick_path + " " + self.full_command + " \"" + output + "\""
+        if os.name == "posix":
+            final_command = final_command.replace("(", "\(").replace(")", "\)")
+        return final_command
 
     def __stringify_input(self, input):
         if type(input) is str:

rct-graphics-helper/models/palette.py

@@ -38,6 +38,7 @@
     "animated_water_sparkle",
     "animated_chain",
     "recolor_1",
+    "recolor_1_orct2",
     "transparent",
 ]
 
@@ -164,6 +165,11 @@
         "default": False
     },
     "recolor_1": {
+        "title": "Recolor 1 Clover",
+        "Description": "Clover green used by RCT Graphics Helper",
+        "default": False
+    },
+    "recolor_1_orct2": {
         "title": "Recolor 1 Orange",
         "Description": "Orange used by OpenRCT2 to import recolor 1",
         "default": False
@@ -230,10 +236,8 @@ def generate_output(self, renderer, output_path):
 
         cmd.as_montage(color_paths)
 
-        print(cmd.get_command_string(
-            renderer.magick_path, output_path))
         subprocess.check_output(cmd.get_command_string(
-            renderer.magick_path, output_path), shell=True)
+            renderer.magick_path, "PNG8:" + output_path), shell=True)
 
         self.path = output_path
         self.generated = True

rct-graphics-helper/palette_manager.py

@@ -58,6 +58,12 @@
     "transparent"
 ])
 
+recolor_1_orct2_palette = Palette(os.path.join(
+    palette_base_path, "recolor_1_orct2_palette.png"), [
+    "recolor_1_orct2",
+    "transparent"
+])
+
 recolor_2_palette = Palette(os.path.join(
     palette_base_path, "recolor_2_palette.png"), [
     "magenta",
@@ -86,6 +92,12 @@ def __init__(self):
             recolor_3_palette
         ]
 
+        self.orct2_recolor_palettes = [
+            recolor_1_orct2_palette,
+            recolor_2_palette,
+            recolor_3_palette
+        ]
+
     # Gets a base palette for the selected palette mode for the selected number of recolorables
     def get_base_palette(self, selected_palette_mode, recolors, preference="FULL"):
         if selected_palette_mode == "AUTO":
@@ -114,6 +126,10 @@ def get_base_palette(self, selected_palette_mode, recolors, preference="FULL"):
     def get_recolor_palette(self, recolor_index):
         return self.recolor_palettes[recolor_index]
 
+    # Gets the recolor palette for the specified recolor index that is used by ORCT2
+    def get_orct2_recolor_palette(self, recolor_index):
+        return self.orct2_recolor_palettes[recolor_index]
+
     # Gets the rider palette
     def get_rider_palette(self):
         return rider_palette

rct-graphics-helper/processors/frame_processors/post_processor.py

@@ -50,9 +50,28 @@ def process(self, frame, callback=None):
             mask.nullify_channels(channels_to_exclude_for_mai)
             mask.id_mask(i + 1, 0, 0)
 
+            palette = self.renderer.palette_manager.get_recolor_palette(i)
+            orct2_palette = self.renderer.palette_manager.get_orct2_recolor_palette(
+                i)
+
             forced_color_render = MagickCommand("mpr:render")
             forced_color_render.quantize(self.renderer.get_palette_path(
-                self.renderer.palette_manager.get_recolor_palette(i)), self.renderer.floyd_steinberg_diffusion)
+                palette), self.renderer.floyd_steinberg_diffusion)
+
+            if i == 0:
+                # Replace our clover green recolor 1 with the OpenRCT2 orange recolor 1
+                forced_color_render.replace_color("#003F21", "#6F332F")
+                forced_color_render.replace_color("#00672F", "#83372F")
+                forced_color_render.replace_color("#0B7B41", "#973F33")
+                forced_color_render.replace_color("#178F51", "#AB4333")
+                forced_color_render.replace_color("#1FA35C", "#BF4B2F")
+                forced_color_render.replace_color("#27B768", "#D34F2B")
+                forced_color_render.replace_color("#3BDB7F", "#E75723")
+                forced_color_render.replace_color("#5BEF98", "#FF5F1F")
+                forced_color_render.replace_color("#77F3A9", "#FF7F27")
+                forced_color_render.replace_color("#97F7BE", "#FF9B33")
+                forced_color_render.replace_color("#B7FBD0", "#FFB73F")
+                forced_color_render.replace_color("#D7FFE5", "#FFCF4B")
 
             magick_command.mask_mix(forced_color_render, mask)
 

rct-graphics-helper/processors/render_task_processor.py

@@ -84,7 +84,7 @@ def continue_process():
 
             self._proceed_task_process_context(task_process_context)
 
-            print("Progress: {}".format(
+            print("Progress: {}%".format(
                 round(self._get_progress(task_process_context) * 100)))
 
             # Exit this function if the sub process is async, the callback restarts it when the subprocess is ready