perfect-shape 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4eb7bc277a02c0795966623e05ee57514483d982bc0d80f264a525f6b3d5afa
-  data.tar.gz: f070a8292b835f6d2c68ff4ccddd3073b7a83d36e882d4e5c34c6e91a85d88ee
+  metadata.gz: cfa0c67a9d8a4b23b53bdd7895121fa51ee3da17e1d22fa9bb56c0890a47844b
+  data.tar.gz: 81cd3fe5766f023fc250951cab6541142d80ff70b8af3d8cbbfcefcb56154cba
 SHA512:
-  metadata.gz: 1add8519bdd16f38f8fb8431d8342c77df9f5d8d76f0dc6f1481bba5d9c0a15b653c56a9a0e372082f1590b55f5897ebac3f6a4d4505acd6ba017f257261e80d
-  data.tar.gz: fc3e2fce45f0a46ad7869fd5fec07d0dcf826e3bd36676439144eb3fd0198b8224d816a26db54858b43d0bb5332ff6b4108950efca3e71c1d5e42cebde4de63f
+  metadata.gz: ea4539cd6122363483988ef9de8b712ebd981c2e7102d5510e94f9d093bad1c02d17cd0e1c4eebe5ebc3e4211a67d22ca7ee2630cdf561404a9adc36031de220
+  data.tar.gz: 4a9fcfa3accf7ca519c403e24076bfc76b1bd9e2b47fda886e0012af610d3e142257d09c6508a04deccf665b536c41b60cc68047ba2c76f06a667be2625b0c40

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.1.2
+
+- `PerfectShape::CubicBezierCurve` (two end points and two control points)
+- `PerfectShape::CubicBezierCurve#contain?(x_or_point, y=nil)`
+- `PerfectShape::CubicBezierCurve#==`
+- `PerfectShape::Path` having cubic bezier curves in addition to points, lines, and quadratic bezier curves
+
 ## 0.1.1
 
 - `PerfectShape::QuadraticBezierCurve` (two end points and one control point)

data/README.md

@@ -1,9 +1,9 @@
-# Perfect Shape 0.1.1
+# Perfect Shape 0.1.2
 ## Geometric Algorithms
 [![Gem Version](https://badge.fury.io/rb/perfect-shape.svg)](http://badge.fury.io/rb/perfect-shape)
 [![Test](https://github.com/AndyObtiva/perfect-shape/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/perfect-shape/actions/workflows/ruby.yml)
 
-[`PerfectShape`](https://rubygems.org/gems/perfect-shape) is a collection of pure Ruby geometric algorithms that are mostly useful for GUI (Graphical User Interface) manipulation like checking containment of a mouse click [point](#perfectshapepoint) in popular geometry shapes such as [rectangle](#perfectshaperectangle), [square](#perfectshapesquare), [arc](#perfectshapearc) (open, chord, and pie), [ellipse](#perfectshapeellipse), [circle](#perfectshapecircle), [polygon](#perfectshapepolygon), and [paths](#perfectshapepath) containing [lines](#perfectshapeline), [quadratic bézier curves](#perfectshapequadraticbeziercurve), and cubic bézier curves (including both [Ray Casting Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Ray_casting_algorithm), aka [Even-odd Rule](https://en.wikipedia.org/wiki/Even%E2%80%93odd_rule), and [Winding Number Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Winding_number_algorithm), aka [Nonzero Rule](https://en.wikipedia.org/wiki/Nonzero-rule)).
+[`PerfectShape`](https://rubygems.org/gems/perfect-shape) is a collection of pure Ruby geometric algorithms that are mostly useful for GUI (Graphical User Interface) manipulation like checking containment of a mouse click [point](#perfectshapepoint) in popular geometry shapes such as [rectangle](#perfectshaperectangle), [square](#perfectshapesquare), [arc](#perfectshapearc) (open, chord, and pie), [ellipse](#perfectshapeellipse), [circle](#perfectshapecircle), [polygon](#perfectshapepolygon), and [paths](#perfectshapepath) containing [lines](#perfectshapeline), [quadratic bézier curves](#perfectshapequadraticbeziercurve), and [cubic bézier curves](#perfectshapecubicbeziercurve) (including both [Ray Casting Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Ray_casting_algorithm), aka [Even-odd Rule](https://en.wikipedia.org/wiki/Even%E2%80%93odd_rule), and [Winding Number Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Winding_number_algorithm), aka [Nonzero Rule](https://en.wikipedia.org/wiki/Nonzero-rule)).
 
 Additionally, [`PerfectShape::Math`](#perfectshapemath) contains some purely mathematical algorithms, like [IEEE 754-1985 Remainder](https://en.wikipedia.org/wiki/IEEE_754-1985).
 
@@ -14,13 +14,13 @@ To ensure high accuracy, this library does all its mathematical operations with
 Run:
 
 ```
-gem install perfect-shape -v 0.1.1
+gem install perfect-shape -v 0.1.2
 ```
 
 Or include in Bundler `Gemfile`:
 
 ```ruby
-gem 'perfect-shape', '~> 0.1.1'
+gem 'perfect-shape', '~> 0.1.2'
 ```
 
 And, run:
@@ -133,7 +133,7 @@ Includes `PerfectShape::MultiPoint`
 - `::relative_counterclockwise(x1, y1, x2, y2, px, py)`: Returns an indicator of where the specified point (px,py) lies with respect to the line segment from (x1,y1) to (x2,y2). The return value can be either 1, -1, or 0 and indicates in which direction the specified line must pivot around its first end point, (x1,y1), in order to point at the specified point (px,py). A return value of 1 indicates that the line segment must turn in the direction that takes the positive X axis towards the negative Y axis. In the default coordinate system used by Java 2D, this direction is counterclockwise. A return value of -1 indicates that the line segment must turn in the direction that takes the positive X axis towards the positive Y axis. In the default coordinate system, this direction is clockwise. A return value of 0 indicates that the point lies exactly on the line segment. Note that an indicator value of 0 is rare and not useful for determining collinearity because of floating point rounding issues. If the point is colinear with the line segment, but not between the end points, then the value will be -1 if the point lies “beyond (x1,y1)” or 1 if the point lies “beyond (x2,y2)”.
 - `::point_segment_distance_square(x1, y1, x2, y2, px, py)`: Returns the square of distance from a point to a line segment.
 - `::point_segment_distance(x1, y1, x2, y2, px, py)`: Returns the distance from a point to a line segment.
-- `::new(points: [])`: constructs a line with two `points` as `Array` of `Array`s of `[x,y]` pairs or flattened `Array` of alternating x and y values
+- `::new(points: [])`: constructs a line with two `points` as `Array` of `Array`s of `[x,y]` pairs or flattened `Array` of alternating x and y coordinates
 - `#min_x`: min x
 - `#min_y`: min y
 - `#max_x`: max x
@@ -164,7 +164,8 @@ Includes `PerfectShape::MultiPoint`
 
 ![quadratic_bezier_curve](https://raw.githubusercontent.com/AndyObtiva/perfect-shape/master/images/quadratic_bezier_curve.png)
 
-- `::new(points: [])`: constructs a quadratic bézier curve with three `points` (two end points and one control point) as `Array` of `Array`s of `[x,y]` pairs or flattened `Array` of alternating x and y values
+- `::new(points: [])`: constructs a quadratic bézier curve with three `points` (start point, control point, and end point) as `Array` of `Array`s of `[x,y]` pairs or flattened `Array` of alternating x and y coordinates
+- `#points`: points (start point, control point, and end point)
 - `#min_x`: min x
 - `#min_y`: min y
 - `#max_x`: max x
@@ -183,6 +184,36 @@ Example:
 shape = PerfectShape::QuadraticBezierCurve.new(points: [[200, 150], [270, 220], [180, 170]]) # start point, control point, and end point
 ```
 
+### `PerfectShape::CubicBezierCurve`
+
+Class
+
+Extends `PerfectShape::Shape`
+
+Includes `PerfectShape::MultiPoint`
+
+![cubic_bezier_curve](https://raw.githubusercontent.com/AndyObtiva/perfect-shape/master/images/cubic_bezier_curve.png)
+
+- `::new(points: [])`: constructs a cubic bézier curve with four `points` (start point, two control points, and end point) as `Array` of `Array`s of `[x,y]` pairs or flattened `Array` of alternating x and y coordinates
+- `#points`: points (start point, two control points, and end point)
+- `#min_x`: min x
+- `#min_y`: min y
+- `#max_x`: max x
+- `#max_y`: max y
+- `#width`: width (from min x to max x)
+- `#height`: height (from min y to max y)
+- `#center_x`: center x
+- `#center_y`: center y
+- `#bounding_box`: bounding box is a rectangle with x = min x, y = min y, and width/height of shape (bounding box only guarantees that the shape is within it, but it might be bigger than the shape)
+- `#contain?(x_or_point, y=nil)`: checks if point is inside
+- `#==(other)`: Returns `true` if equal to `other` or `false` otherwise
+
+Example:
+
+```ruby
+shape = PerfectShape::CubicBezierCurve.new(points: [[200, 150], [230, 50], [270, 220], [180, 170]]) # start point, two control points, and end point
+```
+
 ### `PerfectShape::Rectangle`
 
 Class
@@ -369,7 +400,7 @@ A polygon can be thought of as a special case of [path](#perfectshapepath) that
 
 ![polygon](https://raw.githubusercontent.com/AndyObtiva/perfect-shape/master/images/polygon.png)
 
-- `::new(points: [])`: constructs a polygon with `points` as `Array` of `Array`s of `[x,y]` pairs or flattened `Array` of alternating x and y values
+- `::new(points: [])`: constructs a polygon with `points` as `Array` of `Array`s of `[x,y]` pairs or flattened `Array` of alternating x and y coordinates
 - `#min_x`: min x
 - `#min_y`: min y
 - `#max_x`: max x
@@ -398,7 +429,7 @@ Includes `PerfectShape::MultiPoint`
 
 ![path](https://raw.githubusercontent.com/AndyObtiva/perfect-shape/master/images/path.png)
 
-- `::new(shapes: [], closed: false, winding_rule: :wind_non_zero)`: constructs a path with `shapes` as `Array` of shape objects, which can be `PerfectShape::Point` (or `Array` of `[x, y]` coordinates), `PerfectShape::Line`, or `PerfectShape::QuadraticBezierCurve`. If a path is closed, its last point is automatically connected to its first point with a line segment. The winding rule can be `:wind_non_zero` (default) or `:wind_even_odd`.
+- `::new(shapes: [], closed: false, winding_rule: :wind_non_zero)`: constructs a path with `shapes` as `Array` of shape objects, which can be `PerfectShape::Point` (or `Array` of `[x, y]` coordinates), `PerfectShape::Line`, `PerfectShape::QuadraticBezierCurve`, or `PerfectShape::CubicBezierCurve`. If a path is closed, its last point is automatically connected to its first point with a line segment. The winding rule can be `:wind_non_zero` (default) or `:wind_even_odd`.
 - `#shapes`: the shapes that the path is composed of (must always start with `PerfectShape::Point` or Array of [x,y] coordinates representing start point)
 - `#closed?`: returns `true` if closed and `false` otherwise
 - `#winding_rule`: returns winding rule (`:wind_non_zero` or `:wind_even_odd`)
@@ -423,6 +454,7 @@ path_shapes = []
 path_shapes << PerfectShape::Point.new(x: 200, y: 150)
 path_shapes << PerfectShape::Line.new(points: [250, 170]) # no need for start point, just end point
 path_shapes << PerfectShape::QuadraticBezierCurve.new(points: [[300, 185], [350, 150]]) # no need for start point, just control point and end point
+path_shapes << PerfectShape::CubicBezierCurve.new(points: [[370, 50], [430, 220], [480, 170]]) # no need for start point, just two control points and end point
 
 shape = PerfectShape::Path.new(shapes: path_shapes, closed: false, winding_rule: :wind_even_odd)
 ```

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/perfect_shape/cubic_bezier_curve.rb

@@ -0,0 +1,120 @@
+# Copyright (c) 2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'perfect_shape/shape'
+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 CubicBezierCurve < Shape
+    class << self
+      # Calculates the number of times the cubic bézier curve from (x1,y1) to (x2,y2)
+      # crosses the ray extending to the right from (x,y).
+      # If the point lies on a part of the curve,
+      # then no crossings are counted for that intersection.
+      # the level parameter should be 0 at the top-level call and will count
+      # up for each recursion level to prevent infinite recursion
+      # +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(x1, y1, xc1, yc1, xc2, yc2, x2, y2, px, py, level = 0)
+        return 0 if (py <  y1 && py <  yc1 && py <  yc2 && py <  y2)
+        return 0 if (py >= y1 && py >= yc1 && py >= yc2 && py >= y2)
+        # Note y1 could equal yc1...
+        return 0 if (px >= x1 && px >= xc1 && px >= xc2 && px >= x2)
+        if (px <  x1 && px <  xc1 && px <  xc2 && px <  x2)
+          if (py >= y1)
+            return 1 if (py < y2)
+          else
+            # py < y1
+            return -1 if (py >= y2)
+          end
+          # py outside of y12 range, and/or y1==yc1
+          return 0
+        end
+        # double precision only has 52 bits of mantissa
+        return PerfectShape::Line.point_crossings(x1, y1, x2, y2, px, py) if (level > 52)
+        xmid = BigDecimal((xc1 + xc2).to_s) / 2;
+        ymid = BigDecimal((yc1 + yc2).to_s) / 2;
+        xc1 = BigDecimal((x1 + xc1).to_s) / 2;
+        yc1 = BigDecimal((y1 + yc1).to_s) / 2;
+        xc2 = BigDecimal((xc2 + x2).to_s) / 2;
+        yc2 = BigDecimal((yc2 + y2).to_s) / 2;
+        xc1m = BigDecimal((xc1 + xmid).to_s) / 2;
+        yc1m = BigDecimal((yc1 + ymid).to_s) / 2;
+        xmc1 = BigDecimal((xmid + xc2).to_s) / 2;
+        ymc1 = BigDecimal((ymid + yc2).to_s) / 2;
+        xmid = BigDecimal((xc1m + xmc1).to_s) / 2;
+        ymid = BigDecimal((yc1m + ymc1).to_s) / 2;
+        # [xy]mid are NaN if any of [xy]c0m or [xy]mc1 are NaN
+        # [xy]c0m or [xy]mc1 are NaN if any of [xy][c][01] are NaN
+        # These values are also NaN if opposing infinities are added
+        return 0 if (xmid.nan? || ymid.nan?)
+        point_crossings(x1, y1, xc1, yc1, xc1m, yc1m, xmid, ymid, px, py, level+1) +
+          point_crossings(xmid, ymid, xmc1, ymc1, xc2, yc2, x2, y2, px, py, level+1)
+      end
+    end
+    
+    include MultiPoint
+    include Equalizer.new(:points)
+    
+    # Checks if cubic bézier curve contains point (two-number Array or x, y args)
+    #
+    # @param x The X coordinate of the point to test.
+    # @param y The Y coordinate of the point to test.
+    #
+    # @return {@code true} if the point lies within the bound of
+    # the cubic bézier curve, {@code false} if the point lies outside of the
+    # cubic bézier curve's bounds.
+    def contain?(x_or_point, y = nil)
+      x, y = normalize_point(x_or_point, y)
+      return unless x && y
+      
+      # Either x or y was infinite or NaN.
+      # A NaN always produces a negative response to any test
+      # and Infinity values cannot be "inside" any path so
+      # they should return false as well.
+      return false if (!(x * 0.0 + y * 0.0 == 0.0))
+      # We count the "Y" crossings to determine if the point is
+      # inside the curve bounded by its closing line.
+      x1 = points[0][0]
+      y1 = points[0][1]
+      x2 = points[3][0]
+      y2 = points[3][1]
+      line = PerfectShape::Line.new(points: [[x1, y1], [x2, y2]])
+      crossings = line.point_crossings(x, y) + point_crossings(x, y);
+      (crossings & 1) == 1
+    end
+    
+    # Calculates the number of times the cubic bézier curve
+    # crosses the ray extending to the right from (x,y).
+    # If the point lies on a part of the curve,
+    # then no crossings are counted for that intersection.
+    # the level parameter should be 0 at the top-level call and will count
+    # up for each recursion level to prevent infinite recursion
+    # +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)
+      return unless x && y
+      CubicBezierCurve.point_crossings(points[0][0], points[0][1], points[1][0], points[1][1], points[2][0], points[2][1], points[3][0], points[3][1], x, y, level)
+    end
+  end
+end

data/lib/perfect_shape/line.rb

@@ -189,14 +189,14 @@ module PerfectShape
       # +1 is returned for a crossing where the Y coordinate is increasing
       # -1 is returned for a crossing where the Y coordinate is decreasing
       def point_crossings(x1, y1, x2, y2, px, py)
-        return BigDecimal('0') if (py <  y1 && py <  y2)
-        return BigDecimal('0') if (py >= y1 && py >= y2)
+        return 0 if (py <  y1 && py <  y2)
+        return 0 if (py >= y1 && py >= y2)
         # assert(y1 != y2);
-        return BigDecimal('0') if (px >= x1 && px >= x2)
+        return 0 if (px >= x1 && px >= x2)
         return ((y1 < y2) ? 1 : -1) if (px <  x1 && px <  x2)
         xintercept = x1 + (py - y1) * (x2 - x1) / (y2 - y1);
-        return BigDecimal('0') if (px >= xintercept)
-        (y1 < y2) ? BigDecimal('1') : BigDecimal('-1')
+        return 0 if (px >= xintercept)
+        (y1 < y2) ? 1 : -1
       end
     end
     

data/lib/perfect_shape/path.rb

@@ -23,6 +23,7 @@ require 'perfect_shape/shape'
 require 'perfect_shape/point'
 require 'perfect_shape/line'
 require 'perfect_shape/quadratic_bezier_curve'
+require 'perfect_shape/cubic_bezier_curve'
 require 'perfect_shape/multi_point'
 
 module PerfectShape
@@ -31,7 +32,10 @@ module PerfectShape
     include MultiPoint
     include Equalizer.new(:shapes, :closed, :winding_rule)
     
-    SHAPE_TYPES = [Array, Point, Line]
+    # Available class types for path shapes
+    SHAPE_TYPES = [Array, PerfectShape::Point, PerfectShape::Line, PerfectShape::QuadraticBezierCurve, PerfectShape::CubicBezierCurve]
+    
+    # Available winding rules
     WINDING_RULES = [:wind_non_zero, :wind_even_odd]
     
     attr_reader :winding_rule
@@ -61,7 +65,10 @@ module PerfectShape
           shape.points.each do |point|
             the_points << point.to_a
           end
-#         when CubicBezierCurve # TODO
+        when CubicBezierCurve
+          shape.points.each do |point|
+            the_points << point.to_a
+          end
         end
       end
       the_points << @shapes.first.to_a if closed?
@@ -83,7 +90,8 @@ module PerfectShape
           :line_to
         when QuadraticBezierCurve
           :quad_to
-#         when CubicBezierCurve # TODO
+        when CubicBezierCurve
+          :cubic_to
         end
       end
       the_drawing_shapes << :close if closed?
@@ -113,7 +121,7 @@ module PerfectShape
         # Here we know that both x and y are finite.
         return false if shapes.count < 2
         mask = winding_rule == :wind_non_zero ? -1 : 1
-        (point_crossings(x, y).to_i & mask) != 0
+        (point_crossings(x, y) & mask) != 0
       else
         # Either x or y was infinite or NaN.
         # A NaN always produces a negative response to any test
@@ -137,67 +145,71 @@ module PerfectShape
     def point_crossings(x_or_point, y = nil)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
-      return BigDecimal('0') if shapes.count == 0
+      return 0 if shapes.count == 0
       movx = movy = curx = cury = endx = endy = 0
       coords = points.flatten
       curx = movx = coords[0]
       cury = movy = coords[1]
-      crossings = BigDecimal('0')
-      ci = BigDecimal('2')
+      crossings = 0
+      ci = 2
       1.upto(shapes.count - 1).each do |i|
-          case drawing_types[i]
-          when :move_to
-            if cury != movy
-              line = PerfectShape::Line.new(points: [[curx, cury], [movx, movy]])
-              crossings += line.point_crossings(x, y)
-            end
-            movx = curx = coords[ci]
-            ci += 1
-            movy = cury = coords[ci]
-            ci += 1
-          when :line_to
-            endx = coords[ci]
-            ci += 1
-            endy = coords[ci]
-            ci += 1
-            line = PerfectShape::Line.new(points: [[curx, cury], [endx, endy]])
+        case drawing_types[i]
+        when :move_to
+          if cury != movy
+            line = PerfectShape::Line.new(points: [[curx, cury], [movx, movy]])
             crossings += line.point_crossings(x, y)
-            curx = endx;
-            cury = endy;
-          when :quad_to
-            quad_ctrlx = coords[ci]
-            ci += 1
-            quad_ctrly = coords[ci]
-            ci += 1
-            endx = coords[ci]
-            ci += 1
-            endy = coords[ci]
-            ci += 1
-            quad = PerfectShape::QuadraticBezierCurve.new(points: [[curx, cury], [quad_ctrlx, quad_ctrly], [endx, endy]])
-            crossings += quad.point_crossings(x, y, 0)
-            curx = endx;
-            cury = endy;
-#           when :cubic_to # TODO
-#             crossings +=
-#                 Curve.point_crossings_for_cubic(x, y,
-#                                              curx, cury,
-#                                              coords[ci++],
-#                                              coords[ci++],
-#                                              coords[ci++],
-#                                              coords[ci++],
-#                                              endx = coords[ci++],
-#                                              endy = coords[ci++],
-#                                              0);
-#             curx = endx;
-#             cury = endy;
-          when :close
-            if cury != movy
-              line = PerfectShape::Line.new(points: [[curx, cury], [movx, movy]])
-              crossings += line.point_crossings(x, y)
-            end
-            curx = movx
-            cury = movy
           end
+          movx = curx = coords[ci]
+          ci += 1
+          movy = cury = coords[ci]
+          ci += 1
+        when :line_to
+          endx = coords[ci]
+          ci += 1
+          endy = coords[ci]
+          ci += 1
+          line = PerfectShape::Line.new(points: [[curx, cury], [endx, endy]])
+          crossings += line.point_crossings(x, y)
+          curx = endx;
+          cury = endy;
+        when :quad_to
+          quad_ctrlx = coords[ci]
+          ci += 1
+          quad_ctrly = coords[ci]
+          ci += 1
+          endx = coords[ci]
+          ci += 1
+          endy = coords[ci]
+          ci += 1
+          quad = PerfectShape::QuadraticBezierCurve.new(points: [[curx, cury], [quad_ctrlx, quad_ctrly], [endx, endy]])
+          crossings += quad.point_crossings(x, y)
+          curx = endx;
+          cury = endy;
+        when :cubic_to
+          cubic_ctrl1x = coords[ci]
+          ci += 1
+          cubic_ctrl1y = coords[ci]
+          ci += 1
+          cubic_ctrl2x = coords[ci]
+          ci += 1
+          cubic_ctrl2y = coords[ci]
+          ci += 1
+          endx = coords[ci]
+          ci += 1
+          endy = coords[ci]
+          ci += 1
+          cubic = PerfectShape::CubicBezierCurve.new(points: [[curx, cury], [cubic_ctrl1x, cubic_ctrl1y], [cubic_ctrl2x, cubic_ctrl2y], [endx, endy]])
+          crossings += cubic.point_crossings(x, y)
+          curx = endx;
+          cury = endy;
+        when :close
+          if cury != movy
+            line = PerfectShape::Line.new(points: [[curx, cury], [movx, movy]])
+            crossings += line.point_crossings(x, y)
+          end
+          curx = movx
+          cury = movy
+        end
       end
       if cury != movy
         line = PerfectShape::Line.new(points: [[curx, cury], [movx, movy]])

data/lib/perfect_shape/quadratic_bezier_curve.rb

@@ -26,33 +26,41 @@ 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)
+      # crosses the ray extending to the right from (x,y).
+      # If the point lies on a part of the curve,
+      # then no crossings are counted for that intersection.
+      # the level parameter should be 0 at the top-level call and will count
+      # up for each recursion level to prevent infinite recursion
+      # +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(x1, y1, xc, yc, x2, y2, px, py, level = 0)
-        return BigDecimal('0') if (py <  y1 && py <  yc && py <  y2)
-        return BigDecimal('0') if (py >= y1 && py >= yc && py >= y2)
+        return 0 if (py <  y1 && py <  yc && py <  y2)
+        return 0 if (py >= y1 && py >= yc && py >= y2)
         # Note y1 could equal y2...
-        return BigDecimal('0') if (px >= x1 && px >= xc && px >= x2)
+        return 0 if (px >= x1 && px >= xc && px >= x2)
         if (px <  x1 && px <  xc && px <  x2)
           if (py >= y1)
-            return BigDecimal('1') if (py < y2)
+            return 1 if (py < y2)
           else
             # py < y1
-            return BigDecimal('-1') if (py >= y2)
+            return -1 if (py >= y2)
           end
           # py outside of y11 range, and/or y1==y2
-          return BigDecimal('0')
+          return 0
         end
         # double precision only has 52 bits of mantissa
         return PerfectShape::Line.point_crossings(x1, y1, x2, y2, px, py) if (level > 52)
-        x1c = (x1 + xc) / BigDecimal('2')
-        y1c = (y1 + yc) / BigDecimal('2')
-        xc1 = (xc + x2) / BigDecimal('2')
-        yc1 = (yc + y2) / BigDecimal('2')
-        xc = (x1c + xc1) / BigDecimal('2')
-        yc = (y1c + yc1) / BigDecimal('2')
+        x1c = BigDecimal((x1 + xc).to_s) / 2
+        y1c = BigDecimal((y1 + yc).to_s) / 2
+        xc1 = BigDecimal((xc + x2).to_s) / 2
+        yc1 = BigDecimal((yc + y2).to_s) / 2
+        xc = BigDecimal((x1c + xc1).to_s) / 2
+        yc = BigDecimal((y1c + yc1).to_s) / 2
         # [xy]c are NaN if any of [xy]0c or [xy]c1 are NaN
         # [xy]0c or [xy]c1 are NaN if any of [xy][0c1] are NaN
         # These values are also NaN if opposing infinities are added
-        return BigDecimal('0') if (xc.nan? || yc.nan?)
+        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);
       end
@@ -69,7 +77,7 @@ module PerfectShape
     # @return {@code true} if the point lies within the bound of
     # 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, distance: 0)
+    def contain?(x_or_point, y = nil)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
 

data/perfect-shape.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: perfect-shape 0.1.1 ruby lib
+# stub: perfect-shape 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "perfect-shape".freeze
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/perfect-shape.rb",
     "lib/perfect_shape/arc.rb",
     "lib/perfect_shape/circle.rb",
+    "lib/perfect_shape/cubic_bezier_curve.rb",
     "lib/perfect_shape/ellipse.rb",
     "lib/perfect_shape/line.rb",
     "lib/perfect_shape/math.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfect-shape
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andy Maleh
@@ -116,6 +116,7 @@ files:
 - lib/perfect-shape.rb
 - lib/perfect_shape/arc.rb
 - lib/perfect_shape/circle.rb
+- lib/perfect_shape/cubic_bezier_curve.rb
 - lib/perfect_shape/ellipse.rb
 - lib/perfect_shape/line.rb
 - lib/perfect_shape/math.rb