scorched_earth 5.0.3.pre-java → 5.0.4.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e08b161ae03a1b6d480480d02a82ea3b96d3e2c
-  data.tar.gz: 4dc441be041a996401460c20f75b683a84a3702e
+  metadata.gz: f00d9340bc3c2def8581c5632ff80cfb2c9a1c7b
+  data.tar.gz: 628dff9384fc39729eaa311a7c5377e5857bb606
 SHA512:
-  metadata.gz: 72e9f1fbe7c1fe49415813e7b6451c3d4c0b36c4d4b7604b542ab5cb5cf839e995e7a802ed89b0a4ad22e1139dbde7a89184b328f11ff04989025638ca06102f
-  data.tar.gz: a0d47c9e26eab3b41aad86d5ab12dc03312433d6531e9edfa107a9f17e15fac28ce771479ba13cb523c69ae183044fc06e505e430961f05766a5c1784e6fe0b4
+  metadata.gz: 6d50a62e49990eb185ff5a7c2b22d6e4d7ecc43efbb45b30a901496b30c12fdf19434c249e6752837ed3d8344e126e1d1f413000838cb8a041c65f12b25f2ccd
+  data.tar.gz: cb23c05a6f96ac3f4a82903331c5918f01e46e9b11b2ba77e18eeae7066abc0192cf75d8ca819070c5c3350ac8d3b9c44ec2e0e7db5c6b50cf1185804cc6f5dc

data/lib/scorched_earth/color_palette.rb

@@ -2,6 +2,8 @@ include Java
 
 import java.awt.Color
 
+require 'scorched_earth/services/cie94'
+
 module ScorchedEarth
   class ColorPalette
     include Enumerable
@@ -25,7 +27,17 @@ module ScorchedEarth
 
       loop do
         color = strategy.color colors
-        yield color
+        unless already_exists?(color)
+          yield color
+        end
+      end
+    end
+
+    def already_exists?(color)
+      cache.values.any? do |color2|
+        delta_e94 = Services::CIE94.new.call color, color2
+
+        delta_e94 < 1000
       end
     end
 

data/lib/scorched_earth/services/cie94.rb

@@ -0,0 +1,99 @@
+include Java
+
+import java.awt.Color
+
+module ScorchedEarth
+  module Services
+    # https://github.com/halostatue/color/blob/master/lib/color/rgb.rb
+    class CIE94
+      def call(color_1, color_2, weighting_type = :graphic_arts)
+        color_1 = to_lab(color_1)
+        color_2 = to_lab(color_2)
+
+        case weighting_type
+        when :graphic_arts
+          k_1 = 0.045
+          k_2 = 0.015
+          k_L = 1
+        when :textiles
+          k_1 = 0.048
+          k_2 = 0.014
+          k_L = 2
+        else
+          raise ArgumentError, "Unsupported weighting type #{weighting_type}."
+        end
+
+        k_C = k_H = 1
+
+        l_1, a_1, b_1 = color_1.values_at(:L, :a, :b)
+        l_2, a_2, b_2 = color_2.values_at(:L, :a, :b)
+
+        delta_a = a_1 - a_2
+        delta_b = b_1 - b_2
+
+        c_1 = Math.sqrt((a_1 ** 2) + (b_1 ** 2))
+        c_2 = Math.sqrt((a_2 ** 2) + (b_2 ** 2))
+
+        delta_L = color_1[:L] - color_2[:L]
+        delta_C = c_1 - c_2
+
+        delta_H2 = (delta_a ** 2) + (delta_b ** 2) - (delta_C ** 2)
+
+        s_L = 1
+        s_C = 1 + k_1 * c_1
+        s_H = 1 + k_2 * c_1
+
+        composite_L = (delta_L / (k_L * s_L)) ** 2
+        composite_C = (delta_C / (k_C * s_C)) ** 2
+        composite_H = delta_H2 / ((k_H * s_H) ** 2)
+
+        Math.sqrt(composite_L + composite_C + composite_H)
+      end
+
+      private
+
+      def to_xyz(color, color_space = :sRGB)
+        r, g, b = [ color.red, color.green, color.blue ].map { |v|
+          if (v > 0.04045)
+            (((v + 0.055) / 1.055) ** 2.4) * 100
+          else
+            (v / 12.92) * 100
+          end
+        }
+
+        # Convert using the RGB/XYZ matrix at:
+        # http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html#WSMatrices
+        {
+          :x => (r * 0.4124564 + g * 0.3575761 + b * 0.1804375),
+          :y => (r * 0.2126729 + g * 0.7151522 + b * 0.0721750),
+          :z => (r * 0.0193339 + g * 0.1191920 + b * 0.9503041)
+        }
+      end
+
+      def to_lab(color, color_space = :sRGB, reference_white = [ 95.047, 100.00, 108.883 ])
+        xyz = to_xyz color
+
+        xr = xyz[:x] / reference_white[0]
+        yr = xyz[:y] / reference_white[1]
+        zr = xyz[:z] / reference_white[2]
+
+        epsilon = (216 / 24389.0)
+        kappa   = (24389 / 27.0)
+
+        fx, fy, fz = [ xr, yr, zr ].map do |t|
+          if (t > (epsilon))
+            t ** (1.0 / 3)
+          else # t <= epsilon
+            ((kappa * t) + 16) / 116.0
+          end
+        end
+
+        {
+          :L => ((116 * fy) - 16),
+          :a => (500 * (fx - fy)),
+          :b => (200 * (fy - fz))
+        }
+      end
+    end
+  end
+end

data/lib/scorched_earth/version.rb

@@ -1,3 +1,3 @@
 module ScorchedEarth
-  VERSION = '5.0.3.pre'.freeze
+  VERSION = '5.0.4.pre'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scorched_earth
 version: !ruby/object:Gem::Version
-  version: 5.0.3.pre
+  version: 5.0.4.pre
 platform: java
 authors:
 - James Moriarty
@@ -113,6 +113,7 @@ files:
 - lib/scorched_earth/helpers.rb
 - lib/scorched_earth/mouse.rb
 - lib/scorched_earth/player.rb
+- lib/scorched_earth/services/cie94.rb
 - lib/scorched_earth/shot.rb
 - lib/scorched_earth/terrain.rb
 - lib/scorched_earth/version.rb