grid_generator 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33f7e2a5d40ac58fafcb008d6549d56d36aab7935b029df4b8facbd1def78c1
-  data.tar.gz: 507e3e10eab639b2288504b3117be829d228ca715108904786375417ecf50eb4
+  metadata.gz: 97090c1a79ca2451c11e7e1414f93ebdd6fece49ac097fa419e7d2eee589ae3d
+  data.tar.gz: d549f0e473b1741441ec85c8945d6d817f1dae05c7806bb87ea790fde8de0c2e
 SHA512:
-  metadata.gz: 6d2b22be11a4766670f853047d73283621cce2e802877082e9354df0e1744ce8d6440e0aee6daa12e0962dfc489bb0a646a357daf16e3fea8cf90aeeb63b8656
-  data.tar.gz: c711fa172f250f496183d1f786e16372a5369d45f119144d65eaa532e51190edef01671ca9a14e0e16f841e903d015d110d229d967d301ae21a718ef1950027c
+  metadata.gz: 500c2d44cf6fe1e32078fe1723a9714448bcd1da7086b9543426cfc58af38aa63a6fac7e9f2b0a36eda4420d6d6e44f2d53a209b494dfbae48adc442df4042f0
+  data.tar.gz: f3112da44f9b558b4ec7c0c162252f05586dab11fa693548fe245e1bde80bad75de06cbc4d5acc03b0a988d16939803e955406fb0b1b0c6ac3b3e96b1c9bd9b8

data/Gemfile.lock

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

data/lib/grid_generator/megaminx/face_projection.rb

@@ -9,14 +9,18 @@ module GridGenerator
     class FaceProjection
       # units 30 - pentagon 90 - megaminx - 150
       # units * 5 
-      def initialize(x:, y:, units:, front_face_elements: "", top_right_face_elements: "")
+      def initialize(x:, y:, units:, front_face_elements: "", top_right_face_elements: "", right_face_elements: "", down_face_elements: "", left_face_elements: "", top_left_face_elements: "")
         @x, @y = x, y
         @units = units
         @front_face_elements = front_face_elements.split(',')
         @top_right_face_elements = top_right_face_elements.split(',')
+        @right_face_elements = right_face_elements.split(',')
+        @down_face_elements = down_face_elements.split(',')
+        @left_face_elements = left_face_elements.split(',')
+        @top_left_face_elements = top_left_face_elements.split(',')
       end
 
-      attr_reader :x, :y, :units, :front_face_elements, :top_right_face_elements
+      attr_reader :x, :y, :units, :front_face_elements, :top_right_face_elements, :right_face_elements, :down_face_elements, :left_face_elements, :top_left_face_elements
 
       def offset
         @offset ||= Matrix.column_vector([x, y])
@@ -78,6 +82,26 @@ module GridGenerator
         ]
       end
 
+      def right_pentagon_points
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 0.4, rotation_point: rotation_point)
+        @right_pentagon_points ||= top_right_pentagon_points.map { |p| rotator.rotate(p) } 
+      end
+
+      def down_pentagon_points
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 0.8, rotation_point: rotation_point)
+        @down_pentagon_points ||= top_right_pentagon_points.map { |p| rotator.rotate(p) } 
+      end
+
+      def left_pentagon_points
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 1.2, rotation_point: rotation_point)
+        @left_pentagon_points ||= top_right_pentagon_points.map { |p| rotator.rotate(p) } 
+      end
+
+      def top_left_pentagon_points
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 1.6, rotation_point: rotation_point)
+        @top_left_pentagon_points ||= top_right_pentagon_points.map { |p| rotator.rotate(p) } 
+      end
+
       def front_face_lines_raw
         (0..4).map do |i|
           a = pentagon_points[i-1] # offset one so first line is top right
@@ -93,7 +117,7 @@ module GridGenerator
       end
 
       def top_right_face_lines_raw
-        (0..4).map do |i| 
+        @top_right_face_lines_raw ||= (0..4).map do |i| 
           a = top_right_pentagon_points[i-1] # offset by one so first line is top right
           b = top_right_pentagon_points[(i)%5]
           c = top_right_pentagon_points[(i+1)%5]
@@ -106,6 +130,26 @@ module GridGenerator
         end
       end
 
+      def right_face_lines_raw
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 0.4, rotation_point: rotation_point)
+        @right_face_lines_raw ||= top_right_face_lines_raw.map { |l| rotator.rotate(l) } 
+      end
+
+      def down_face_lines_raw
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 0.8, rotation_point: rotation_point)
+        @down_face_lines_raw ||= top_right_face_lines_raw.map { |l| rotator.rotate(l) } 
+      end
+
+      def left_face_lines_raw
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 1.2, rotation_point: rotation_point)
+        @left_face_lines_raw ||= top_right_face_lines_raw.map { |l| rotator.rotate(l) } 
+      end
+
+      def top_left_face_lines_raw
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 1.6, rotation_point: rotation_point)
+        @top_left_face_lines_raw ||= top_right_face_lines_raw.map { |l| rotator.rotate(l) } 
+      end
+
       # for svg
       def connecting_lines
         pentagon_points.each_with_index.map do |p, i|
@@ -121,26 +165,22 @@ module GridGenerator
 
       # for svg
       def right_face_lines
-        rotator = GridGenerator::Rotator.new(angle: Math::PI * 0.4, rotation_point: rotation_point)
-        top_right_face_lines_raw.map { |l| rotator.rotate(l) + offset } 
+        right_face_lines_raw.map { |l| l + offset }
       end
 
       # for svg
       def down_face_lines
-        rotator = GridGenerator::Rotator.new(angle: Math::PI * 0.8, rotation_point: rotation_point)
-        top_right_face_lines_raw.map { |l| rotator.rotate(l) + offset } 
+        down_face_lines_raw.map { |l| l + offset }
       end
 
       # for svg
       def left_face_lines
-        rotator = GridGenerator::Rotator.new(angle: Math::PI * 1.2, rotation_point: rotation_point)
-        top_right_face_lines_raw.map { |l| rotator.rotate(l) + offset } 
+        left_face_lines_raw.map { |l| l + offset }
       end
 
       # for svg
       def top_left_face_lines
-        rotator = GridGenerator::Rotator.new(angle: Math::PI * 1.6, rotation_point: rotation_point)
-        top_right_face_lines_raw.map { |l| rotator.rotate(l) + offset } 
+        top_left_face_lines_raw.map { |l| l + offset }
       end
 
       # for svg
@@ -172,6 +212,7 @@ module GridGenerator
         end.compact
       end
 
+      # for svg
       def top_right_face_element_shapes
         top_right_face_elements.each_with_index.map do |element, i|
           GridGenerator::Megaminx::FaceElementFactory.new(
@@ -184,6 +225,58 @@ module GridGenerator
           ).build unless element == '-'
         end.compact
       end
+
+      def right_face_element_shapes
+        right_face_elements.each_with_index.map do |element, i|
+          GridGenerator::Megaminx::FaceElementFactory.new(
+            x: x,
+            y: y,
+            index: i,
+            face_points: right_pentagon_points,
+            face_lines: right_face_lines_raw,
+            face: element
+          ).build unless element == '-'
+        end.compact
+      end
+
+      def down_face_element_shapes
+        down_face_elements.each_with_index.map do |element, i|
+          GridGenerator::Megaminx::FaceElementFactory.new(
+            x: x,
+            y: y,
+            index: i,
+            face_points: down_pentagon_points,
+            face_lines: down_face_lines_raw,
+            face: element
+          ).build unless element == '-'
+        end.compact
+      end
+
+      def left_face_element_shapes
+        left_face_elements.each_with_index.map do |element, i|
+          GridGenerator::Megaminx::FaceElementFactory.new(
+            x: x,
+            y: y,
+            index: i,
+            face_points: left_pentagon_points,
+            face_lines: left_face_lines_raw,
+            face: element
+          ).build unless element == '-'
+        end.compact
+      end
+
+      def top_left_face_element_shapes
+        top_left_face_elements.each_with_index.map do |element, i|
+          GridGenerator::Megaminx::FaceElementFactory.new(
+            x: x,
+            y: y,
+            index: i,
+            face_points: top_left_pentagon_points,
+            face_lines: top_left_face_lines_raw,
+            face: element
+          ).build unless element == '-'
+        end.compact
+      end
     end
   end
 end

data/lib/grid_generator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors:
 - Mark Humphreys