math2d 1.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687573d7fe97c2627cea246b39ff246058cd1dce63c4163c6e4c9955db5bf00c
-  data.tar.gz: 9475dc4a1a0b96f5c6133a171159151469d39d0a8d495c759286530f5880596e
+  metadata.gz: 7fe67e25a8057e6e11bd7cd602d37c67eb7cab78ed029c83928638144d1d590d
+  data.tar.gz: 2bf6bf8012cba83df542190d30980234e70b74fe1bad00f46e1694a48a9b42fe
 SHA512:
-  metadata.gz: e382704a1edebfb80e669128eaf2838468eb2429435513f2c8af7cf582e5483511c08cc62334f0d24e38eb937610837d4f741f9193145bc5e029869876b4bd6c
-  data.tar.gz: 625524b71e0d8c4b609cf846b89814bd3364f968b8f7276a3f31823720b6d41f2bc1116177d608cafa1696587736207cd020345236ce995e1e5992676efa71ad
+  metadata.gz: 9d445a9bf01b379884e8b59508960b10ba51a82866ab8402c6dc44b44370532ff64e15cad3492afe279bdcfa3788c732f68ca5b5214d5356c716692197755369
+  data.tar.gz: 0e88cea36fa423ab36138ab6140d4ca2e87d9987f95898c5fe95667c2826077099bc0bbf28c4a3d003eed69e561ca7b47e6d297485e08d1ec8c4578e97f1ea1a

data/lib/math2d/utils2d.rb

@@ -48,7 +48,7 @@ module Math2D
     end
 
     # Calculates a number between two numbers at a specific increment.
-    # The amt parameter is the amount to interpolate between the two
+    # The +amt+ parameter is the amount to interpolate between the two
     # values where 0.0 equal to the first point, 0.1 is very near the
     # first point, 0.5 is half-way in between, and 1.0 is equal to the
     # second point.
@@ -160,6 +160,136 @@ module Math2D
       alias greyscale grayscale
     end
 
+    # Interpolates two RGB (r,g,b,a) colors +a+ and +b+ by an amount +amt+.
+    #
+    # @param [Array<Numeric>] a
+    # @param [Array<Numeric>] b
+    # @param [Numeric] amt
+    # @return [Array<Float>]
+    def self.lerp_rgb(a, b, amt)
+      [
+        lerp(a[0], b[0], amt),
+        lerp(a[1], b[1], amt),
+        lerp(a[2], b[2], amt),
+        lerp(a[3], b[3], amt)
+      ]
+    end
+
+    # Interpolates two RGB (r,g,b,a) colors +a+ and +b+ in the HSV color space by an amount +amt+.
+    # This method is preferred over +lerp_rgb+ when working with intensity graphs (i.e. temperature, probability density
+    # etc.)
+    #
+    # @note Both colors are converted internally to HSV and then converted back to RGB 0-1 at the end.
+    #
+    # @param [Array<Numeric>] a
+    # @param [Array<Numeric>] b
+    # @param [Numeric] amt
+    # @return [Array<Float>]
+    def self.lerp_hue(a, b, amt)
+      a = rgb_to_hsv(a)
+      b = rgb_to_hsv(b)
+      d = (b[0] - a[0]).abs
+      if a[0] > b[0]
+        a, b = b, a
+        amt = 1 - amt
+      end
+      if d > 0.5
+        a[0] += 1
+        h = (a[0] + amt * (b[0] - a[0])) % 1
+      else
+        h = a[0] + amt * d
+      end
+      hsv_to_rgb(
+        [
+          h,
+          lerp(a[1], b[1], amt),
+          lerp(a[2], b[2], amt),
+          lerp(a[3], b[3], amt)
+        ]
+      )
+    end
+
+    # Converts an RGB color array (r,g,b,a) +color+ to the HSV (h,s,v,a) color space.
+    #
+    # @note This method assumes that both the RGB and HSV color arrays are in Linear RGB/HSV (also called RBG/HSV 0-1),
+    # where each component ranges from 0.0 to 1.0.
+    #
+    # @param [Array<Numeric>]
+    # @return [Array<Float>]
+    def self.rgb_to_hsv(color)
+      r = color[0]
+      g = color[1]
+      b = color[2]
+      a = color[3]
+      max = [r, g, b].max
+      min = [r, g, b].min
+      v = max
+      d = max - min
+      s = max.zero? ? 0 : d / max
+      if max == min
+        h = 0
+      else
+        case max
+        when r
+          h = (g - b) / d + (g < b ? 6 : 0)
+        when g
+          h = (b - r) / d + 2
+        when b
+          h = (r - g) / d + 4
+        end
+        h /= 6
+      end
+      [h, s, v, a]
+    end
+
+    # Converts an HSV color array (h,s,v,a) +color+ to the RGB (r,g,b,a) color space.
+    #
+    # @note This method assumes that both the RGB and HSV color arrays are in Linear RGB/HSV (also called RBG/HSV 0-1),
+    # where each component ranges from 0.0 to 1.0.
+    #
+    # @param [Array<Numeric>]
+    # @return [Array<Float>]
+    def self.hsv_to_rgb(color)
+      h = color[0]
+      s = color[1]
+      v = color[2]
+      a = color[3]
+      i = (h * 6).floor
+      f = h * 6 - i
+      pp = v * (1 - s)
+      q = v * (1 - f * s)
+      t = v * (1 - (1 - f) * s)
+
+      case i % 6
+      when 0
+        r = v
+        g = t
+        b = pp
+      when 1
+        r = q
+        g = v
+        b = pp
+      when 2
+        r = pp
+        g = v
+        b = t
+      when 3
+        r = pp
+        g = q
+        b = v
+      when 4
+        r = t
+        g = pp
+        b = v
+      when 5
+        r = v
+        g = pp
+        b = q
+      end
+
+      [r, g, b, a]
+    end
+
     private
 
     # @private

data/lib/math2d/vector2d.rb

@@ -269,22 +269,30 @@ module Math2D
     def set_magnitude(new_mag)
       mag = magnitude
       mag = Float::INFINITY if mag.zero?
-      self * (new_mag / mag)
+      times!(new_mag / mag)
     end
 
     alias magnitude! set_magnitude
 
-    # Normalizes +self+ (set the magnitude to 1).
+    # Normalizes +self+ (set the magnitude to 1) and returns a new vector.
     # +unit+ is an alias for this method.
     #
-    # @return [Vector2D] modified self
+    # @return [Vector2D] new vector
     def normalize
+      clone.set_magnitude(1)
+    end
+
+    alias unit normalize
+
+    # Normalizes +self+ (set the magnitude to 1) *in place*.
+    # +unit!+ is an alias for this method.
+    #
+    # @return [Vector2D] modified self
+    def normalize!
       set_magnitude(1)
     end
 
-    alias normalize! normalize
     alias unit! normalize!
-    alias unit normalize!
 
     # Returns true if the magnitude of +self+ is equal to 1, false otherwise.
     # +unit?+ is an alias for this method.
@@ -354,6 +362,7 @@ module Math2D
       cos_ang = Math.cos(angle)
       @x = @x * cos_ang - @y * sin_ang
       @y = @x * sin_ang + @y * cos_ang
+      self
     end
 
     # Clockwise rotates +self+ +angle+ radians around a +pivot+ point and returns it as a new Vector2D.
@@ -379,6 +388,7 @@ module Math2D
       cos_ang = Math.cos(angle)
       @x = pivot_x + (dx * cos_ang) - (dy * sin_ang)
       @y = pivot_y + (dx * sin_ang) + (dy * cos_ang)
+      self
     end
 
     # Linear interpolate +self+ and +other+ with an amount +amt+.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: math2d
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.4.5
 platform: ruby
 authors:
 - Ualace Henrique
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: Math2D