shattered_machine 0.0.9 → 0.1.0

data/lib/shattered_machine/progressive_pixel_sorter.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative 'pixel_sorter'
+module ShatteredMachine
+  # Call the pixel sorter multiple time in steps for given png image(s)
+  class ProgressivePixelSorter
+    # @param io [ShatteredMachine::Io] Io containing paths for images to glitch
+    # @param options [Hash] options for the pixel sorting algorithm
+    def initialize(io, options)
+      @io = io
+      @options = options
+      @images_count = @io.png_images.count
+      @steps = define_steps
+    end
+
+    def call
+      @io.png_images.sort_by { |path| [path.input[/\d+/].to_i, path.input] }.each_with_index do |item, index|
+        PixelSorter.new(sorter_options(index)).call(item.input, item.output)
+      end
+    end
+
+    private
+
+    def sorter_options(index)
+      return @options unless @options[:smart_sorting]
+
+      step_options = @options.clone
+      step_options[:multiple_ranges] = false
+      step_options[:detection_min] = (define_new_min_limit(index)).round.to_s
+      step_options[:detection_max] = (define_new_max_limit(index)).round.to_s
+      step_options
+    end
+
+    def define_steps
+      { min: min_step, max: max_step }
+    end
+
+    def min_step
+      positive_subtraction(@options[:detection_min].to_f, @options[:detection_min_two].to_f) / (@images_count - 1)
+    end
+
+    def max_step
+      positive_subtraction(@options[:detection_max].to_f, @options[:detection_max_two].to_f) / (@images_count - 1)
+    end
+
+    def positive_subtraction(value1, value2)
+      value1 > value2 ? value1 - value2 : value2 - value1
+    end
+
+    def define_new_min_limit(index)
+      if @options[:detection_min].to_f > @options[:detection_min_two].to_f
+        (@options[:detection_min].to_f - (index * @steps[:min]))
+      else
+        (@options[:detection_min].to_f + (index * @steps[:min]))
+      end
+    end
+
+    def define_new_max_limit(index)
+      if @options[:detection_max].to_f > @options[:detection_max_two].to_f
+        (@options[:detection_max].to_f - (index * @steps[:max]))
+      else
+        (@options[:detection_max].to_f + (index * @steps[:max]))
+      end
+    end
+  end
+end

data/lib/shattered_machine/sampler.rb

@@ -11,7 +11,7 @@ module ShatteredMachine
     # @param options [Hash] options for specifying which
     def initialize(io, options = {})
       @io = io
-      @base_output_filename = io.output_filename.presence || 'sample'
+      @base_output_filename = io.output_filename.empty? ? 'sample' : io.output_filename
       @algorithms_to_sample = options[:algorithms_to_sample] || ALL_ALGORITHMS
     end
 
@@ -30,8 +30,7 @@ module ShatteredMachine
     private
 
     FILTERS = %w[none sub up average paeth].freeze
-    SLIM_DIRECTION = %w[up_to_down down_to_up left_to_right right_to_left].freeze
-    BRUSH_DIRECTION = %w[vertical vertical_inverted horizontal horizontal_inverted].freeze
+    DIRECTION = %w[vertical vertical_inverted horizontal horizontal_inverted].freeze
 
     def update_io(output_filename_appendix)
       @io.output_filename = "#{@base_output_filename}_#{output_filename_appendix}"
@@ -65,7 +64,7 @@ module ShatteredMachine
     def sample_slim
       return unless @algorithms_to_sample.include? 'slim'
 
-      SLIM_DIRECTION.each do |direction|
+      DIRECTION.each do |direction|
         update_io("slim_#{direction}")
         slim_options = { direction: direction.to_sym }
         Glitcher.new('Slim', @io, slim_options).call
@@ -75,7 +74,7 @@ module ShatteredMachine
     def sample_brush
       return unless @algorithms_to_sample.include? 'brush'
 
-      BRUSH_DIRECTION.each do |direction|
+      DIRECTION.each do |direction|
         update_io("brush_#{direction}")
         brush_options = { direction: direction.to_sym }
         Glitcher.new('Brush', @io, brush_options).call

data/lib/shattered_machine/slim.rb

@@ -11,7 +11,7 @@ module ShatteredMachine
     # @param options [Hash] options for slim algorithm
     def initialize(options = {})
       @colors = options[:colors] || ALL_COLORS
-      @direction = options[:direction] || :up_to_down
+      @direction = options[:direction] || :vertical_inverted
       @probability = (options[:probability] || 95).to_s
       @probability_area = options[:probability_area] || 'global'
       @colors_with_proba = colors_with_proba(options[:colors_with_proba])
@@ -38,7 +38,9 @@ module ShatteredMachine
 
     def rust_formatted_direction
       ruby_to_rust_directions = { up_to_down: '1', down_to_up: '2',
-                                  left_to_right: '3', right_to_left: '4' }
+                                  left_to_right: '3', right_to_left: '4',
+                                  vertical: '1', vertical_inverted: '2',
+                                  horizontal: '3', horizontal_inverted: '4' }
       ruby_to_rust_directions[@direction]
     end
 

data/shattered_machine.gemspec

@@ -4,7 +4,7 @@ require 'English'
 
 Gem::Specification.new do |s|
   s.name          = 'shattered_machine'
-  s.version       = '0.0.9'
+  s.version       = '0.1.0'
   s.required_ruby_version     = '>= 2.0.0'
   s.required_rubygems_version = '>= 1.8.11'
   s.summary       = 'Shattered Machine core engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shattered_machine
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Flo Girardo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rusty_engine_ffi
@@ -75,6 +75,7 @@ files:
 - doc/ShatteredMachine/Io.html
 - doc/ShatteredMachine/Io/Paths.html
 - doc/ShatteredMachine/PixelSorter.html
+- doc/ShatteredMachine/ProgressivePixelSorter.html
 - doc/ShatteredMachine/Sampler.html
 - doc/ShatteredMachine/Slim.html
 - doc/ShatteredMachine/Transpose.html
@@ -103,6 +104,7 @@ files:
 - lib/shattered_machine/glitcher.rb
 - lib/shattered_machine/io.rb
 - lib/shattered_machine/pixel_sorter.rb
+- lib/shattered_machine/progressive_pixel_sorter.rb
 - lib/shattered_machine/sampler.rb
 - lib/shattered_machine/slim.rb
 - lib/shattered_machine/transpose.rb