perfect-shape 0.3.5 → 0.5.2

data/lib/perfect_shape/multi_point.rb

@@ -24,6 +24,19 @@ require 'perfect_shape/shape'
 module PerfectShape
   # Represents multi-point shapes like Line, Polygon, and Polyline
   module MultiPoint
+    class << self
+      def normalize_point_array(the_points)
+        if the_points.all? {|the_point| the_point.is_a?(Array)}
+          the_points
+        else
+          the_points = the_points.flatten
+          xs = the_points.each_with_index.select {|n, i| i.even?}.map(&:first)
+          ys = the_points.each_with_index.select {|n, i| i.odd?}.map(&:first)
+          xs.zip(ys)
+        end
+      end
+    end
+  
     attr_reader :points
     
     def initialize(points: [])
@@ -32,11 +45,7 @@ module PerfectShape
     
     # Sets points, normalizing to an Array of Arrays of (x,y) pairs as BigDecimal
     def points=(the_points)
-      unless the_points.first.is_a?(Array)
-        xs = the_points.each_with_index.select {|n, i| i.even?}.map(&:first)
-        ys = the_points.each_with_index.select {|n, i| i.odd?}.map(&:first)
-        the_points = xs.zip(ys)
-      end
+      the_points = MultiPoint.normalize_point_array(the_points)
       @points = the_points.map do |pair|
         [
           pair.first.is_a?(BigDecimal) ? pair.first : BigDecimal(pair.first.to_s),

data/lib/perfect_shape/path.rb

@@ -27,7 +27,6 @@ require 'perfect_shape/cubic_bezier_curve'
 require 'perfect_shape/multi_point'
 
 module PerfectShape
-  # Mostly ported from java.awt.geom: https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Path2D.html
   class Path < Shape
     include MultiPoint
     include Equalizer.new(:shapes, :closed, :winding_rule)
@@ -115,7 +114,7 @@ module PerfectShape
     # the path or false if the point lies outside of the
     # path's bounds.
     def contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
       
       if outline
@@ -149,7 +148,7 @@ module PerfectShape
     # The caller must check for NaN values.
     # The caller may also reject infinite values as well.
     def point_crossings(x_or_point, y = nil)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
       return 0 if shapes.count == 0
       movx = movy = curx = cury = endx = endy = 0

data/lib/perfect_shape/point.rb

@@ -33,6 +33,21 @@ module PerfectShape
         py = py.is_a?(BigDecimal) ? py : BigDecimal(py.to_s)
         BigDecimal(Math.sqrt((px - x)**2 + (py - y)**2).to_s)
       end
+      
+      # Normalizes point args whether two-number Array or x, y args returning
+      # normalized point array of two BigDecimal's
+      #
+      # @param x_or_point The point or X coordinate of the point to test.
+      # @param y The Y coordinate of the point to test.
+      #
+      # @return Array of x and y BigDecimal's representing point
+      def normalize_point(x_or_point, y = nil)
+        x = x_or_point
+        x, y = x if y.nil? && x_or_point.is_a?(Array) && x_or_point.size == 2
+        x = x.is_a?(BigDecimal) ? x : BigDecimal(x.to_s)
+        y = y.is_a?(BigDecimal) ? y : BigDecimal(y.to_s)
+        [x, y]
+      end
     end
     
     include PointLocation
@@ -68,19 +83,23 @@ module PerfectShape
     # @return {@code true} if the point is close enough within distance tolerance,
     # {@code false} if the point is too far.
     def contain?(x_or_point, y = nil, outline: true, distance_tolerance: 0)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
       distance_tolerance = BigDecimal(distance_tolerance.to_s)
       point_distance(x, y) <= distance_tolerance
     end
     
     def point_distance(x_or_point, y = nil)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
       
       Point.point_distance(self.x, self.y, x, y)
     end
     
+    def intersect?(rectangle)
+      rectangle.contain?(self.to_a)
+    end
+    
     # Convert to pair Array of x,y coordinates
     def to_a
       [self.x, self.y]

data/lib/perfect_shape/polygon.rb

@@ -20,10 +20,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'perfect_shape/shape'
+require 'perfect_shape/point'
 require 'perfect_shape/multi_point'
 
 module PerfectShape
-  # Mostly ported from java.awt.geom: https://docs.oracle.com/javase/8/docs/api/java/awt/Polygon.html
   class Polygon < Shape
     include MultiPoint
     include Equalizer.new(:points)
@@ -38,7 +38,7 @@ module PerfectShape
     # the polygon, {@code false} if the point lies outside of the
     # polygon's bounds.
     def contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
       if outline
         edges.any? { |edge| edge.contain?(x, y, distance_tolerance: distance_tolerance) }

data/lib/perfect_shape/quadratic_bezier_curve.rb

@@ -20,10 +20,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'perfect_shape/shape'
+require 'perfect_shape/point'
 require 'perfect_shape/multi_point'
 
 module PerfectShape
-  # Mostly ported from java.awt.geom: https://docs.oracle.com/javase/8/docs/api/java/awt/geom/QuadCurve2D.html
   class QuadraticBezierCurve < Shape
     class << self
       # Calculates the number of times the quadratic bézier curve from (x1,y1) to (x2,y2)
@@ -62,13 +62,124 @@ module PerfectShape
         # These values are also NaN if opposing infinities are added
         return 0 if (xc.nan? || yc.nan?)
         point_crossings(x1, y1, x1c, y1c, xc, yc, px, py, level+1) +
-          point_crossings(xc, yc, xc1, yc1, x2, y2, px, py, level+1);
+          point_crossings(xc, yc, xc1, yc1, x2, y2, px, py, level+1)
+      end
+      
+      # Determine where coord lies with respect to the range from
+      # low to high.  It is assumed that low < high.  The return
+      # value is one of the 5 values BELOW, LOWEDGE, INSIDE, HIGHEDGE,
+      # or ABOVE.
+      def tag(coord, low, high)
+        return (coord < low ? BELOW : LOWEDGE) if coord <= low
+        return (coord > high ? ABOVE : HIGHEDGE) if coord >= high
+        INSIDE
+      end
+      
+      # Fill an array with the coefficients of the parametric equation
+      # in t, ready for solving against val with solve_quadratic.
+      # We currently have:
+      #     val = Py(t) = C1*(1-t)^2 + 2*CP*t*(1-t) + C2*t^2
+      #                 = C1 - 2*C1*t + C1*t^2 + 2*CP*t - 2*CP*t^2 + C2*t^2
+      #                 = C1 + (2*CP - 2*C1)*t + (C1 - 2*CP + C2)*t^2
+      #               0 = (C1 - val) + (2*CP - 2*C1)*t + (C1 - 2*CP + C2)*t^2
+      #               0 = C + Bt + At^2
+      #     C = C1 - val
+      #     B = 2*CP - 2*C1
+      #     A = C1 - 2*CP + C2
+      def eqn(val, c1, cp, c2)
+        [
+          c1 - val,
+          cp + cp - c1 - c1,
+          c1 - cp - cp + c2,
+        ]
+      end
+      
+      # Solves the quadratic whose coefficients are in the {@code eqn}
+      # array and places the non-complex roots into the {@code res}
+      # array, returning the number of roots.
+      # The quadratic solved is represented by the equation:
+      # <pre>
+      #     eqn = {C, B, A}
+      #     ax^2 + bx + c = 0
+      # </pre>
+      # A return value of {@code -1} is used to distinguish a constant
+      # equation, which might be always 0 or never 0, from an equation that
+      # has no zeroes.
+      # @param eqn the specified array of coefficients to use to solve
+      #        the quadratic equation
+      # @param res the array that contains the non-complex roots
+      #        resulting from the solution of the quadratic equation
+      # @return the number of roots, or {@code -1} if the equation is
+      #  a constant.
+      def solve_quadratic(eqn, res)
+        a = eqn[2]
+        b = eqn[1]
+        c = eqn[0]
+        roots = -1
+        if a == 0.0
+          #  The quadratic parabola has degenerated to a line.
+          #  The line has degenerated to a constant.
+          return -1 if b == 0.0
+          res[roots += 1] = -c / b
+        else
+          #  From Numerical Recipes, 5.6, Quadratic and Cubic Equations
+          d = b * b - 4.0 * a * c
+          #  If d < 0.0, then there are no roots
+          return 0 if d < 0.0
+          d = BigDecimal(Math.sqrt(d).to_a)
+          #  For accuracy, calculate one root using:
+          #      (-b +/- d) / 2a
+          #  and the other using:
+          #      2c / (-b +/- d)
+          #  Choose the sign of the +/- so that b+d gets larger in magnitude
+          d = -d if b < 0.0
+          q = (b + d) / -2.0
+          #  We already tested a for being 0 above
+          res[roots += 1] = q / a
+          res[roots += 1] = c / q if q != 0.0
+        end
+        roots
+      end
+      
+      # Evaluate the t values in the first num slots of the vals[] array
+      # and place the evaluated values back into the same array.  Only
+      # evaluate t values that are within the range <, >, including
+      # the 0 and 1 ends of the range iff the include0 or include1
+      # booleans are true.  If an "inflection" equation is handed in,
+      # then any points which represent a point of inflection for that
+      # quadratic equation are also ignored.
+      def eval_quadratic(vals, num,
+                                   include0,
+                                   include1,
+                                   inflect,
+                                   c1, ctrl, c2)
+        j = -1
+        i = 0
+        while i < num
+          t = vals[i]
+          
+          if ((include0 ? t >= 0 : t > 0) &&
+              (include1 ? t <= 1 : t < 1) &&
+              (inflect.nil? ||
+               inflect[1] + 2*inflect[2]*t != 0))
+            u = 1 - t
+            vals[j+=1] = c1*u*u + 2*ctrl*t*u + c2*t*t
+          end
+          i+=1
+        end
+        j
       end
     end
     
     include MultiPoint
     include Equalizer.new(:points)
     
+    BELOW = -2
+    LOWEDGE = -1
+    INSIDE = 0
+    HIGHEDGE = 1
+    ABOVE = 2
+    
     OUTLINE_MINIMUM_DISTANCE_THRESHOLD = BigDecimal('0.001')
     
     # Checks if quadratic bézier curve contains point (two-number Array or x, y args)
@@ -80,7 +191,7 @@ module PerfectShape
     # the quadratic bézier curve, {@code false} if the point lies outside of the
     # quadratic bézier curve's bounds.
     def contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
 
       x1 = points[0][0]
@@ -159,20 +270,20 @@ module PerfectShape
         # zero, then the points must be collinear and so the
         # curve is degenerate and encloses no area.  Thus the
         # result is false.
-        kx = x1 - 2 * xc + x2;
-        ky = y1 - 2 * yc + y2;
-        dx = x - x1;
-        dy = y - y1;
-        dxl = x2 - x1;
-        dyl = y2 - y1;
+        kx = x1 - 2 * xc + x2
+        ky = y1 - 2 * yc + y2
+        dx = x - x1
+        dy = y - y1
+        dxl = x2 - x1
+        dyl = y2 - y1
   
         t0 = (dx * ky - dy * kx) / (dxl * ky - dyl * kx)
         return false if (t0 < 0 || t0 > 1 || t0 != t0)
   
-        xb = kx * t0 * t0 + 2 * (xc - x1) * t0 + x1;
-        yb = ky * t0 * t0 + 2 * (yc - y1) * t0 + y1;
-        xl = dxl * t0 + x1;
-        yl = dyl * t0 + y1;
+        xb = kx * t0 * t0 + 2 * (xc - x1) * t0 + x1
+        yb = ky * t0 * t0 + 2 * (yc - y1) * t0 + y1
+        xl = dxl * t0 + x1
+        yl = dyl * t0 + y1
   
         (x >= xb && x < xl) ||
           (x >= xl && x < xb) ||
@@ -190,7 +301,7 @@ module PerfectShape
     # +1 is added for each crossing where the Y coordinate is increasing
     # -1 is added for each crossing where the Y coordinate is decreasing
     def point_crossings(x_or_point, y = nil, level = 0)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
       QuadraticBezierCurve.point_crossings(points[0][0], points[0][1], points[1][0], points[1][1], points[2][0], points[2][1], x, y, level)
     end
@@ -247,7 +358,7 @@ module PerfectShape
     end
     
     def point_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
       
       point = Point.new(x, y)
@@ -273,5 +384,166 @@ module PerfectShape
         last_minimum_distance
       end
     end
+    
+    def intersect?(rectangle)
+      x = rectangle.x
+      y = rectangle.y
+      w = rectangle.width
+      h = rectangle.height
+      
+      # Trivially reject non-existant rectangles
+      return false if w <= 0 || h <= 0
+
+      # Trivially accept if either endpoint is inside the rectangle
+      # (not on its border since it may end there and not go inside)
+      # Record where they lie with respect to the rectangle.
+      #     -1 => left, 0 => inside, 1 => right
+      x1 = points[0][0]
+      y1 = points[0][1]
+      x1tag = QuadraticBezierCurve.tag(x1, x, x+w)
+      y1tag = QuadraticBezierCurve.tag(y1, y, y+h)
+      return true if x1tag == INSIDE && y1tag == INSIDE
+      x2 = points[2][0]
+      y2 = points[2][1]
+      x2tag = QuadraticBezierCurve.tag(x2, x, x+w)
+      y2tag = QuadraticBezierCurve.tag(y2, y, y+h)
+      return true if x2tag == INSIDE && y2tag == INSIDE
+      ctrlx = points[1][0]
+      ctrly = points[1][1]
+      ctrlxtag = QuadraticBezierCurve.tag(ctrlx, x, x+w)
+      ctrlytag = QuadraticBezierCurve.tag(ctrly, y, y+h)
+
+      # Trivially reject if all points are entirely to one side of
+      # the rectangle.
+      # Returning false means All points left
+      return false if x1tag < INSIDE && x2tag < INSIDE && ctrlxtag < INSIDE
+      # Returning false means All points above
+      return false if y1tag < INSIDE && y2tag < INSIDE && ctrlytag < INSIDE
+      # Returning false means All points right
+      return false if x1tag > INSIDE && x2tag > INSIDE && ctrlxtag > INSIDE
+      # Returning false means All points below
+      return false if y1tag > INSIDE && y2tag > INSIDE && ctrlytag > INSIDE
+
+      # Test for endpoints on the edge where either the segment
+      # or the curve is headed "inwards" from them
+      # Note: These tests are a superset of the fast endpoint tests
+      #       above and thus repeat those tests, but take more time
+      #       and cover more cases
+      # First endpoint on border with either edge moving inside
+      return true if inwards(x1tag, x2tag, ctrlxtag) && inwards(y1tag, y2tag, ctrlytag)
+      # Second endpoint on border with either edge moving inside
+      return true if inwards(x2tag, x1tag, ctrlxtag) && inwards(y2tag, y1tag, ctrlytag)
+
+      # Trivially accept if endpoints span directly across the rectangle
+      xoverlap = (x1tag * x2tag <= 0)
+      yoverlap = (y1tag * y2tag <= 0)
+      return true if x1tag == INSIDE && x2tag == INSIDE && yoverlap
+      return true if y1tag == INSIDE && y2tag == INSIDE && xoverlap
+
+      # We now know that both endpoints are outside the rectangle
+      # but the 3 points are not all on one side of the rectangle.
+      # Therefore the curve cannot be contained inside the rectangle,
+      # but the rectangle might be contained inside the curve, or
+      # the curve might intersect the boundary of the rectangle.
+
+      eqn = nil
+      res = []
+      if !yoverlap
+          # Both Y coordinates for the closing segment are above or
+          # below the rectangle which means that we can only intersect
+          # if the curve crosses the top (or bottom) of the rectangle
+          # in more than one place and if those crossing locations
+          # span the horizontal range of the rectangle.
+          eqn = QuadraticBezierCurve.eqn((y1tag < INSIDE ? y : y+h), y1, ctrly, y2)
+          return (QuadraticBezierCurve.solve_quadratic(eqn, res) == 2 &&
+                  QuadraticBezierCurve.eval_quadratic(res, 2, true, true, nil,
+                                x1, ctrlx, x2) == 2 &&
+                  QuadraticBezierCurve.tag(res[0], x, x+w) * QuadraticBezierCurve.tag(res[1], x, x+w) <= 0)
+      end
+
+      # Y ranges overlap.  Now we examine the X ranges
+      if !xoverlap
+          # Both X coordinates for the closing segment are left of
+          # or right of the rectangle which means that we can only
+          # intersect if the curve crosses the left (or right) edge
+          # of the rectangle in more than one place and if those
+          # crossing locations span the vertical range of the rectangle.
+          eqn = QuadraticBezierCurve.eqn((x1tag < INSIDE ? x : x+w), x1, ctrlx, x2)
+          return (QuadraticBezierCurve.solve_quadratic(eqn, res) == 2 &&
+                  QuadraticBezierCurve.eval_quadratic(res, 2, true, true, nil,
+                                y1, ctrly, y2) == 2 &&
+                  QuadraticBezierCurve.tag(res[0], y, y+h) * QuadraticBezierCurve.tag(res[1], y, y+h) <= 0)
+      end
+
+      # The X and Y ranges of the endpoints overlap the X and Y
+      # ranges of the rectangle, now find out how the endpoint
+      # line segment intersects the Y range of the rectangle
+      dx = x2 - x1
+      dy = y2 - y1
+      k = y2 * x1 - x2 * y1
+      c1tag = c2tag = nil
+      if y1tag == INSIDE
+        c1tag = x1tag
+      else
+        c1tag = QuadraticBezierCurve.tag((k + dx * (y1tag < INSIDE ? y : y+h)) / dy, x, x+w)
+      end
+      if y2tag == INSIDE
+        c2tag = x2tag
+      else
+        c2tag = QuadraticBezierCurve.tag((k + dx * (y2tag < INSIDE ? y : y+h)) / dy, x, x+w)
+      end
+      # If the part of the line segment that intersects the Y range
+      # of the rectangle crosses it horizontally - trivially accept
+      return true if c1tag * c2tag <= 0
+
+      # Now we know that both the X and Y ranges intersect and that
+      # the endpoint line segment does not directly cross the rectangle.
+      #
+      # We can almost treat this case like one of the cases above
+      # where both endpoints are to one side, except that we will
+      # only get one intersection of the curve with the vertical
+      # side of the rectangle.  This is because the endpoint segment
+      # accounts for the other intersection.
+      #
+      # (Remember there is overlap in both the X and Y ranges which
+      #  means that the segment must cross at least one vertical edge
+      #  of the rectangle - in particular, the "near vertical side" -
+      #  leaving only one intersection for the curve.)
+      #
+      # Now we calculate the y tags of the two intersections on the
+      # "near vertical side" of the rectangle.  We will have one with
+      # the endpoint segment, and one with the curve.  If those two
+      # vertical intersections overlap the Y range of the rectangle,
+      # we have an intersection.  Otherwise, we don't.
+
+      # c1tag = vertical intersection class of the endpoint segment
+      #
+      # Choose the y tag of the endpoint that was not on the same
+      # side of the rectangle as the subsegment calculated above.
+      # Note that we can "steal" the existing Y tag of that endpoint
+      # since it will be provably the same as the vertical intersection.
+      c1tag = ((c1tag * x1tag <= 0) ? y1tag : y2tag)
+
+      # c2tag = vertical intersection class of the curve
+      #
+      # We have to calculate this one the straightforward way.
+      # Note that the c2tag can still tell us which vertical edge
+      # to test against.
+      eqn = QuadraticBezierCurve.eqn((c2tag < INSIDE ? x : x+w), x1, ctrlx, x2)
+      num = QuadraticBezierCurve.solve_quadratic(eqn, res)
+
+      # Note: We should be able to assert(num == 2) since the
+      # X range "crosses" (not touches) the vertical boundary,
+      # but we pass num to QuadraticBezierCurve.eval_quadratic for completeness.
+      QuadraticBezierCurve.eval_quadratic(res, num, true, true, nil, y1, ctrly, y2)
+
+      # Note: We can assert(num evals == 1) since one of the
+      # 2 crossings will be out of the [0,1] range.
+      c2tag = QuadraticBezierCurve.tag(res[0], y, y+h)
+
+      # Finally, we have an intersection if the two crossings
+      # overlap the Y range of the rectangle.
+      c1tag * c2tag <= 0
+    end
   end
 end

data/lib/perfect_shape/rectangle.rb

@@ -21,13 +21,25 @@
 
 require 'perfect_shape/shape'
 require 'perfect_shape/rectangular_shape'
+require 'perfect_shape/point'
 require 'perfect_shape/line'
 
 module PerfectShape
-  # Mostly ported from java.awt.geom: https://docs.oracle.com/javase/8/docs/api/java/awt/geom/Rectangle2D.html
   class Rectangle < Shape
     include RectangularShape
     include Equalizer.new(:x, :y, :width, :height)
+    
+    # bitmask indicating a point lies to the left
+    OUT_LEFT = 1
+
+    # bitmask indicating a point lies above
+    OUT_TOP = 2
+
+    # bitmask indicating a point lies to the right
+    OUT_RIGHT = 4
+
+    # bitmask indicating a point lies below
+    OUT_BOTTOM = 8
         
     # Checks if rectangle contains point (two-number Array or x, y args)
     #
@@ -38,7 +50,7 @@ module PerfectShape
     # the rectangle, {@code false} if the point lies outside of the
     # rectangle's bounds.
     def contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)
-      x, y = normalize_point(x_or_point, y)
+      x, y = Point.normalize_point(x_or_point, y)
       return unless x && y
       
       if outline
@@ -56,5 +68,32 @@ module PerfectShape
         Line.new(points: [[self.x, self.y + height], [self.x, self.y]])
       ]
     end
+    
+    # Returns out state for specified point (x,y): (left, right, top, bottom)
+    #
+    # It can be 0 meaning not outside the rectangle,
+    # or if outside the rectangle, then a bit mask
+    # combination of OUT_LEFT, OUT_RIGHT, OUT_TOP, or OUT_BOTTOM
+    def out_state(x_or_point, y = nil)
+      x, y = Point.normalize_point(x_or_point, y)
+      return unless x && y
+      
+      out = 0
+      if self.width <= 0
+          out |= OUT_LEFT | OUT_RIGHT
+      elsif x < self.x
+          out |= OUT_LEFT
+      elsif x > self.x + self.width
+          out |= OUT_RIGHT
+      end
+      if self.height <= 0
+          out |= OUT_TOP | OUT_BOTTOM
+      elsif y < self.y
+          out |= OUT_TOP
+      elsif y > self.y + self.height
+          out |= OUT_BOTTOM
+      end
+      out
+    end
   end
 end

data/lib/perfect_shape/shape.rb

@@ -75,21 +75,6 @@ module PerfectShape
       Rectangle.new(x: min_x, y: min_y, width: width, height: height)
     end
   
-    # Normalizes point args whether two-number Array or x, y args returning
-    # normalized point array of two BigDecimal's
-    #
-    # @param x_or_point The point or X coordinate of the point to test.
-    # @param y The Y coordinate of the point to test.
-    #
-    # @return Array of x and y BigDecimal's representing point
-    def normalize_point(x_or_point, y = nil)
-      x = x_or_point
-      x, y = x if y.nil? && x_or_point.is_a?(Array) && x_or_point.size == 2
-      x = x.is_a?(BigDecimal) ? x : BigDecimal(x.to_s)
-      y = y.is_a?(BigDecimal) ? y : BigDecimal(y.to_s)
-      [x, y]
-    end
-    
     # Subclasses must implement
     def contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)
     end

data/perfect-shape.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: perfect-shape 0.3.5 ruby lib
+# stub: perfect-shape 0.5.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "perfect-shape".freeze
-  s.version = "0.3.5"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2022-01-11"
-  s.description = "Perfect Shape is a collection of pure Ruby geometric algorithms that are mostly useful for GUI manipulation like checking containment of a mouse click point in popular geometry shapes such as rectangle, square, arc (open, chord, and pie), ellipse, circle, polygon, and paths containing lines, quadratic b\u00E9zier curves, and cubic bezier curves (including both Ray Casting Algorithm, aka Even-odd Rule, and Winding Number Algorithm, aka Nonzero Rule). Additionally, it contains some purely mathematical algorithms like IEEEremainder (also known as IEEE-754 remainder).".freeze
+  s.date = "2022-01-20"
+  s.description = "Perfect Shape is a collection of pure Ruby geometric algorithms that are mostly useful for GUI manipulation like checking viewport rectangle intersection or containment of a mouse click point in popular geometry shapes such as rectangle, square, arc (open, chord, and pie), ellipse, circle, polygon, and paths containing lines, quadratic b\u00E9zier curves, and cubic bezier curves, potentially with affine transforms applied like translation, scale, rotation, shear/skew, and inversion (including both Ray Casting Algorithm, aka Even-odd Rule, and Winding Number Algorithm, aka Nonzero Rule). Additionally, it contains some purely mathematical algorithms like IEEEremainder (also known as IEEE-754 remainder).".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
     "CHANGELOG.md",
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "README.md",
     "VERSION",
     "lib/perfect-shape.rb",
+    "lib/perfect_shape/affine_transform.rb",
     "lib/perfect_shape/arc.rb",
     "lib/perfect_shape/circle.rb",
     "lib/perfect_shape/composite_shape.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfect-shape
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.5.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equalizer
@@ -95,12 +95,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Perfect Shape is a collection of pure Ruby geometric algorithms that
-  are mostly useful for GUI manipulation like checking containment of a mouse click
-  point in popular geometry shapes such as rectangle, square, arc (open, chord, and
-  pie), ellipse, circle, polygon, and paths containing lines, quadratic bézier curves,
-  and cubic bezier curves (including both Ray Casting Algorithm, aka Even-odd Rule,
-  and Winding Number Algorithm, aka Nonzero Rule). Additionally, it contains some
-  purely mathematical algorithms like IEEEremainder (also known as IEEE-754 remainder).
+  are mostly useful for GUI manipulation like checking viewport rectangle intersection
+  or containment of a mouse click point in popular geometry shapes such as rectangle,
+  square, arc (open, chord, and pie), ellipse, circle, polygon, and paths containing
+  lines, quadratic bézier curves, and cubic bezier curves, potentially with affine
+  transforms applied like translation, scale, rotation, shear/skew, and inversion
+  (including both Ray Casting Algorithm, aka Even-odd Rule, and Winding Number Algorithm,
+  aka Nonzero Rule). Additionally, it contains some purely mathematical algorithms
+  like IEEEremainder (also known as IEEE-754 remainder).
 email: andy.am@gmail.com
 executables: []
 extensions: []
@@ -114,6 +116,7 @@ files:
 - README.md
 - VERSION
 - lib/perfect-shape.rb
+- lib/perfect_shape/affine_transform.rb
 - lib/perfect_shape/arc.rb
 - lib/perfect_shape/circle.rb
 - lib/perfect_shape/composite_shape.rb