grid_generator 0.2.9 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c33e9c431f4c4150d7c1c5290b62fe5affad86f9bc8bff8270af5ba6afcb0be0
-  data.tar.gz: 612becd6432cb6009d7d23aecd834a7b4d7cd0f5bca2623a81ac31bda0d83885
+  metadata.gz: 4b4decfd16c0f0358a935123fed5fb0a190d2379d14a37b83e2f0c958d41a624
+  data.tar.gz: 50883416a3a299e9ea384b14777eef77d1767ffb22ff11b7449fb1d79f6c8bae
 SHA512:
-  metadata.gz: bc79e92443cc6d6eb1d7215ea519fdfeb93d12f7532b061e2d5f3fb3ca605d7961546d3e02a8687cbcb1a538036b54ecb42a133875b5a849df38f2f6ff203bc3
-  data.tar.gz: cc9b3660c6b3cb0a8043ecae38fcc91982989eddb09a664cb56ae0b980e327444929412bc239acc26d326c6ed2668acc8d69f97ed01589521418da4bb75fce92
+  metadata.gz: 4a35b02c742ec97e40f5b674232ab528b00fe7ee401ae47340b1bc0539e29cd3c75e2bfa31349dc9a66a3b6e51da3d59209f3aebbf1d06423b168aea0343e083
+  data.tar.gz: 12e781e8a1d8c0b125b4395a0bdf20b29636a632f2a4b288226f718a6ddac223756db2a06a078797f2dbaf0ec786673c126da1e4fdea780cb29acc6bd3f28f13

data/Gemfile.lock

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

data/lib/grid_generator/cubic/bordered_grid.rb

@@ -1,3 +1,5 @@
+require 'matrix'
+require_relative '../line'
 require_relative '../face_parser'
 require_relative 'facing_square_factory'
 
@@ -73,23 +75,33 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          GridGenerator::BaseLine.new(
-            x1: x,
-            y1: unit_y(i+1),
-            x2: max_x,
-            y2: unit_y(i+1)
-          ) 
+          a = Matrix.column_vector([
+            x,
+            unit_y(i+1),
+          ])
+
+          b = Matrix.column_vector([
+            max_x,
+            unit_y(i+1)
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          GridGenerator::BaseLine.new(
-            x1: unit_x(i+1),
-            y1: y,
-            x2: unit_x(i+1),
-            y2: max_y
-          ) 
+          a = Matrix.column_vector([
+            unit_x(i+1),
+            y,
+          ])
+
+          b = Matrix.column_vector([
+            unit_x(i+1),
+            max_y
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   

data/lib/grid_generator/cubic/facing_grid.rb

@@ -1,5 +1,6 @@
+require 'matrix'
 require_relative '../face_parser'
-require_relative '../base_line'
+require_relative '../line'
 require_relative 'facing_square_factory'
 
 module GridGenerator
@@ -54,23 +55,33 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x,
-            y1: unit_y(i+1),
-            x2: max_x,
-            y2: unit_y(i+1)
-          ) 
+          a = Matrix.column_vector([
+            x,
+            unit_y(i+1),
+          ])
+
+          b = Matrix.column_vector([
+            max_x,
+            unit_y(i+1)
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          GridGenerator::BaseLine.new(
-            x1: unit_x(i+1),
-            y1: y,
-            x2: unit_x(i+1),
-            y2: max_y
-          ) 
+          a = Matrix.column_vector([
+            unit_x(i+1),
+            y,
+          ])
+
+          b = Matrix.column_vector([
+            unit_x(i+1),
+            max_y
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   

data/lib/grid_generator/cubic/grid.rb

@@ -1,5 +1,5 @@
 require 'matrix'
-require_relative '../base_line'
+require_relative '../line'
 
 module GridGenerator
   module Cubic
@@ -93,23 +93,33 @@ module GridGenerator
   
       def rows
         Array.new(height) do |i|
-          GridGenerator::BaseLine.new(
-            x1: row_line_start(i+1)[0,0],
-            y1: row_line_start(i+1)[1,0],
-            x2: row_line_end(i+1)[0,0],
-            y2: row_line_end(i+1)[1,0]
-          )
+          a = Matrix.column_vector([
+            row_line_start(i+1)[0,0],
+            row_line_start(i+1)[1,0],
+          ])
+
+          b = Matrix.column_vector([
+            row_line_end(i+1)[0,0],
+            row_line_end(i+1)[1,0]
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   
       def columns 
         Array.new(width) do |i|
-          GridGenerator::BaseLine.new(
-            x1: column_line_start(i+1)[0,0],
-            y1: column_line_start(i+1)[1,0],
-            x2: column_line_end(i+1)[0,0],
-            y2: column_line_end(i+1)[1,0]
-          )
+          a = Matrix.column_vector([
+            column_line_start(i+1)[0,0],
+            column_line_start(i+1)[1,0],
+          ])
+
+          b = Matrix.column_vector([
+            column_line_end(i+1)[0,0],
+            column_line_end(i+1)[1,0]
+          ])
+
+          GridGenerator::Line.new(a: a, b: b)
         end
       end
   

data/lib/grid_generator/line.rb

@@ -0,0 +1,42 @@
+module GridGenerator
+  class Line
+    def initialize(a:, b:)
+      @a, @b = a, b
+    end
+
+    attr_reader :a, :b
+
+    def ==(other)
+      self.class == other.class &&
+        self.a == other.a &&
+        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
+
+    def y1
+      a[1,0]
+    end
+
+    def x2
+      b[0,0]
+    end
+
+    def y2
+      b[1,0]
+    end
+  end
+end
+

data/lib/grid_generator/megaminx/face_projection.rb

@@ -1,6 +1,7 @@
 require 'matrix'
 require_relative '../rotator'
 require_relative '../helper'
+require_relative '../line'
 
 module GridGenerator
   module Megaminx
@@ -86,23 +87,17 @@ module GridGenerator
         ]
       end
 
-      # for svg 
-      def connecting_lines
-        pentagon_points.each_with_index.map do |p, i|
-          d = decagon_points[i*2]
-          offset_p = p + offset
-          offset_d = d + offset
-          GridGenerator::BaseLine.new(
-            x1: offset_p[0,0],
-            y1: offset_p[1,0],
-            x2: offset_d[0,0],
-            y2: offset_d[1,0]
-          )
-        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]
@@ -112,15 +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::BaseLine.new(
-            x1: line_start[0,0],
-            y1: line_start[1,0],
-            x2: line_end[0,0],
-            y2: line_end[1,0]
-          )
+      # 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
 
@@ -135,15 +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::BaseLine.new(
-            x1: line_start[0,0],
-            y1: line_start[1,0],
-            x2: line_end[0,0],
-            y2: line_end[1,0]
-          )
+          GridGenerator::Line.new(a: ab_intervals[-1], b: cd_intervals[0]) + offset
         end
       end
 

data/lib/grid_generator/pyraminx/face.rb

@@ -1,6 +1,7 @@
 require_relative 'triangle_factory'
 require_relative '../rotator'
 require_relative '../scaler'
+require_relative '../line'
 
 module GridGenerator
   module Pyraminx
@@ -78,12 +79,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::BaseLine.new( 
-            x1: transformed_1[0,0],
-            y1: transformed_1[1,0],
-            x2: transformed_2[0,0],
-            y2: transformed_2[1,0]
-          )
+          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
         end
       end
 
@@ -112,12 +108,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::BaseLine.new( 
-            x1: transformed_1[0,0],
-            y1: transformed_1[1,0],
-            x2: transformed_2[0,0],
-            y2: transformed_2[1,0]
-          )
+          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
         end
       end
 
@@ -146,12 +137,7 @@ module GridGenerator
           transformed_1 = rotator.rotate(scaled_1) + offset
           transformed_2 = rotator.rotate(scaled_2) + offset
 
-          GridGenerator::BaseLine.new( 
-            x1: transformed_1[0,0],
-            y1: transformed_1[1,0],
-            x2: transformed_2[0,0],
-            y2: transformed_2[1,0]
-          )
+          GridGenerator::Line.new(a: transformed_1, b: transformed_2) 
         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/skewb/left_skewb_grid.rb

@@ -1,4 +1,4 @@
-require_relative '../base_line'
+require_relative '../line'
 require_relative 'skewb_grid'
 require_relative 'left_element_factory'
 
@@ -20,23 +20,33 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (2*i)*units,
-            y1: y + (3*i+2)*units,
-            x2: x + (2*i+2)*units,
-            y2: y + (3*i+1)*units
-          ) 
+          a = Matrix.column_vector([
+            x + (2*i)*units,
+            y + (3*i+2)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (2*i+2)*units,
+            y + (3*i+1)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (2*i)*units,
-            y1: y + (-1*i+2)*units,
-            x2: x + (i+1)*2*units,
-            y2: y + (-1*i+5)*units
-          ) 
+          a = Matrix.column_vector([
+            x + (2*i)*units,
+            y + (-1*i+2)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (i+1)*2*units,
+            y + (-1*i+5)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
     end

data/lib/grid_generator/skewb/right_skewb_grid.rb

@@ -1,3 +1,4 @@
+require_relative '../line'
 require_relative '../base_element'
 require_relative 'skewb_grid.rb'
 require_relative 'right_element_factory.rb'
@@ -20,23 +21,33 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (2*i)*units,
-            y1: y + (i+4)*units,
-            x2: x + (2*i+2)*units,
-            y2: y + (i+1)*units
-          ) 
+          a = Matrix.column_vector([
+            x + (2*i)*units,
+            y + (i+4)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (2*i+2)*units,
+            y + (i+1)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (2*i)*units,
-            y1: y + (-3*i+4)*units,
-            x2: x + (i+1)*2*units,
-            y2: y + (-3*i+5)*units
-          ) 
+          a = Matrix.column_vector([
+            x + (2*i)*units,
+            y + (-3*i+4)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (i+1)*2*units,
+            y + (-3*i+5)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
     end

data/lib/grid_generator/skewb/top_skewb_grid.rb

@@ -1,3 +1,4 @@
+require_relative '../line'
 require_relative '../base_element'
 require_relative 'skewb_grid'
 require_relative 'top_element_factory'
@@ -20,23 +21,33 @@ module GridGenerator
   
       def rows
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + 2*units,
-            y1: y + (2*i+1)*units,
-            x2: x + 6*units,
-            y2: y + (2*i+1)*units
-          ) 
+          a = Matrix.column_vector([
+            x + 2*units,
+            y + (2*i+1)*units,
+          ])
+
+          b = Matrix.column_vector([
+            x + 6*units,
+            y + (2*i+1)*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
   
       def columns
         Array.new(side_size) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x + (4*i+2)*units,
-            y1: y + units,
-            x2: x + (4*i+2)*units,
-            y2: y + 3*units
-          ) 
+          a = Matrix.column_vector([
+            x + (4*i+2)*units,
+            y + units,
+          ])
+
+          b = Matrix.column_vector([
+            x + (4*i+2)*units,
+            y + 3*units
+          ])
+
+          GridGenerator::Line.new(a: a, b: b) 
         end
       end
     end

data/lib/grid_generator/square_one/face.rb

@@ -1,4 +1,4 @@
-require_relative '../base_line'
+require_relative '../line'
 require_relative '../square_one_face_parser'
 require_relative 'element_factory'
 
@@ -42,21 +42,31 @@ module GridGenerator
       end
   
       def forward_axis
-        GridGenerator::BaseLine.new( 
-          x1: x+half_face_size+half_edge_width,
-          y1: y,
-          x2: x+half_face_size-half_edge_width,
-          y2: y+face_size
-        ) 
+        a = Matrix.column_vector([
+          x+half_face_size+half_edge_width,
+          y,
+        ])
+
+        b = Matrix.column_vector([
+          x+half_face_size-half_edge_width,
+          y+face_size
+        ])
+
+        GridGenerator::Line.new(a: a, b: b) 
       end
   
       def back_axis
-        GridGenerator::BaseLine.new( 
-          x1: x+half_face_size-half_edge_width,
-          y1: y,
-          x2: x+half_face_size+half_edge_width,
-          y2: y+face_size
-        ) 
+        a = Matrix.column_vector([
+          x+half_face_size-half_edge_width,
+          y,
+        ])
+
+        b = Matrix.column_vector([
+          x+half_face_size+half_edge_width,
+          y+face_size
+        ])
+
+        GridGenerator::Line.new(a: a, b: b) 
       end
   
       def element_shapes

data/lib/grid_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GridGenerator
-  VERSION = "0.2.9"
+  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.9
+  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
@@ -46,7 +46,6 @@ files:
 - lib/grid_generator/arrows/horizontal_arrow.rb
 - lib/grid_generator/arrows/vertical_arrow.rb
 - lib/grid_generator/base_element.rb
-- lib/grid_generator/base_line.rb
 - lib/grid_generator/cubic/bordered_grid.rb
 - lib/grid_generator/cubic/facing_grid.rb
 - lib/grid_generator/cubic/facing_square_factory.rb
@@ -59,6 +58,7 @@ files:
 - lib/grid_generator/cubic/units_factory.rb
 - lib/grid_generator/face_parser.rb
 - lib/grid_generator/helper.rb
+- lib/grid_generator/line.rb
 - lib/grid_generator/megaminx/common.rb
 - lib/grid_generator/megaminx/element_factory.rb
 - lib/grid_generator/megaminx/face.rb

data/lib/grid_generator/base_line.rb

@@ -1,26 +0,0 @@
-module GridGenerator
-  class BaseLine
-    def initialize(x1:, y1:, x2:, y2:)
-      @x1, @y1 = x1, y1
-      @x2, @y2 = x2, y2
-    end
-
-    attr_reader :x1, :y1, :x2, :y2
-
-    def ==(other)
-      self.x1 == other.x1 &&
-        self.y1 == other.y1 &&
-        self.x2 == other.x2 &&
-        self.y2 == other.y2
-    end
-
-    def as_json
-      {
-        "x1" => x1,
-        "y1" => y1,
-        "x2" => x2,
-        "y2" => y2
-      }
-    end
-  end
-end