grid_generator 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84401ca268f2dd6e73aa1cf880a9b534ca81291c5576f044e1494b5684aa0f26
-  data.tar.gz: 6c00e9248134a87f8751bd436a850e8467bfc65966c6ed7544640fc9b28130fa
+  metadata.gz: 812b6c5f247baa77cba970a91dd52c6b6663d1985563db1d21f173f44e391da1
+  data.tar.gz: 1f0ac5ba29dc0983fe13acd9fb778047b4145cac67e19b39c1fe8a77135faefe
 SHA512:
-  metadata.gz: 4ddbe0d8f15c45aa80ae209ed4e348d3d6c02a2c41a99cad2103a783267b487999034c1cc641c0ccbf6b30d97e3d34349f7165102713d7bdbbbc136ada17ec58
-  data.tar.gz: f7b7aac3f4daf48485de2f9d395c341bb40d84495e57825b468810b26b13e4f09d3d4928d46af2650d6fdff24db7b3325957ebae84e589a09e79b93d2d836dfc
+  metadata.gz: dd16fdc6510169001c957ac24342ed79cfc9d79fe96c98011f6270d6223a9a1dc08737dda987617068b4d30581abb519c8dba09cea83fffb438f4310a2e4847c
+  data.tar.gz: e634b12f6070af21ea72cf5e7b6dc5fea167e0c511bdb03d1dfc3829145b80f1d87894ed09503c03270b4ad20fab6381e638b97fd81027990d89561ea2b1fa5c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grid_generator (0.2.23)
+    grid_generator (0.2.24)
       matrix (~> 0.4.2)
 
 GEM

data/lib/grid_generator/megaminx/face_element_factory.rb

@@ -3,7 +3,7 @@ require_relative '../face_parser'
 module GridGenerator
   module Megaminx
     class FaceElementFactory
-      def initialize(x:, y:, index:, face_points: , face_lines:, face:)
+      def initialize(x:, y:, index:, face_points: , face_lines:, face:, rotator: )
         @x, @y = x, y
         @index = index
         @face_points = face_points
@@ -11,9 +11,10 @@ module GridGenerator
         face_attr = FaceParser.new(face).parse
         @colour = face_attr && face_attr[:colour]
         @opacity = face_attr && face_attr[:opacity]
+        @rotator = rotator 
       end
 
-      attr_reader :x, :y, :index, :face_points, :face_lines, :colour, :opacity 
+      attr_reader :x, :y, :index, :face_points, :face_lines, :colour, :opacity, :rotator 
 
       def offset
         Matrix.column_vector([x, y])
@@ -81,7 +82,7 @@ module GridGenerator
           end
         end
 
-        all_points.map { |p| p + offset }
+        all_points.map { |p| rotator.rotate(p) + offset }
       end
 
       def build

data/lib/grid_generator/megaminx/face_projection.rb

@@ -99,12 +99,8 @@ module GridGenerator
 
       def outside_pentagon_points
         @outside_pentagon_points ||= (0..4).map do |i|
-          if i == 0
-            top_right_pentagon_points 
-          else
-            rotator = GridGenerator::Rotator.new(angle: Math::PI * i * 0.4, rotation_point: rotation_point)
-            top_right_pentagon_points.map { |p| rotator.rotate(p) } 
-          end
+          rotator = GridGenerator::Rotator.new(angle: Math::PI * i * 0.4, rotation_point: rotation_point)
+          top_right_pentagon_points.map { |p| rotator.rotate(p) } 
         end
       end
 
@@ -138,12 +134,8 @@ module GridGenerator
 
       def outside_face_lines_raw
         @outside_face_lines_raw ||= (0..4).map do |i|
-          if i == 0
-            top_right_face_lines_raw
-          else
-            rotator = GridGenerator::Rotator.new(angle: Math::PI * i * 0.4, rotation_point: rotation_point)
-            top_right_face_lines_raw.map { |l| rotator.rotate(l) } 
-          end
+          rotator = GridGenerator::Rotator.new(angle: Math::PI * i * 0.4, rotation_point: rotation_point)
+          top_right_face_lines_raw.map { |l| rotator.rotate(l) } 
         end
       end
 
@@ -154,31 +146,31 @@ module GridGenerator
 
       # for svg
       def decagon_points_string
-        decagon_points.map { |p| p + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+        decagon_points.map { |p| offset_rotator.rotate(p) + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
       end
 
       # for svg
       def pentagon_points_string
-        pentagon_points.map { |p| p + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+        pentagon_points.map { |p| offset_rotator.rotate(p) + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
       end
 
       # for svg
       def connecting_lines
         pentagon_points.each_with_index.map do |p, i|
           d = decagon_points[i*2]
-          GridGenerator::Line.new(a: p, b: d) + offset
+          offset_rotator.rotate(GridGenerator::Line.new(a: p, b: d)) + offset
         end
       end
 
       # for svg
       def front_face_lines
-        front_face_lines_raw.map { |l| l + offset }
+        front_face_lines_raw.map { |l| offset_rotator.rotate(l) + offset }
       end
 
       # for svg
       def outside_face_lines
         outside_face_lines_raw.map do |face_lines|
-          face_lines.map { |l| l + offset }
+          face_lines.map { |l| offset_rotator.rotate(l) + offset }
         end
       end
 
@@ -191,7 +183,8 @@ module GridGenerator
             index: i,
             face_points: pentagon_points,
             face_lines: front_face_lines_raw,
-            face: element
+            face: element,
+            rotator: offset_rotator
           ).build unless element == '-'
         end.compact
       end
@@ -206,7 +199,8 @@ module GridGenerator
               index: element_index,
               face_points: outside_pentagon_points[face_index],
               face_lines: outside_face_lines_raw[face_index],
-              face: element
+              face: element,
+              rotator: offset_rotator
             ).build unless element == '-'
           end.compact
         end

data/lib/grid_generator/rotator.rb

@@ -13,6 +13,7 @@ module GridGenerator
 
     # subtract rotation point to move point towards 0,0, rotate, then add to move back
     def rotate(obj)
+      return obj if angle == 0 
       case obj
       when Matrix
         (matrix * (obj - rotation_point)) + rotation_point

data/lib/grid_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GridGenerator
-  VERSION = "0.2.23"
+  VERSION = "0.2.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix