grid_generator 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d34bf3e232b6ba728e1dfb968dc9f176932955a8ef93d9b796c5233f6ed495d
-  data.tar.gz: f135d7666604b09947e3be7465bdeb4831b8d1b0d49aca20ee4d17346fa53e61
+  metadata.gz: 4b4decfd16c0f0358a935123fed5fb0a190d2379d14a37b83e2f0c958d41a624
+  data.tar.gz: 50883416a3a299e9ea384b14777eef77d1767ffb22ff11b7449fb1d79f6c8bae
 SHA512:
-  metadata.gz: 12f2aea851e3975e67ba4ed59451f6810f1f6c9b7cecee1cac673139b1fb3c76ae2b70b8bb0b37d9bee41fd198674308536c1ae74aa657a3de9f1055c1cec034
-  data.tar.gz: dd555ce643c53dda16d03d49e6373f140cbedd6fcaccbf2a53447b72a68c781d144b6b78d4be362d7e830ce539b4b44d9a27d19b530a958f9af8f2f2d6287ec8
+  metadata.gz: 4a35b02c742ec97e40f5b674232ab528b00fe7ee401ae47340b1bc0539e29cd3c75e2bfa31349dc9a66a3b6e51da3d59209f3aebbf1d06423b168aea0343e083
+  data.tar.gz: 12e781e8a1d8c0b125b4395a0bdf20b29636a632f2a4b288226f718a6ddac223756db2a06a078797f2dbaf0ec786673c126da1e4fdea780cb29acc6bd3f28f13

data/Gemfile.lock

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

data/lib/grid_generator/line.rb

@@ -12,6 +12,16 @@ module GridGenerator
         self.b == other.b
     end
 
+    def +(offset)
+      if offset.class == Matrix
+        new_a = a + offset
+        new_b = b + offset
+        self.class.new(a: new_a, b: new_b)
+      else
+        raise ArgumentError, "Offset must be Matrix"
+      end
+    end
+
     def x1
       a[0,0]
     end

data/lib/grid_generator/megaminx/face_projection.rb

@@ -87,18 +87,17 @@ module GridGenerator
         ]
       end
 
-      # for svg 
-      def connecting_lines
-        pentagon_points.each_with_index.map do |p, i|
-          d = decagon_points[i*2]
-          line_start = p + offset
-          line_end = d + offset
-          GridGenerator::Line.new(a: line_start, b: line_end) 
-        end
+      def right_pentagon_points
+        @right_pentagon_points ||= [
+          decagon_points[2],
+          decagon_points[3],
+          decagon_points[4],
+          pentagon_points[2],
+          pentagon_points[1]
+        ]
       end
-      
-      # for svg
-      def top_right_face_lines
+
+      def top_right_face_lines_raw
         (0..4).map do |i| 
           a = top_right_pentagon_points[i]
           b = top_right_pentagon_points[(i+1)%5]
@@ -108,10 +107,29 @@ module GridGenerator
           ab_intervals = GridGenerator::Helper.intervals(a,b,2)
           cd_intervals = GridGenerator::Helper.intervals(c,d,2)
 
-          line_start = ab_intervals.last + offset
-          line_end = cd_intervals.first + offset
+          GridGenerator::Line.new(a: ab_intervals[-1], b: cd_intervals[0])
+        end
+      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
+        end
+      end
 
-          GridGenerator::Line.new(a: line_start, b: line_end)
+      # for svg
+      def top_right_face_lines
+        top_right_face_lines_raw.map { |l| l + offset }
+      end
+
+      # for svg
+      def right_face_lines
+        angle = Math::PI * 0.4
+        rotator = GridGenerator::Rotator.new(angle: angle, rotation_point: rotation_point)
+        top_right_face_lines_raw.map do |l|
+          rotator.rotate(l) + offset
         end
       end
 
@@ -126,10 +144,7 @@ module GridGenerator
           ab_intervals = GridGenerator::Helper.intervals(a,b,2)
           cd_intervals = GridGenerator::Helper.intervals(c,d,2)
 
-          line_start = ab_intervals.last + offset
-          line_end = cd_intervals.first + offset
-
-          GridGenerator::Line.new(a: line_start, b: line_end)
+          GridGenerator::Line.new(a: ab_intervals[-1], b: cd_intervals[0]) + offset
         end
       end
 

data/lib/grid_generator/rotator.rb

@@ -11,9 +11,18 @@ module GridGenerator
 
     attr_reader :angle, :matrix, :rotation_point
 
-    def rotate(point) 
-      # subtract rotation point to move point towards 0,0, rotate, then add to move back
-      (matrix * (point - rotation_point)) + rotation_point 
+    # subtract rotation point to move point towards 0,0, rotate, then add to move back
+    def rotate(obj)
+      case obj
+      when Matrix
+        (matrix * (obj - rotation_point)) + rotation_point
+      when GridGenerator::Line
+        new_a = rotate(obj.a)
+        new_b = rotate(obj.b)
+        GridGenerator::Line.new(a: new_a, b: new_b)
+      else
+        raise ArgumentError, "Object must be Matrix or Line"
+      end
     end
   end
 end

data/lib/grid_generator/version.rb

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

metadata

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