perfect-shape 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42bff3742b2697349882d865b7c5da9c06ce4a259850996bb92f291e8a74130e
-  data.tar.gz: 5a2f007129f1e0f483a48ea607a7ee3e44cbdf01b400a656f406b412dc8e9524
+  metadata.gz: 4dc25ad218f1860bfff0fccc88b81ea4b6ef71795c737b740b998385f4c7bf7d
+  data.tar.gz: 31b52e8b765db80edde7ede8487f579a5de33b51fa1939bc1601dbad093741b1
 SHA512:
-  metadata.gz: 9bf87bebe682dfbab8a4b082caa321ac0b7051510d86e946e3f214337e818a18da7cee51bc12432510567deaa68f65a69cb3c7da10b7c9153045803e1d25f0b7
-  data.tar.gz: fa32aa79d500055b81b572e17ded38429503a3757430bba1c0fea021853e4377d7e025071cf52ed8c2f965c8bc8ecd35601276f2a1bcda847202c6f49c8422a0
+  metadata.gz: 949d9a223e08cf4b9154f63f575908707c257620e18fdcd4a2820855c305400f418038b5ec53b56c4a4baea7c38065df8da71158dc29c76a5a19a809bf38da33
+  data.tar.gz: '049d0fb36f1b633ebb20cf9fae4731688a19197a4bcbf29cbf55a7f837a5e4a9916b9b3a396a2f859387d3f80fcc7d8ebb9c6a23757dc3b389b0c70e79c7b845'

data/CHANGELOG.md

@@ -1,11 +1,18 @@
 # Change Log
 
+## 0.3.4
+
+- Check point containment in path outline with distance tolerance (new method signature: `PerfectShape::Path#contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)`)
+- `PerfectShape::Path#disconnected_shapes`: Disconnected shapes have their start point filled in so that each shape does not depend on the previous shape to determine its start point.
+- `Shape#center_point` as `[center_x, center_y]`
+- Rename `#point_segment_distance` to `#point_distance` everywhere
+
 ## 0.3.3
 
 - Check point containment in quadratic bezier curve outline with distance tolerance (new method signature: `PerfectShape::QuadraticBezierCurve#contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)`)
 - `PerfectShape::QuadraticBezierCurve#curve_center_point`, `PerfectShape::QuadraticBezierCurve#curve_center_x`, `PerfectShape::QuadraticBezierCurve#curve_center_y`
 - `PerfectShape::QuadraticBezierCurve#subdivisions(level=1)`
-- `PerfectShape::QuadraticBezierCurve#point_segment_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)`
+- `PerfectShape::QuadraticBezierCurve#point_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)`
 - `PerfectShape::Polygon#edges` returns edges of polygon as `PerfectShape::Line` objects
 - `PerfectShape::Rectangle#edges` returns edges of rectangle as `PerfectShape::Line` objects
 - `PerfectShape::Square#edges` returns edges of square as `PerfectShape::Line` objects
@@ -16,7 +23,7 @@
 - Check point containment in cubic bezier curve outline with distance tolerance (new method signature: `PerfectShape::CubicBezierCurve#contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)`)
 - `PerfectShape::CubicBezierCurve#curve_center_point`, `PerfectShape::CubicBezierCurve#curve_center_x`, `PerfectShape::CubicBezierCurve#curve_center_y`
 - `PerfectShape::CubicBezierCurve#subdivisions(level=1)`
-- `PerfectShape::CubicBezierCurve#point_segment_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)`
+- `PerfectShape::CubicBezierCurve#point_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)`
 
 ## 0.3.1
 
@@ -80,7 +87,7 @@
 - `PerfectShape::Line`
 - `PerfectShape::Line#contain?(x_or_point, y=nil)`
 - `PerfectShape::Line#relative_counterclockwise`
-- `PerfectShape::Line#point_segment_distance`
+- `PerfectShape::Line#point_distance`
 - Update `PerfectShape::Math::radians_to_degrees`, `PerfectShape::Math::degrees_to_radians`, and `PerfectShape::Math::normalize_degrees` to normalize numbers to `BigDecimal`
 
 ## 0.0.7

data/README.md

@@ -1,4 +1,4 @@
-# Perfect Shape 0.3.3
+# Perfect Shape 0.3.4
 ## 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)
@@ -14,13 +14,13 @@ To ensure high accuracy, this library does all its mathematical operations with
 Run:
 
 ```
-gem install perfect-shape -v 0.3.3
+gem install perfect-shape -v 0.3.4
 ```
 
 Or include in Bundler `Gemfile`:
 
 ```ruby
-gem 'perfect-shape', '~> 0.3.3'
+gem 'perfect-shape', '~> 0.3.4'
 ```
 
 And, run:
@@ -52,6 +52,7 @@ This is a base class for all shapes. It is not meant to be used directly. Subcla
 - `#max_y`: max y
 - `#width`: width
 - `#height`: height
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#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 just as those of shape
@@ -84,9 +85,6 @@ Includes `PerfectShape::PointLocation`
 - `#min_y`: min y
 - `#max_x`: max x
 - `#max_y`: 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
 
 ### `PerfectShape::Point`
 
@@ -108,11 +106,12 @@ Points are simply represented by an `Array` of `[x,y]` coordinates when used wit
 - `#max_y`: max y (always y)
 - `#width`: width (always 0)
 - `#height`: height (always 0)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#center_x`: center x (always x)
 - `#center_y`: center y (always y)
 - `#bounding_box`: bounding box is a rectangle with x = min x, y = min y, and width/height of shape
 - `#==(other)`: Returns `true` if equal to `other` or `false` otherwise
-- `#contain?(x_or_point, y=nil, distance_tolerance: 0)`: checks if point matches self, with a distance tolerance (0 by default). Distance tolerance provides a fuzz factor that for example enables GUI users to mouse-click-select a point shape more successfully.
+- `#contain?(x_or_point, y=nil, outline: true, distance_tolerance: 0)`: checks if point matches self, with a distance tolerance (0 by default). Distance tolerance provides a fuzz factor that for example enables GUI users to mouse-click-select a point shape more successfully. `outline` option makes no difference on point
 - `#point_distance(x_or_point, y=nil)`: Returns the distance from a point to another point
 
 Example:
@@ -141,8 +140,8 @@ Includes `PerfectShape::MultiPoint`
 ![line](https://raw.githubusercontent.com/AndyObtiva/perfect-shape/master/images/line.png)
 
 - `::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.
+- `::point_distance_square(x1, y1, x2, y2, px, py)`: Returns the square of distance from a point to a line segment.
+- `::point_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 coordinates
 - `#min_x`: min x
 - `#min_y`: min y
@@ -150,13 +149,14 @@ Includes `PerfectShape::MultiPoint`
 - `#max_y`: max y
 - `#width`: width (from min x to max x)
 - `#height`: height (from min y to max y)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#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
 - `#==(other)`: Returns `true` if equal to `other` or `false` otherwise
-- `#contain?(x_or_point, y=nil, distance_tolerance: 0)`: checks if point lies on line, with a distance tolerance (0 by default). Distance tolerance provides a fuzz factor that for example enables GUI users to mouse-click-select a line shape more successfully.
+- `#contain?(x_or_point, y=nil, outline: true, distance_tolerance: 0)`: checks if point lies on line, with a distance tolerance (0 by default). Distance tolerance provides a fuzz factor that for example enables GUI users to mouse-click-select a line shape more successfully. `outline` option makes no difference on line
 - `#relative_counterclockwise(x_or_point, y=nil)`: 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(x_or_point, y=nil)`: Returns the distance from a point to a line segment.
+- `#point_distance(x_or_point, y=nil)`: Returns the distance from a point to a line segment.
 
 Example:
 
@@ -191,16 +191,17 @@ Includes `PerfectShape::MultiPoint`
 - `#max_y`: max y
 - `#width`: width (from min x to max x)
 - `#height`: height (from min y to max y)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#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)
 - `#==(other)`: Returns `true` if equal to `other` or `false` otherwise
 - `#contain?(x_or_point, y=nil, outline: false, distance_tolerance: 0)`: checks if point is inside when `outline` is `false` or if point is on the outline when `outline` is `true`. `distance_tolerance` can be used as a fuzz factor when `outline` is `true`, for example, to help GUI users mouse-click-select a quadratic bezier curve shape from its outline more successfully
-- `#curve_center_point`: point at the center of the curve (not the center of the bounding box area like `center_x` and `center_y`)
-- `#curve_center_x`: point x coordinate at the center of the curve (not the center of the bounding box area like `center_x` and `center_y`)
-- `#curve_center_y`: point y coordinate at the center of the curve (not the center of the bounding box area like `center_x` and `center_y`)
+- `#curve_center_point`: point at the center of the curve outline (not the center of the bounding box area like `center_x` and `center_y`)
+- `#curve_center_x`: point x coordinate at the center of the curve outline (not the center of the bounding box area like `center_x` and `center_y`)
+- `#curve_center_y`: point y coordinate at the center of the curve outline (not the center of the bounding box area like `center_x` and `center_y`)
 - `#subdivisions(level=1)`: subdivides quadratic bezier curve at its center into into 2 quadratic bezier curves by default, or more if `level` of recursion is specified. The resulting number of subdivisions is `2` to the power of `level`.
-- `#point_segment_distance(x_or_point, y=nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)`: calculates distance from point to curve segment. It does so by subdividing curve into smaller curves and checking against the curve center points until the distance is less than `minimum_distance_threshold`, to avoid being an overly costly operation.
+- `#point_distance(x_or_point, y=nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)`: calculates distance from point to curve segment. It does so by subdividing curve into smaller curves and checking against the curve center points until the distance is less than `minimum_distance_threshold`, to avoid being an overly costly operation.
 
 Example:
 
@@ -239,16 +240,17 @@ Includes `PerfectShape::MultiPoint`
 - `#max_y`: max y
 - `#width`: width (from min x to max x)
 - `#height`: height (from min y to max y)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#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)
 - `#==(other)`: Returns `true` if equal to `other` or `false` otherwise
 - `#contain?(x_or_point, y=nil, outline: false, distance_tolerance: 0)`: checks if point is inside when `outline` is `false` or if point is on the outline when `outline` is `true`. `distance_tolerance` can be used as a fuzz factor when `outline` is `true`, for example, to help GUI users mouse-click-select a cubic bezier curve shape from its outline more successfully
-- `#curve_center_point`: point at the center of the curve (not the center of the bounding box area like `center_x` and `center_y`)
-- `#curve_center_x`: point x coordinate at the center of the curve (not the center of the bounding box area like `center_x` and `center_y`)
-- `#curve_center_y`: point y coordinate at the center of the curve (not the center of the bounding box area like `center_x` and `center_y`)
+- `#curve_center_point`: point at the center of the curve outline (not the center of the bounding box area like `center_x` and `center_y`)
+- `#curve_center_x`: point x coordinate at the center of the curve outline (not the center of the bounding box area like `center_x` and `center_y`)
+- `#curve_center_y`: point y coordinate at the center of the curve outline (not the center of the bounding box area like `center_x` and `center_y`)
 - `#subdivisions(level=1)`: subdivides cubic bezier curve at its center into into 2 cubic bezier curves by default, or more if `level` of recursion is specified. The resulting number of subdivisions is `2` to the power of `level`.
-- `#point_segment_distance(x_or_point, y=nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)`: calculates distance from point to curve segment. It does so by subdividing curve into smaller curves and checking against the curve center points until the distance is less than `minimum_distance_threshold`, to avoid being an overly costly operation.
+- `#point_distance(x_or_point, y=nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)`: calculates distance from point to curve segment. It does so by subdividing curve into smaller curves and checking against the curve center points until the distance is less than `minimum_distance_threshold`, to avoid being an overly costly operation.
 
 Example:
 
@@ -284,6 +286,7 @@ Includes `PerfectShape::RectangularShape`
 - `#y`: top-left y
 - `#width`: width
 - `#height`: height
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#center_x`: center x
 - `#center_y`: center y
 - `#min_x`: min x
@@ -328,6 +331,7 @@ Extends `PerfectShape::Rectangle`
 - `#length`: length
 - `#width`: width (equal to length)
 - `#height`: height (equal to length)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#center_x`: center x
 - `#center_y`: center y
 - `#min_x`: min x
@@ -380,6 +384,7 @@ Open Arc | Chord Arc | Pie Arc
 - `#height`: height
 - `#start`: start angle in degrees
 - `#extent`: extent angle in degrees
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#center_x`: center x
 - `#center_y`: center y
 - `#radius_x`: radius along the x-axis
@@ -499,6 +504,7 @@ Extends `PerfectShape::Arc`
 - `#y`: top-left y
 - `#width`: width
 - `#height`: height
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#center_x`: center x
 - `#center_y`: center y
 - `#radius_x`: radius along the x-axis
@@ -558,6 +564,7 @@ Extends `PerfectShape::Ellipse`
 - `#diameter`: diameter
 - `#width`: width (equal to diameter)
 - `#height`: height (equal to diameter)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#center_x`: center x
 - `#center_y`: center y
 - `#radius`: radius
@@ -623,6 +630,7 @@ A polygon can be thought of as a special case of [path](#perfectshapepath) that
 - `#max_y`: max y
 - `#width`: width (from min x to max x)
 - `#height`: height (from min y to max y)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#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
@@ -670,12 +678,14 @@ Includes `PerfectShape::MultiPoint`
 - `#max_y`: max y
 - `#width`: width (from min x to max x)
 - `#height`: height (from min y to max y)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#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)
 - `#==(other)`: Returns `true` if equal to `other` or `false` otherwise
-- `#contain?(x_or_point, y=nil)`: checks if point is inside path utilizing the configured winding rule, which can be the [Nonzero-Rule](https://en.wikipedia.org/wiki/Nonzero-rule) (aka [Winding Number Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Winding_number_algorithm)) or the [Even-Odd Rule](https://en.wikipedia.org/wiki/Even%E2%80%93odd_rule) (aka [Ray Casting Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Ray_casting_algorithm))
+- `#contain?(x_or_point, y=nil, outline: false, distance_tolerance: 0)`: When `outline` is `false`, it checks if point is inside path utilizing the configured winding rule, which can be the [Nonzero-Rule](https://en.wikipedia.org/wiki/Nonzero-rule) (aka [Winding Number Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Winding_number_algorithm)) or the [Even-Odd Rule](https://en.wikipedia.org/wiki/Even%E2%80%93odd_rule) (aka [Ray Casting Algorithm](https://en.wikipedia.org/wiki/Point_in_polygon#Ray_casting_algorithm)). Otherwise, when `outline` is `true`, it checks if point is on the outline. `distance_tolerance` can be used as a fuzz factor when `outline` is `true`, for example, to help GUI users mouse-click-select a path shape from its outline more successfully
 - `#point_crossings(x_or_point, y=nil)`: calculates the number of times the given path crosses the ray extending to the right from (x,y)
+- `#disconnected_shapes`: Disconnected shapes have their start point filled in so that each shape does not depend on the previous shape to determine its start point. Also, if a point is followed by a non-point shape, it is removed since it is augmented to the following shape as its start point. Lastly, if the path is closed, an extra shape is added to represent the line connecting the last point to the first
 
 Example:
 
@@ -692,6 +702,14 @@ shape = PerfectShape::Path.new(shapes: path_shapes, closed: false, winding_rule:
 
 shape.contain?(225, 160) # => true
 shape.contain?([225, 160]) # => true
+shape.contain?(225, 160, outline: true) # => false
+shape.contain?([225, 160], outline: true) # => false
+shape.contain?(shape.disconnected_shapes[1].curve_center_x, shape.disconnected_shapes[1].curve_center_y, outline: true) # => true
+shape.contain?([shape.disconnected_shapes[1].curve_center_x, shape.disconnected_shapes[1].curve_center_y], outline: true) # => true
+shape.contain?(shape.disconnected_shapes[1].curve_center_x + 1, shape.disconnected_shapes[1].curve_center_y, outline: true) # => false
+shape.contain?([shape.disconnected_shapes[1].curve_center_x + 1, shape.disconnected_shapes[1].curve_center_y], outline: true) # => false
+shape.contain?(shape.disconnected_shapes[1].curve_center_x + 1, shape.disconnected_shapes[1].curve_center_y, outline: true, distance_tolerance: 1) # => true
+shape.contain?([shape.disconnected_shapes[1].curve_center_x + 1, shape.disconnected_shapes[1].curve_center_y], outline: true, distance_tolerance: 1) # => true
 ```
 
 ### `PerfectShape::CompositeShape`
@@ -712,6 +730,7 @@ A composite shape is simply an aggregate of multiple shapes (e.g. square and pol
 - `#max_y`: max y
 - `#width`: width (from min x to max x)
 - `#height`: height (from min y to max y)
+- `#center_point`: center point as `Array` of `[center_x, center_y]` coordinates
 - `#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)

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/perfect_shape/arc.rb

@@ -152,8 +152,8 @@ module PerfectShape
           true
         else
           distance_tolerance = BigDecimal(distance_tolerance.to_s)
-          outside_inside_radius_difference = DEFAULT_OUTLINE_RADIUS + distance_tolerance * 2.0
-          outside_radius_difference = inside_radius_difference = outside_inside_radius_difference / 2.0
+          outside_inside_radius_difference = DEFAULT_OUTLINE_RADIUS + distance_tolerance * 2
+          outside_radius_difference = inside_radius_difference = outside_inside_radius_difference / 2
           outside_shape = Arc.new(type: type, center_x: center_x, center_y: center_y, radius_x: radius_x + outside_radius_difference, radius_y: radius_y + outside_radius_difference, start: start, extent: extent)
           inside_shape = Arc.new(type: type, center_x: center_x, center_y: center_y, radius_x: radius_x - inside_radius_difference, radius_y: radius_y - inside_radius_difference, start: start, extent: extent)
           outside_shape.contain?(x, y, outline: false) and

data/lib/perfect_shape/cubic_bezier_curve.rb

@@ -51,18 +51,18 @@ module PerfectShape
         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;
+        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
@@ -90,8 +90,9 @@ module PerfectShape
       return unless x && y
       
       if outline
+        distance_tolerance = BigDecimal(distance_tolerance.to_s)
         minimum_distance_threshold = OUTLINE_MINIMUM_DISTANCE_THRESHOLD + distance_tolerance
-        point_segment_distance(x, y, minimum_distance_threshold: minimum_distance_threshold) < minimum_distance_threshold
+        point_distance(x, y, minimum_distance_threshold: minimum_distance_threshold) < minimum_distance_threshold
       else
         # Either x or y was infinite or NaN.
         # A NaN always produces a negative response to any test
@@ -105,7 +106,7 @@ module PerfectShape
         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 = line.point_crossings(x, y) + point_crossings(x, y)
         (crossings & 1) == 1
       end
     end
@@ -148,6 +149,7 @@ module PerfectShape
     # for level=1, 4 subdivisions for level=2, and 8 subdivisions for level=3)
     def subdivisions(level = 1)
       level -= 1 # consume 1 level
+      
       x1 = points[0][0]
       y1 = points[0][1]
       ctrlx1 = points[1][0]
@@ -156,22 +158,23 @@ module PerfectShape
       ctrly2 = points[2][1]
       x2 = points[3][0]
       y2 = points[3][1]
-      centerx = (ctrlx1 + ctrlx2) / 2.0
-      centery = (ctrly1 + ctrly2) / 2.0
-      ctrlx1 = (x1 + ctrlx1) / 2.0
-      ctrly1 = (y1 + ctrly1) / 2.0
-      ctrlx2 = (x2 + ctrlx2) / 2.0
-      ctrly2 = (y2 + ctrly2) / 2.0
-      ctrlx12 = (ctrlx1 + centerx) / 2.0
-      ctrly12 = (ctrly1 + centery) / 2.0
-      ctrlx21 = (ctrlx2 + centerx) / 2.0
-      ctrly21 = (ctrly2 + centery) / 2.0
-      centerx = (ctrlx12 + ctrlx21) / 2.0
-      centery = (ctrly12 + ctrly21) / 2.0
-      default_subdivisions = [
-        CubicBezierCurve.new(points: [x1, y1, ctrlx1, ctrly1, ctrlx12, ctrly12, centerx, centery]),
-        CubicBezierCurve.new(points: [centerx, centery, ctrlx21, ctrly21, ctrlx2, ctrly2, x2, y2])
-      ]
+      centerx = BigDecimal((ctrlx1 + ctrlx2).to_s) / 2
+      centery = BigDecimal((ctrly1 + ctrly2).to_s) / 2
+      ctrlx1 = BigDecimal((x1 + ctrlx1).to_s) / 2
+      ctrly1 = BigDecimal((y1 + ctrly1).to_s) / 2
+      ctrlx2 = BigDecimal((x2 + ctrlx2).to_s) / 2
+      ctrly2 = BigDecimal((y2 + ctrly2).to_s) / 2
+      ctrlx12 = BigDecimal((ctrlx1 + centerx).to_s) / 2
+      ctrly12 = BigDecimal((ctrly1 + centery).to_s) / 2
+      ctrlx21 = BigDecimal((ctrlx2 + centerx).to_s) / 2
+      ctrly21 = BigDecimal((ctrly2 + centery).to_s) / 2
+      centerx = BigDecimal((ctrlx12 + ctrlx21).to_s) / 2
+      centery = BigDecimal((ctrly12 + ctrly21).to_s) / 2
+      
+      first_curve = CubicBezierCurve.new(points: [x1, y1, ctrlx1, ctrly1, ctrlx12, ctrly12, centerx, centery])
+      second_curve = CubicBezierCurve.new(points: [centerx, centery, ctrlx21, ctrly21, ctrlx2, ctrly2, x2, y2])
+      default_subdivisions = [first_curve, second_curve]
+      
       if level == 0
         default_subdivisions
       else
@@ -179,7 +182,7 @@ module PerfectShape
       end
     end
     
-    def point_segment_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)
+    def point_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
       
@@ -189,8 +192,10 @@ module PerfectShape
       last_minimum_distance = minimum_distance + 1 # start bigger to ensure going through loop once at least
       while minimum_distance >= minimum_distance_threshold && minimum_distance < last_minimum_distance
         curve1, curve2 = current_curve.subdivisions
-        distance1 = point.point_distance(curve1.curve_center_point)
-        distance2 = point.point_distance(curve2.curve_center_point)
+        curve1_center_point = curve1.curve_center_point
+        distance1 = point.point_distance(curve1_center_point)
+        curve2_center_point = curve2.curve_center_point
+        distance2 = point.point_distance(curve2_center_point)
         last_minimum_distance = minimum_distance
         if distance1 < distance2
           minimum_distance = distance1

data/lib/perfect_shape/line.rb

@@ -104,7 +104,7 @@ module PerfectShape
       #           measured against the specified line segment
       # @return a double value that is the square of the distance from the
       #                  specified point to the specified line segment.
-      def point_segment_distance_square(x1, y1,
+      def point_distance_square(x1, y1,
                                        x2, y2,
                                        px, py)
         x1 = BigDecimal(x1.to_s)
@@ -177,10 +177,10 @@ module PerfectShape
       #           measured against the specified line segment
       # @return a double value that is the distance from the specified point
       #                          to the specified line segment.
-      def point_segment_distance(x1, y1,
+      def point_distance(x1, y1,
                                  x2, y2,
                                  px, py)
-        BigDecimal(::Math.sqrt(point_segment_distance_square(x1, y1, x2, y2, px, py)).to_s)
+        BigDecimal(::Math.sqrt(point_distance_square(x1, y1, x2, y2, px, py)).to_s)
       end
       
       # Calculates the number of times the line from (x1,y1) to (x2,y2)
@@ -212,17 +212,17 @@ module PerfectShape
     # @return {@code true} if the point lies within the bound of
     # the line, {@code false} if the point lies outside of the
     # line's bounds.
-    def contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)
+    def contain?(x_or_point, y = nil, outline: true, distance_tolerance: 0)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
       distance_tolerance = BigDecimal(distance_tolerance.to_s)
-      point_segment_distance(x, y) <= distance_tolerance
+      point_distance(x, y) <= distance_tolerance
     end
     
-    def point_segment_distance(x_or_point, y = nil)
+    def point_distance(x_or_point, y = nil)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
-      Line.point_segment_distance(points[0][0], points[0][1], points[1][0], points[1][1], x, y)
+      Line.point_distance(points[0][0], points[0][1], points[1][0], points[1][1], x, y)
     end
     
     def relative_counterclockwise(x_or_point, y = nil)

data/lib/perfect_shape/multi_point.rb

@@ -37,7 +37,13 @@ module PerfectShape
         ys = the_points.each_with_index.select {|n, i| i.odd?}.map(&:first)
         the_points = xs.zip(ys)
       end
-      @points = the_points.map {|pair| [BigDecimal(pair.first.to_s), BigDecimal(pair.last.to_s)]}
+      @points = the_points.map do |pair|
+        [
+          pair.first.is_a?(BigDecimal) ? pair.first : BigDecimal(pair.first.to_s),
+          pair.last.is_a?(BigDecimal) ? pair.last : BigDecimal(pair.last.to_s)
+        ]
+      end
+      @points
     end
     
     def min_x

data/lib/perfect_shape/path.rb

@@ -114,21 +114,26 @@ module PerfectShape
     # @return true if the point lies within the bound of
     # the path or false if the point lies outside of the
     # path's bounds.
-    def contain?(x_or_point, y = nil)
+    def contain?(x_or_point, y = nil, outline: false, distance_tolerance: 0)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
-      if (x * 0.0 + y * 0.0) == 0.0
-        # N * 0.0 is 0.0 only if N is finite.
-        # 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) & mask) != 0
+      
+      if outline
+        disconnected_shapes.any? {|shape| shape.contain?(x, y, outline: true, distance_tolerance: distance_tolerance) }
       else
-        # 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.
-        false
+        if (x * 0.0 + y * 0.0) == 0.0
+          # N * 0.0 is 0.0 only if N is finite.
+          # 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) & mask) != 0
+        else
+          # 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.
+          false
+        end
       end
     end
     
@@ -218,5 +223,50 @@ module PerfectShape
       end
       crossings
     end
+    
+    # Disconnected shapes have their start point filled in
+    # so that each shape does not depend on the previous shape
+    # to determine its start point.
+    #
+    # Also, if a point is followed by a non-point shape, it is removed
+    # since it is augmented to the following shape as its start point.
+    #
+    # Lastly, if the path is closed, an extra shape is
+    # added to represent the line connecting the last point to the first
+    def disconnected_shapes
+      initial_point = start_point = @shapes.first.to_a.map {|n| BigDecimal(n.to_s)}
+      final_point = nil
+      the_disconnected_shapes = @shapes.drop(1).map do |shape|
+        case shape
+        when Point
+          disconnected_shape = Point.new(*shape.to_a)
+          start_point = shape.to_a
+          final_point = disconnected_shape.to_a
+          nil
+        when Array
+          disconnected_shape = Point.new(*shape.map {|n| BigDecimal(n.to_s)})
+          start_point = shape.map {|n| BigDecimal(n.to_s)}
+          final_point = disconnected_shape.to_a
+          nil
+        when Line
+          disconnected_shape = Line.new(points: [start_point.to_a, shape.points.last])
+          start_point = shape.points.last.to_a
+          final_point = disconnected_shape.points.last.to_a
+          disconnected_shape
+        when QuadraticBezierCurve
+          disconnected_shape = QuadraticBezierCurve.new(points: [start_point.to_a] + shape.points)
+          start_point = shape.points.last.to_a
+          final_point = disconnected_shape.points.last.to_a
+          disconnected_shape
+        when CubicBezierCurve
+          disconnected_shape = CubicBezierCurve.new(points: [start_point.to_a] + shape.points)
+          start_point = shape.points.last.to_a
+          final_point = disconnected_shape.points.last.to_a
+          disconnected_shape
+        end
+      end
+      the_disconnected_shapes << Line.new(points: [final_point, initial_point]) if closed?
+      the_disconnected_shapes.compact
+    end
   end
 end

data/lib/perfect_shape/point.rb

@@ -27,10 +27,10 @@ module PerfectShape
   class Point < Shape
     class << self
       def point_distance(x, y, px, py)
-        x = BigDecimal(x.to_s)
-        y = BigDecimal(y.to_s)
-        px = BigDecimal(px.to_s)
-        py = BigDecimal(py.to_s)
+        x = x.is_a?(BigDecimal) ? x : BigDecimal(x.to_s)
+        y = y.is_a?(BigDecimal) ? y : BigDecimal(y.to_s)
+        px = px.is_a?(BigDecimal) ? px : BigDecimal(px.to_s)
+        py = py.is_a?(BigDecimal) ? py : BigDecimal(py.to_s)
         BigDecimal(Math.sqrt((px - x)**2 + (py - y)**2).to_s)
       end
     end
@@ -67,7 +67,7 @@ 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: false, distance_tolerance: 0)
+    def contain?(x_or_point, y = nil, outline: true, distance_tolerance: 0)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
       distance_tolerance = BigDecimal(distance_tolerance.to_s)
@@ -77,6 +77,7 @@ module PerfectShape
     def point_distance(x_or_point, y = nil)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
+      
       Point.point_distance(self.x, self.y, x, y)
     end
     

data/lib/perfect_shape/quadratic_bezier_curve.rb

@@ -91,8 +91,9 @@ module PerfectShape
       y2 = points[2][1]
       
       if outline
+        distance_tolerance = BigDecimal(distance_tolerance.to_s)
         minimum_distance_threshold = OUTLINE_MINIMUM_DISTANCE_THRESHOLD + distance_tolerance
-        point_segment_distance(x, y, minimum_distance_threshold: minimum_distance_threshold) < minimum_distance_threshold
+        point_distance(x, y, minimum_distance_threshold: minimum_distance_threshold) < minimum_distance_threshold
       else
         # We have a convex shape bounded by quad curve Pc(t)
         # and ine Pl(t).
@@ -194,8 +195,8 @@ module PerfectShape
       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
     
-    
     # The center point on the outline of the curve
+    # in Array format as pair of (x, y) coordinates
     def curve_center_point
       subdivisions.last.points[0]
     end
@@ -226,12 +227,12 @@ module PerfectShape
       ctrly = points[1][1]
       x2 = points[2][0]
       y2 = points[2][1]
-      ctrlx1 = (x1 + ctrlx) / 2.0
-      ctrly1 = (y1 + ctrly) / 2.0
-      ctrlx2 = (x2 + ctrlx) / 2.0
-      ctrly2 = (y2 + ctrly) / 2.0
-      centerx = (ctrlx1 + ctrlx2) / 2.0
-      centery = (ctrly1 + ctrly2) / 2.0
+      ctrlx1 = BigDecimal((x1 + ctrlx).to_s) / 2
+      ctrly1 = BigDecimal((y1 + ctrly).to_s) / 2
+      ctrlx2 = BigDecimal((x2 + ctrlx).to_s) / 2
+      ctrly2 = BigDecimal((y2 + ctrly).to_s) / 2
+      centerx = BigDecimal((ctrlx1 + ctrlx2).to_s) / 2
+      centery = BigDecimal((ctrly1 + ctrly2).to_s) / 2
       
       default_subdivisions = [
         QuadraticBezierCurve.new(points: [x1, y1, ctrlx1, ctrly1, centerx, centery]),
@@ -245,7 +246,7 @@ module PerfectShape
       end
     end
     
-    def point_segment_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)
+    def point_distance(x_or_point, y = nil, minimum_distance_threshold: OUTLINE_MINIMUM_DISTANCE_THRESHOLD)
       x, y = normalize_point(x_or_point, y)
       return unless x && y
       

data/lib/perfect_shape/shape.rb

@@ -51,6 +51,12 @@ module PerfectShape
       max_y - min_y if max_y && min_y
     end
     
+    # Center point is `[center_x, center_y]`
+    # Returns `nil` if either center_x or center_y are `nil`
+    def center_point
+      [center_x, center_y] unless center_x.nil? || center_y.nil?
+    end
+    
     # center_x is min_x + width/2.0 by default
     # Returns nil if min_x or width are nil
     def center_x
@@ -79,8 +85,8 @@ module PerfectShape
     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 = BigDecimal(x.to_s)
-      y = BigDecimal(y.to_s)
+      x = x.is_a?(BigDecimal) ? x : BigDecimal(x.to_s)
+      y = y.is_a?(BigDecimal) ? y : BigDecimal(y.to_s)
       [x, y]
     end
     

data/perfect-shape.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: perfect-shape 0.3.3 ruby lib
+# stub: perfect-shape 0.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "perfect-shape".freeze
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   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-10"
+  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.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfect-shape
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equalizer