perfect-shape 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73a1e3f4816ce8829788f6ad76e83a88429301000bb49aca7bab878148d90527
-  data.tar.gz: f2628350798a4f5285f3c82941154e21a52aa72b401f3a3fdd889e720554eade
+  metadata.gz: 4e9d2cae407980abba8c58b3a38979723ffbb95bd7b0cc832d33fbc6a60e1700
+  data.tar.gz: fce964dcf5e15a9f4de977a70d6f95c31cd02ad5674b5ee546328be9c606e8a4
 SHA512:
-  metadata.gz: d79de0f8201d530f55792faea84bb8e9d47608a06f234d305aeb5dcf8ca8fefc612c9eebda0b449ece028a3d281f6b5d8824c41c6b7703d9e575e9cb6cabaa55
-  data.tar.gz: 861950d0dd6107a7de5f5d5f59e192770eb6255024881d67a4e67b3ca229fdc1ff29f176f40223bdb0c8ef67e38cfc46a33313c1d9adb9b37c7fb84f688dc491
+  metadata.gz: 27da7756bb313e2499c1aebd25ba92691140763bc8a41402e3202be4d9d80feab95392dd6cb1c655dc104cd9ab98c09cea22a9e7bf19fa5a8266a017d935212b
+  data.tar.gz: 663348a23058f6e88f3e1bf28441692684fa6df9abd3579a5444e84609808a829c05d2b57742b3646094998c8725ec73fb35a733767117f811196ba191c0d05f

data/CHANGELOG.md

@@ -1,9 +1,14 @@
 # Change Log
 
+## 1.0.3
+
+- `Rectangle` and `Square` `#to_path_shapes` method, which decomposes them into `Point`s and `Line`s to be added to a `Path`
+- `Path` can contain a `Rectangle` or `Square` (to get affected by the winding algorithm as opposed to `CompositeShape`, which has no winding algorithm)
+
 ## 1.0.2
 
-- `Path` can contain an `Arc`, `Ellipse`, or `Circle` (to get affected by the winding algorithm as opposed to `CompositeShape` which has no winding algorithm)
 - `Arc`, `Ellipse`, and `Circle` `#to_path_shapes` method, which decomposes them into `Point`s, `Line`s, and `CubicBezierCurve`s to be added to a `Path`
+- `Path` can contain an `Arc`, `Ellipse`, or `Circle` (to get affected by the winding algorithm as opposed to `CompositeShape`, which has no winding algorithm)
 
 ## 1.0.1
 

data/README.md

@@ -1,4 +1,4 @@
-# Perfect Shape 1.0.2
+# Perfect Shape 1.0.3
 ## 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 1.0.2
+gem install perfect-shape -v 1.0.3
 ```
 
 Or include in Bundler `Gemfile`:
 
 ```ruby
-gem 'perfect-shape', '~> 1.0.2'
+gem 'perfect-shape', '~> 1.0.3'
 ```
 
 And, run:
@@ -377,6 +377,7 @@ Includes `PerfectShape::RectangularShape`
 - `#edges`: edges of rectangle as `PerfectShape::Line` objects
 - `#out_state(x_or_point, y = nil)`: Returns "out state" of specified point (x,y) (whether it lies to the left, right, top, bottom of rectangle). If point is outside rectangle, it returns a bit mask combination of `Rectangle::OUT_LEFT`, `Rectangle::OUT_RIGHT`, `Rectangle::OUT_TOP`, or `Rectangle::OUT_BOTTOM`. Otherwise, it returns `0` if point is inside the rectangle.
 - `#empty?`: Returns `true` if width or height are 0 (or negative) and `false` otherwise
+- `#to_path_shapes`: Converts `Rectangle` into basic `Path` shapes made up of `Point`s and `Line`s. Used by `Path` when adding a `Rectangle` to `Path` `shapes`
 
 Example:
 
@@ -424,6 +425,7 @@ Extends `PerfectShape::Rectangle`
 - `#intersect?(rectangle)`: Returns `true` if intersecting with interior of rectangle or `false` otherwise. This is useful for GUI optimization checks of whether a shape appears in a GUI viewport rectangle and needs redrawing
 - `#edges`: edges of square as `PerfectShape::Line` objects
 - `#empty?`: Returns `true` if length is 0 (or negative) and `false` otherwise
+- `#to_path_shapes`: Converts `Square` into basic `Path` shapes made up of `Point`s and `Line`s. Used by `Path` when adding a `Square` to `Path` `shapes`
 
 Example:
 
@@ -760,9 +762,9 @@ Includes `PerfectShape::MultiPoint`
 
 ![path](https://raw.githubusercontent.com/AndyObtiva/perfect-shape/master/images/path.png)
 
-- `::new(shapes: [], closed: false, winding_rule: :wind_even_odd, line_to_complex_shapes: false)`: 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`, `PerfectShape::CubicBezierCurve`, or complex shapes that decompose into the aforementioned basic path shapes, like `PerfectShape::Arc`, `PerfectShape::Ellipse`, and `PerfectShape::Circle`. 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`. `line_to_complex_shapes` can be `true` or `false` (default), indicating whether to connect to complex shapes, meaning `Arc`, `Ellipse`, and `Circle`, with a line, or otherwise move to their start point instead.
+- `::new(shapes: [], closed: false, winding_rule: :wind_even_odd, line_to_complex_shapes: false)`: 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`, `PerfectShape::CubicBezierCurve`, or complex shapes that decompose into the aforementioned basic path shapes, like `PerfectShape::Arc`, `PerfectShape::Ellipse`, `PerfectShape::Circle`, `PerfectShape::Rectangle`, and `PerfectShape::Square`. 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`. `line_to_complex_shapes` can be `true` or `false` (default), indicating whether to connect to complex shapes, meaning `Arc`, `Ellipse`, `Circle`, `Rectangle`, and `Square`, with a line, or otherwise move to their start point instead.
 - `#shapes`: the shapes that the path is composed of (must always start with `PerfectShape::Point` or Array of `[x,y]` coordinates representing start point)
-- `#basic_shapes`: the basic shapes that the path is composed of, meaning only `Point`, `Line`, `QuadraticBezierCurve`, and `CubicBezierCurve` shapes (decomposing complex shapes like `Arc`, `Ellipse`, and `Circle` using their `#to_path_shapes` method)
+- `#basic_shapes`: the basic shapes that the path is composed of, meaning only `Point`, `Line`, `QuadraticBezierCurve`, and `CubicBezierCurve` shapes (decomposing complex shapes like `Arc`, `Ellipse`, `Circle`, `Rectangle`, and `Square`, using their `#to_path_shapes` method)
 - `#closed?`: returns `true` if closed and `false` otherwise
 - `#winding_rule`: returns winding rule (`:wind_non_zero` or `:wind_even_odd`)
 - `#points`: path points calculated (derived) from shapes
@@ -813,7 +815,7 @@ Class
 
 Extends `PerfectShape::Shape`
 
-A composite shape is simply an aggregate of multiple shapes (e.g. square and polygon)
+A composite shape is simply an aggregate of multiple shapes (e.g. square and triangle polygon)
 
 ![composite shape](https://raw.githubusercontent.com/AndyObtiva/perfect-shape/master/images/composite-shape.png)
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/perfect_shape/arc.rb

@@ -348,7 +348,6 @@ module PerfectShape
       arc_segs = line_segs = -1 if w < 0 || h < 0
       
       first_point_x = first_point_y = nil
-      last_point_x = last_point_y = nil
       (arc_segs + line_segs + 1).to_i.times.map do |index|
         coords = []
         angle = ang_st_rad
@@ -365,10 +364,6 @@ module PerfectShape
         elsif index > arc_segs
           coords[0] = x
           coords[1] = y
-          if line_segs == 2
-            last_point_x = coords[0]
-            last_point_y = coords[1]
-          end
           Line.new(points: coords)
         else
           angle += increment * (index - 1)
@@ -383,10 +378,6 @@ module PerfectShape
           coords[3] = y + (rely - cv * relx) * h
           coords[4] = x + relx * w
           coords[5] = y + rely * h
-          if line_segs == 1
-            last_point_x = coords[4]
-            last_point_y = coords[5]
-          end
           CubicBezierCurve.new(points: coords)
         end
       end.compact

data/lib/perfect_shape/cubic_bezier_curve.rb

@@ -213,8 +213,6 @@ module PerfectShape
     end
     
     def intersect?(rectangle)
-      x = rectangle.x
-      y = rectangle.y
       w = rectangle.width
       h = rectangle.height
       

data/lib/perfect_shape/rectangle.rb

@@ -116,5 +116,43 @@ module PerfectShape
         x < (x0 + self.width) &&
         y < (y0 + self.height)
     end
+    
+    # Converts Rectangle into basic Path shapes made up of Points and Lines
+    # Used by Path when adding a Rectangle to Path shapes
+    def to_path_shapes
+      path_shapes = []
+      x = self.x
+      y = self.y
+      w = self.width
+      h = self.height
+      index = 0
+      index = 5 if (w < 0 || h < 0)
+      max_index = 4
+      max_index = 2 if (w == 0 && h > 0) || (w > 0 && h == 0)
+      max_index = 1 if (w == 0 && h == 0)
+      first_point_x = first_point_y = nil
+      
+      until index > max_index
+        if index == max_index
+          path_shapes << Line.new(points: [[first_point_x, first_point_y]])
+        else
+          coords = []
+          coords[0] = x
+          coords[1] = y
+          coords[0] += w if ([2, 4].include?(max_index) && index == 1) || (max_index == 4 && index == 2)
+          coords[1] += h if (max_index == 2 && index == 1) || (max_index == 4 && [2, 3].include?(index))
+          if index == 0
+            first_point_x = coords[0]
+            first_point_y = coords[1]
+            path_shapes << Point.new(coords)
+          else
+            path_shapes << Line.new(points: coords)
+          end
+        end
+        index += 1
+      end
+      
+      path_shapes
+    end
   end
 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 1.0.2 ruby lib
+# stub: perfect-shape 1.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "perfect-shape".freeze
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   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-04-03"
+  s.date = "2022-04-26"
   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 the Ray Casting Algorithm, aka Even-odd Rule, and the 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: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-03 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equalizer