grid_generator 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f7a6b485fa1238581e0acf2470c1a4e8bfa934d01678636b074b516b95e814
-  data.tar.gz: 9c26054a0b5e6e30aa17c058602881db49e5fafbdaaa60a7a8b6f80fa570affc
+  metadata.gz: b7fa51b1f90d6133fa000c7328f588af19ec0bf7c9985c72dc6c45f319844a04
+  data.tar.gz: cacef7a4e2db775e0a1eb16dc8216ca8d0aae914e5e0f6fd3c67cb688a774308
 SHA512:
-  metadata.gz: 189c300178031b6bb9089cf2801787552dfc659c0c2ba42b41829a1331eb2d7b0d5966c2a39338d3965efed263b1a1e4c44f63aee94114aeddc66b21b0bc267e
-  data.tar.gz: 4373a281c204c8955c68509510e691bc5947f4a705ffbc4d7e1b9a29fe3391aa13c4cee9072204daf31adb65c76eedc043356a66beb24b2eb2eb6e0f2d305dde
+  metadata.gz: bc5115584895296ae2ce85a8151cd6a0f47925e59e0d534c2167385d6df80a0bbe642f976515a23121662d844b86768538eb3587c0632394888894e52591ceb9
+  data.tar.gz: 3cac31b7d257093ed7a06a04c0e0e49bd245556ef5ffa5ccb40f649a67d9be056c1a156d3f32c9446ba673218541256ae07a3b0668cd3f46fbb1255622622d63

data/Gemfile.lock

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

data/lib/grid_generator/pyraminx/face.rb

@@ -1,4 +1,6 @@
 require_relative 'triangle_factory'
+require_relative '../rotator'
+require_relative '../scaler'
 
 module GridGenerator
   module Pyraminx
@@ -6,18 +8,39 @@ module GridGenerator
     # * * *
     # * * * * * 
     class Face
-      def initialize(x:, y:, units:, elements:) 
+      def initialize(x:, y:, units:, elements:, vertical_scale: 1, rotation_angle: 0)
         @x, @y = x, y
         @units = units
         @elements = elements.split('\n').map { |r| r.split(',') }
+        @vertical_scale = vertical_scale 
+        @rotation_angle = rotation_angle
       end
 
-      attr_reader :x, :y, :units, :elements
+      attr_reader :x, :y, :units, :elements, :vertical_scale, :rotation_angle
 
       def size
         elements.size
       end
 
+      def centre_point
+        Matrix.column_vector([
+          size * units * 0.5,
+          size * Math.sqrt(3) * 0.25 * units
+        ])
+      end
+
+      def offset
+        Matrix.column_vector([x, y])
+      end
+
+      def rotator
+        @rotator ||= GridGenerator::Rotator.new(angle: rotation_angle, rotation_point: centre_point)
+      end
+
+      def scaler
+        @scaler ||= GridGenerator::Scaler.new(horizontal_scale: 1, vertical_scale: vertical_scale)
+      end
+
       def start_x_for_row(r)
         (size - 1 - r) * units / 2
       end
@@ -30,62 +53,134 @@ module GridGenerator
         Math.sqrt(3)/2 * (r + 1) * units
       end
 
+      def vertical_start_point_for_row(r)
+        Matrix.column_vector([
+          start_x_for_row(r),
+          y_for_row(r),
+        ])
+      end
+
+      def vertical_end_point_for_row(r)
+        Matrix.column_vector([
+          end_x_for_row(r),
+          y_for_row(r)
+        ])
+      end
+
       def vertical_lines 
         Array.new(size-1) do |i|
+          point_1 = vertical_start_point_for_row(i)
+          point_2 = vertical_end_point_for_row(i)
+
+          scaled_1 = scaler.scale(point_1)
+          scaled_2 = scaler.scale(point_2)
+
+          transformed_1 = rotator.rotate(scaled_1) + offset
+          transformed_2 = rotator.rotate(scaled_2) + offset
+
           GridGenerator::BaseLine.new( 
-            x1: x + start_x_for_row(i),
-            y1: y + y_for_row(i),
-            x2: x + end_x_for_row(i),
-            y2: y + y_for_row(i) 
+            x1: transformed_1[0,0],
+            y1: transformed_1[1,0],
+            x2: transformed_2[0,0],
+            y2: transformed_2[1,0]
           )
         end
       end
 
+      def diagonal_down_start_point_for_row(r)
+        Matrix.column_vector([
+          start_x_for_row(r),
+          y_for_row(r),
+        ])
+      end
+
+      def diagonal_down_end_point_for_row(r)
+        Matrix.column_vector([
+          (size - 1 - r)*units,
+          y_for_row(size-1)
+        ])
+      end
+
       def diagonal_down_lines 
         Array.new(size-1) do |i|
+          point_1 = diagonal_down_start_point_for_row(i)
+          point_2 = diagonal_down_end_point_for_row(i)
+
+          scaled_1 = scaler.scale(point_1)
+          scaled_2 = scaler.scale(point_2)
+
+          transformed_1 = rotator.rotate(scaled_1) + offset
+          transformed_2 = rotator.rotate(scaled_2) + offset
+
           GridGenerator::BaseLine.new( 
-            x1: x + start_x_for_row(i),
-            y1: y + y_for_row(i),
-            x2: x + (size - 1 - i)*units,
-            y2: y + y_for_row(size-1) 
+            x1: transformed_1[0,0],
+            y1: transformed_1[1,0],
+            x2: transformed_2[0,0],
+            y2: transformed_2[1,0]
           )
         end
       end
 
+      def diagonal_up_start_point_for_row(r)
+        Matrix.column_vector([
+          (r+1)*units,
+          y_for_row(size-1),
+        ])
+      end
+
+      def diagonal_up_end_point_for_row(r)
+        Matrix.column_vector([
+          end_x_for_row(r),
+          y_for_row(r)
+        ])
+      end
+
       def diagonal_up_lines 
         Array.new(size-1) do |i|
+          point_1 = diagonal_up_start_point_for_row(i)
+          point_2 = diagonal_up_end_point_for_row(i)
+
+          scaled_1 = scaler.scale(point_1)
+          scaled_2 = scaler.scale(point_2)
+
+          transformed_1 = rotator.rotate(scaled_1) + offset
+          transformed_2 = rotator.rotate(scaled_2) + offset
+
           GridGenerator::BaseLine.new( 
-            x1: x + (i+1)*units,
-            y1: y + y_for_row(size-1),
-            x2: x + end_x_for_row(i),
-            y2: y + y_for_row(i) 
+            x1: transformed_1[0,0],
+            y1: transformed_1[1,0],
+            x2: transformed_2[0,0],
+            y2: transformed_2[1,0]
           )
         end
       end
 
       def top
         Matrix.column_vector([
-          x + size * units / 2,
-          y 
+          size * units / 2,
+          0
         ])
       end
 
       def bottom_left
         Matrix.column_vector([
-          x,
-          y + size * Math.sqrt(3)/2 * units
+          0,
+          size * Math.sqrt(3)/2 * units
         ])
       end
 
       def bottom_right
         Matrix.column_vector([
-          x + size * units,
-          y + size * Math.sqrt(3)/2 * units
+          size * units,
+          size * Math.sqrt(3)/2 * units
         ])
       end
 
       def points
-        [ top, bottom_left, bottom_right ]
+        [ top, bottom_left, bottom_right ].map do |point|
+          scaled = scaler.scale(point)
+          rotator.rotate(scaled) + offset
+        end
       end
 
       def points_string
@@ -102,7 +197,9 @@ module GridGenerator
               col: col_num,
               units: units,
               size: size,
-              face: col
+              face: col,
+              rotator: rotator,
+              scaler: scaler
             ).build unless col == '-' 
           end
         end.flatten.compact

data/lib/grid_generator/pyraminx/triangle_factory.rb

@@ -4,7 +4,7 @@ require_relative '../base_element'
 module GridGenerator
   module Pyraminx
     class TriangleFactory
-      def initialize(x:, y:, row:, col:, units:, size:, face:)
+      def initialize(x:, y:, row:, col:, units:, size:, face:, rotator:, scaler:)
         @x, @y = x, y
         @row = row
         @col = col
@@ -13,9 +13,15 @@ module GridGenerator
         face_attr = GridGenerator::FaceParser.new(face).parse
         @colour = face_attr && face_attr[:colour]
         @opacity = face_attr && face_attr[:opacity]
+        @rotator = rotator
+        @scaler = scaler
       end
 
-      attr_reader :x, :y, :row, :col, :units, :size, :colour, :opacity
+      attr_reader :x, :y, :row, :col, :units, :size, :colour, :opacity, :rotator, :scaler
+
+      def offset
+        Matrix.column_vector([x, y])
+      end
 
       #  x + ((3 - 0) * 0.5 * units) + 0 * 0.5 * units # row = 0, col = 0
       #  x + ((3 - 1) * 0.5 * units) + 0 * 0.5 * units # row = 1, col = 0
@@ -24,7 +30,7 @@ module GridGenerator
       #  x + ((3 - 2) * 0.5 * units) + 2 * 0.5 * units # row = 2, col = 2 
       #  x + ((3 - 2) * 0.5 * units) + 4 * 0.5 * units # row = 2, col = 4 
       def even_top_x
-        x + ((size - row) * 0.5 * units) + col * 0.5 * units 
+        ((size - row) * 0.5 * units) + col * 0.5 * units
       end
 
       # x + (0 * -1 + (3 - 1)) * 0.5 * units + 0 * 0.5 * units # row = 0, col = 0 
@@ -34,7 +40,7 @@ module GridGenerator
       # x + (2 * -1 + (3 - 1)) * 0.5 * units + 2 * 0.5 * units # row = 2, col = 2 
       # x + (2 * -1 + (3 - 1)) * 0.5 * units + 4 * 0.5 * units# row = 2, col = 4 
       def even_bottom_left_x
-        x + (row * -1 + (size - 1)) * 0.5 * units + col * 0.5 * units 
+        (row * -1 + (size - 1)) * 0.5 * units + col * 0.5 * units
       end
 
       #  x + (0 * -1 + (3 + 1)) * 0.5 * units + 0 * 0.5 * units # row = 0, col = 0
@@ -44,21 +50,21 @@ module GridGenerator
       #  x + (2 * -1 + (3 + 1)) * 0.5 * units + 2 * 0.5 * units # row = 2, col = 2 
       #  x + (2 * -1 + (3 + 1)) * 0.5 * units + 4 * 0.5 * units # row = 2, col = 4 
       def even_bottom_right_x
-        x + (row * -1 + (size + 1)) * 0.5 * units + col * 0.5 * units
+        (row * -1 + (size + 1)) * 0.5 * units + col * 0.5 * units
       end
 
       #  0 * Math.sqrt(3)/2 * units # row = 0
       #  1 * Math.sqrt(3)/2 * units # row = 1
       #  2 * Math.sqrt(3)/2 * units # row = 2
       def top_y
-        y + row * Math.sqrt(3)/2 * units
+        row * Math.sqrt(3)/2 * units
       end
 
       #  (0 + 1) * Math.sqrt(3)/2 * units # row = 0
       #  (1 + 1) * Math.sqrt(3)/2 * units # row = 1
       #  (2 + 1) * Math.sqrt(3)/2 * units # row = 2
       def bottom_y
-        y + (row + 1) * Math.sqrt(3)/2 * units
+        (row + 1) * Math.sqrt(3)/2 * units
       end
 
       #  (0 * -1 + 3) * 0.5 * units # row 0
@@ -67,7 +73,7 @@ module GridGenerator
       #  (2 * -1 + 3) * 0.5 * units + (1 - 1) * 0.5 * units # row 2, col = 1
       #  (2 * -1 + 3) * 0.5 * units + (3 - 1) * 0.5 * units # row 2, col = 3 
       def odd_top_left_x
-        x + (row * -1 + size) * 0.5 * units + (col - 1) * 0.5 * units
+        (row * -1 + size) * 0.5 * units + (col - 1) * 0.5 * units
       end
 
       # ((0 * -1) + 3 + 2) * 0.5 * units + (1 - 1) * 0.5 * units # row 0, col = 1
@@ -75,7 +81,7 @@ module GridGenerator
       # ((2 * -1) + 3 + 2) * 0.5 * units + (1 - 1) * 0.5 * units # row 2, col = 1
       # ((2 * -1) + 3 + 2) * 0.5 * units + (3 - 1) * 0.5 * units # row 2, col = 3 
       def odd_top_right_x
-        x + (row * -1 + size + 2) * 0.5 * units + (col - 1) * 0.5 * units 
+        (row * -1 + size + 2) * 0.5 * units + (col - 1) * 0.5 * units
       end
 
       #  (0 * -1 + 3 + 1) * 0.5 * units + (1 - 1) * 0.5 * units # row 0, col = 1
@@ -83,7 +89,7 @@ module GridGenerator
       #  (2 * -1 + 3 + 1) * 0.5 * units + (1 - 1) * 0.5 * units # row 2, col = 1
       #  (2 * -1 + 3 + 1) * 0.5 * units + (3 - 1) * 0.5 * units # row 2, col = 3
       def odd_bottom_x
-        x + (row * -1 + size + 1) * 0.5 * units + (col - 1) * 0.5 * units
+        (row * -1 + size + 1) * 0.5 * units + (col - 1) * 0.5 * units
       end
 
       def even_points
@@ -103,10 +109,10 @@ module GridGenerator
       end
 
       def points
-        if col % 2 == 0
-          even_points
-        else
-          odd_points
+        all_points = col % 2 == 0 ? even_points : odd_points
+        all_points.map do |point|
+          scaled = scaler.scale(point)
+          rotator.rotate(scaled) + offset
         end
       end
 

data/lib/grid_generator/rotator.rb

@@ -0,0 +1,19 @@
+module GridGenerator
+  class Rotator
+    def initialize(angle:, rotation_point:)
+      @angle = angle 
+      @matrix = Matrix[
+        [Math.cos(angle), -1*Math.sin(angle)],
+        [Math.sin(angle), Math.cos(angle)]
+      ]
+      @rotation_point = rotation_point
+    end
+
+    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 
+    end
+  end
+end

data/lib/grid_generator/scaler.rb

@@ -0,0 +1,18 @@
+module GridGenerator
+  class Scaler
+    def initialize(horizontal_scale: 1, vertical_scale: 1)
+      @horizontal_scale = horizontal_scale
+      @vertical_scale = vertical_scale
+      @matrix = Matrix[
+        [horizontal_scale,0],
+        [0,vertical_scale]
+      ]
+    end
+
+    attr_reader :horizontal_scale, :vertical_scale, :matrix
+
+    def scale(point)
+      matrix * point
+    end
+  end
+end

data/lib/grid_generator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -65,6 +65,8 @@ files:
 - lib/grid_generator/pyraminx/grid.rb
 - lib/grid_generator/pyraminx/triangle_factory.rb
 - lib/grid_generator/pyraminx/triangle_factory_v1.rb
+- lib/grid_generator/rotator.rb
+- lib/grid_generator/scaler.rb
 - lib/grid_generator/skewb/left_element_factory.rb
 - lib/grid_generator/skewb/left_skewb_grid.rb
 - lib/grid_generator/skewb/right_element_factory.rb