redgreenblue 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2359fa39f6387727f76770372b1f798ae60fdf34dce8bd481b06d58e5a128c4b
-  data.tar.gz: 6194f07e51ce46a4c9bdd3fd7d2fd895eebcb8e6f34e76c37b3c078d3ea58fb9
+  metadata.gz: d7bd0c8570ea98fb428ff9b0213cbdbcfb406a7ec93174e71152b367221091a8
+  data.tar.gz: 802d9d4c8fba0af75a7d1095f24ae81f23d5e5338674b68a69ba0b023cd092bb
 SHA512:
-  metadata.gz: e76a1651bfac0b0f197cae93a9fa3139e798a3a2ab0ae00950d08eb5e724834f9ccce7fe06beb98b083988fd4d7b672431aee5c23a66c24cce2782669606b517
-  data.tar.gz: 688367a83417deb0a812e96982f9c44ec369a1ee6984836338c25b07bd11843ced02053341044cebcaf2e4e71ce5ef26316799850831e446b85ece5766d31ddf
+  metadata.gz: e8af18bacea35e6b732330b7d0a9d907ed90d41951c932307474bffef02e8d6965230441c2322d188314d4280ebbe678b0e56780ede151b5e0a61db2f1f41dc0
+  data.tar.gz: 6b749f770956cada8c6e7fa82c5ec8255ee6081ee98746bac71182572fd5d67ae83c069db4798b2b920c3d5d01c4e39c0cf1ad5b16e5c92a7ae9956d97923f90

data/lib/redgreenblue/inspect.rb

@@ -26,6 +26,17 @@ class RGB::Color
     _inspect_swatch + ( name ? ' ' + name : '' )
   end
 
+  def _inspect_wilhelm
+    _inspect_short +
+    if h = hsl_h
+      " (H:%7.3f %s \e[0m" % [h, ostwald_color.terminal_background]
+    else
+      ' (H:  -      '
+    end +
+    ' C:%5.3f W:%5.3f K:%5.3f)' % cwk +
+    ( name ? ' ' + name : '' )
+  end
+
   public
 
   # Returns a programmer-friendly representation of the object.

data/lib/redgreenblue/math.rb

@@ -2,6 +2,17 @@ class RGB::Color
 
 private
 
+  # Returns shortest angle of travel (rotation)
+  # to move between 2 points on a circle.
+  #
+  # Some discussions here:
+  # - https://stackoverflow.com/questions/9505862/
+  # - https://stackoverflow.com/questions/7428718/
+  def angle_of_travel(source, destination)
+    angle = destination - source
+    (angle.abs > 180) ? (angle + (angle.negative? ? 360 : -360)) : angle
+  end
+
   def zip_add(a,b)
     a.zip(b).map { |ab| ( ab[0] || 0 ) + ab[1] }
   end

data/lib/redgreenblue/mix.rb

@@ -39,10 +39,9 @@ class RGB::Color
     end
   end
 
-  # Returns a set of colors between this color and another. That other color is included.
+  # Returns a number of colors, gradually changing from this color to another color.
   #
-  # The resulting colors are spaced evenly in the RGB color space using a straightforward calculation.
-  # You will likely experience these colors as not exactly evenly spaced.
+  # The resulting colors are spaced evenly in the RGB color space.
   def steps(another,step_count=1,include_begin=false)
     # origin (self, optional)
     ( include_begin ? [self.dup] : [] ) +
@@ -52,6 +51,22 @@ class RGB::Color
     [another.dup]
   end
 
+  # Returns a number of colors, gradually changing from this color to another color.
+  #
+  # The resulting colors are spaced evenly by their HSL values (hue, saturation, and lightness).
+  def steps_hsl(another,step_count=1,include_begin=false)
+    steps_hsx(another,step_count,include_begin, :hsl)
+  end
+
+  # Returns a number of colors, gradually changing from this color to another color.
+  #
+  # The resulting colors are spaced evenly by their HSV values (hue, saturation, and value).
+  def steps_hsv(another,step_count=1,include_begin=false)
+    steps_hsx(another,step_count,include_begin, :hsv)
+  end
+
+  alias steps_hsb steps_hsv
+
   private
 
   def mix_values(some_values, portion)
@@ -62,4 +77,25 @@ class RGB::Color
       ( blue  * (1 - portion) ) + ( some_values[2] * portion )
     ]
   end
+
+  def steps_hsx(another,step_count=1,include_begin=false,type)
+    raise NotImplementedError unless [:hsl, :hsv].include? type
+    src_hsx  = self.send(type)
+    dest_hsx = another.send(type)
+
+    # Take care of achromatic origin/destination
+    src_hsx[0]  = ( dest_hsx[0] || 0 ) unless src_hsx[0]
+    dest_hsx[0] = ( src_hsx[0]  || 0 ) unless dest_hsx[0]
+
+    step = [angle_of_travel(src_hsx[0], dest_hsx[0]), dest_hsx[1]-src_hsx[1], dest_hsx[2]-src_hsx[2] ].map { |v| v/step_count }
+
+    # origin (self, optional)
+    ( include_begin ? [self.dup] : [] ) +
+    # ...plus intermediate colors
+    (1..step_count-1).map { |c| RGB.send(type, zip_add(src_hsx, step.map { |v| v*c })) } +
+    # ...plus destination color
+    [another.dup]
+
+  end
+
 end

data/lib/redgreenblue/version.rb

@@ -1,7 +1,7 @@
 module RGB
 
   # redgreenblue version.
-  VERSION = '0.17.0'
+  VERSION = '0.18.0'
 
   # Returns RGB::VERSION.
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redgreenblue
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - lllist.eu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies: []
 description:
 email: