add dither control

Author: spacek531

rct-graphics-helper/magick_command.py

@@ -28,9 +28,10 @@ def write_to_cache(self, id, delete_previous=False, next_file=""):
             " " + delete_addition + ")" + post
 
     # Quantizes the image using a palette
-    def quantize(self, palette, amount):
-        self.full_command += " -dither FloydSteinberg -define dither:diffusion-amount=" + str(amount) + "% -remap " + \
+    def quantize(self, palette, mode, amount):
+        self.full_command += " -dither "+mode+(amount and " -define dither:diffusion-amount=" + str(amount) + "% -remap " or " ") + \
             self.__stringify_input(palette) + " -colorspace sRGB"
+        print(self.full_command)
 
     # Trims the image to the smallest possible size and outputs the offset difference
     def trim(self):

rct-graphics-helper/operators/render_operator.py

@@ -78,6 +78,9 @@ def finish():
         render_task_processor = RenderTaskProcessor(
             context, self.palette_manager)
 
+
+        render_task_processor.renderer.set_dither(general_props.dithering_mode, general_props.dithering_mode in general_props.dithering_modes_with_strength and general_props.dithering_strength)
+
         task = self.create_task(context)
 
         render_task_processor.process(task, finish)

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

@@ -41,7 +41,7 @@ def process(self, frame, callback=None):
         magick_command.write_to_cache("render")
 
         magick_command.quantize(self.renderer.get_palette_path(
-            frame.base_palette), self.renderer.floyd_steinberg_diffusion)
+            frame.base_palette),self.renderer.dither_mode, self.renderer.floyd_steinberg_diffusion)
 
         # Force the recolorables to a palette that only contains the recolorable color
         channels_to_exclude_for_mai = ["Green", "Blue"]

rct-graphics-helper/properties/general_properties.py

@@ -94,6 +94,24 @@ class GeneralProperties(bpy.types.PropertyGroup):
         description="Which color groups to dither to. Recolorables will be excluded from this palette when used to avoid conflicts.",
         size=len(defaults))
 
+    dithering_mode = bpy.props.EnumProperty(
+        name = "Dithering Mode",
+        items = (
+            ("FloydSteinberg", "Floyd-Steinberg", "Applies Floyd-Steinberg dithering, a configurable dithering algorithm which produces 'grid' dithering.", 1),
+            ("Riemersma", "Riemersma", "Applies Riemrsma dithering, a dithering algorithm which produces more 'random' dithering.", 2)
+        )
+    )
+
+    dithering_modes_with_strength = ["FloydSteinberg"]
+
+    dithering_strength = bpy.props.IntProperty(
+        name = "Dithering Strength",
+        description = "Floyd-Steinberg dithering strength",
+        default = 35,
+        min = 1,
+        max = 100
+    )
+
     render_mode = bpy.props.EnumProperty(
         name="Render Mode",
         items=(

rct-graphics-helper/rct_graphics_helper_panel.py

@@ -82,6 +82,15 @@ def draw(self, context):
         row = layout.row()
         row.separator()
 
+        row = layout.row()
+        
+        box = layout.row()
+        row = box.row()
+        row.prop(properties,"dithering_mode")
+        if properties.dithering_mode in properties.dithering_modes_with_strength:
+            row = box.row()
+            row.prop(properties,"dithering_strength")
+        
         row = layout.row()
         row.label("Dither Palette:")
 

rct-graphics-helper/renderer.py

@@ -38,7 +38,8 @@ def __init__(self, context, palette_manager):
         self.context = context
 
         self.magick_path = "magick"
-        self.floyd_steinberg_diffusion = 5
+        self.dither_mode = "FloydSteinberg"
+        self.floyd_steinberg_diffusion = 35
 
         self.palette_manager = palette_manager
 
@@ -63,6 +64,10 @@ def __init__(self, context, palette_manager):
         bpy.app.handlers.render_complete.append(self._render_finished)
         bpy.app.handlers.render_cancel.append(self._render_reset)
 
+    def set_dither(self, mode, percent):
+        self.dither_mode = mode
+        self.floyd_steinberg_diffusion = percent
+
     # Render out the current scene
     def render(self, output_still, callback):
         self.render_finished_callback = callback