grid_generator 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53cfa7a917357eed8d38db20a347c57cf2c8ac2a2dfe57a829fa7ba6eb8e7cf8
-  data.tar.gz: 837b371e56a485e84b9a1ab789286fb0ee4a8e66ff08209cacb1b113e54a8228
+  metadata.gz: 2668c9e2f64e3edc746fcc14a722c999fc4700a7835f472f3e661d6157c951d8
+  data.tar.gz: a9ee5d5b9ded2773be2bbb82caccc53258b0be5b9e01dba5e65cfcc74e53374a
 SHA512:
-  metadata.gz: 52a24b3bc799e624491112b526db58e9fcdc40bc34f8e3bae0d12339dbd13a724066b4a765b00d2a1087e66451ed0cf0ef9fe492b617e2fb658a2578f9c861b6
-  data.tar.gz: dd3ed5081f293a61691ab6fdcd123827db7715dbe6a330643ef7f24a433e8136560125d30ee6444746c1397684b428490ac6a8766756815b87f23d3f4c88a4c6
+  metadata.gz: 386ee6bc5bb324d0a986429f95e071df54c87dfaa58294007f54733256bb23c22b59d894e04c4e446b97536ad2e2d2a53edf3ad45f800c230996f022ed5f8bc2
+  data.tar.gz: 77d2e5859f4548e5c93c9d341ad947dfb6966940935edbc548b544070ef9e668818ea9019734e9597420870a58c07626c6e4dba55d0da0ad849b7bed62c8adde

data/Gemfile.lock

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

data/lib/grid_generator/helper.rb

@@ -0,0 +1,8 @@
+module GridGenerator
+  module Helper
+    def distance(a, b)
+      Math.sqrt((b[0,0] - a[0,0])**2 + (b[1,0] - a[1,0])**2)
+    end
+  end
+end
+

data/lib/grid_generator/megaminx/face_projection.rb

@@ -0,0 +1,106 @@
+require 'matrix'
+require '../rotator'
+require '../helper'
+
+module GridGenerator
+  module Megaminx
+    class FaceProjection
+      # units 30 - pentagon 90 - megaminx - 150
+      # units * 5 
+      #       *****
+      #        *** 
+      #        ***
+      #        
+      #  ***   ***   ***
+      #  ***   ***   ***
+      # ***** ***** *****
+      #
+      #    ***** *****
+      #     ***   ***
+      #     ***   ***
+      def initialize(x:, y:, units:, elements: [])
+        @x, @y = x, y
+        @units = units
+        @elements = elements
+      end
+
+      attr_reader :x, :y, :units, :elements
+
+      def offset
+        @offset ||= Matrix.column_vector([x, y])
+      end
+
+      def decagon_radius
+        5 * units
+      end
+
+      def decagon_top_point
+        Matrix.column_vector([
+          0,
+          decagon_radius
+        ])
+      end
+
+      def rotation_point
+        Matrix.column_vector([
+          decagon_radius,
+          decagon_radius
+        ])
+      end
+
+      def decagon_points
+        @decagon_points ||= (0..9).map do |i|
+          angle = 2.0 * Math::PI * i / 10.0
+          rotator = GridGenerator::Rotator.new(angle: angle, rotation_point: rotation_point)    
+          rotator.rotate(top_point)
+        end
+      end
+
+      # also equal to pentagon radius
+      def decagon_side_length 
+        @decagon_side_length ||= GridGenerator::Helper.distance(decagon_points[0], decagon_points[1])
+      end
+
+      def pentagon_top_point
+        @pentagon_top_point ||= Matrix.column_vector([
+          decagon_radius,
+          decagon_radius - decagon_side_length 
+        ])
+      end
+
+      def pentagon_points 
+        @pentagon_points ||= (0..4).map do |i|
+          angle = 2.0 * Math::PI * i / 5.0
+          rotator = GridGenerator::Rotator.new(angle: angle, rotation_point: rotation_point)    
+          rotator.rotate(top_point)
+        end
+      end
+
+      # for svg 
+      def connecting_lines
+        @connecting_lines ||= pentagon_points.map_with_index do |p, i|
+          d = decagon_point[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_p[1,0]
+          )
+        end
+      end
+
+      # for svg
+      def decagon_points_string
+        decagon_points.map { |p| 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(' ')
+      end
+    end
+  end
+end
+

data/lib/grid_generator/megaminx/front_face.rb

@@ -0,0 +1,12 @@
+class GridGenerator
+  module Megaminx
+    class FrontFace
+      def (x:, y:, units:, elements:)
+        @x, @y = x, y
+        @units = units
+        @elements = elements
+      end
+
+    end
+  end
+end

data/lib/grid_generator/pyraminx/face.rb

@@ -1,5 +1,6 @@
 require_relative 'triangle_factory'
 require_relative '../rotator'
+require_relative '../scaler'
 
 module GridGenerator
   module Pyraminx
@@ -7,14 +8,15 @@ module GridGenerator
     # * * *
     # * * * * * 
     class Face
-      def initialize(x:, y:, units:, elements:, rotation_angle: 0)
+      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, :rotation_angle
+      attr_reader :x, :y, :units, :elements, :vertical_scale, :rotation_angle
 
       def size
         elements.size
@@ -35,6 +37,10 @@ module GridGenerator
         @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
@@ -66,8 +72,11 @@ module GridGenerator
           point_1 = vertical_start_point_for_row(i)
           point_2 = vertical_end_point_for_row(i)
 
-          transformed_1 = rotator.rotate(point_1) + offset
-          transformed_2 = rotator.rotate(point_2) + offset
+          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: transformed_1[0,0],
@@ -97,8 +106,11 @@ module GridGenerator
           point_1 = diagonal_down_start_point_for_row(i)
           point_2 = diagonal_down_end_point_for_row(i)
 
-          transformed_1 = rotator.rotate(point_1) + offset
-          transformed_2 = rotator.rotate(point_2) + offset
+          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: transformed_1[0,0],
@@ -128,8 +140,11 @@ module GridGenerator
           point_1 = diagonal_up_start_point_for_row(i)
           point_2 = diagonal_up_end_point_for_row(i)
 
-          transformed_1 = rotator.rotate(point_1) + offset
-          transformed_2 = rotator.rotate(point_2) + offset
+          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: transformed_1[0,0],
@@ -163,7 +178,8 @@ module GridGenerator
 
       def points
         [ top, bottom_left, bottom_right ].map do |point|
-          rotator.rotate(point) + offset
+          scaled = scaler.scale(point)
+          rotator.rotate(scaled) + offset
         end
       end
 
@@ -182,7 +198,8 @@ module GridGenerator
               units: units,
               size: size,
               face: col,
-              rotator: rotator
+              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:, rotator:)
+      def initialize(x:, y:, row:, col:, units:, size:, face:, rotator:, scaler:)
         @x, @y = x, y
         @row = row
         @col = col
@@ -14,9 +14,10 @@ module GridGenerator
         @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, :rotator
+      attr_reader :x, :y, :row, :col, :units, :size, :colour, :opacity, :rotator, :scaler
 
       def offset
         Matrix.column_vector([x, y])
@@ -110,7 +111,8 @@ module GridGenerator
       def points
         all_points = col % 2 == 0 ? even_points : odd_points
         all_points.map do |point|
-          rotator.rotate(point) + offset
+          scaled = scaler.scale(point)
+          rotator.rotate(scaled) + offset
         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.11"
+  VERSION = "0.2.0"
 end

data/lib/grid_generator.rb

@@ -87,5 +87,9 @@ module GridGenerator
   def self.megaminx_face(args)
     Megaminx::Face.new(**args)
   end
+
+  def self.megaminx_face_projection(args)
+    Megaminx::FaceProjection.new(**args)
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -58,14 +58,16 @@ files:
 - lib/grid_generator/cubic/top_grid.rb
 - lib/grid_generator/cubic/units_factory.rb
 - lib/grid_generator/face_parser.rb
+- lib/grid_generator/helper.rb
 - lib/grid_generator/megaminx/common.rb
 - lib/grid_generator/megaminx/element_factory.rb
 - lib/grid_generator/megaminx/face.rb
+- lib/grid_generator/megaminx/face_projection.rb
+- lib/grid_generator/megaminx/front_face.rb
 - lib/grid_generator/pyraminx/face.rb
-- 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
@@ -76,7 +78,6 @@ files:
 - lib/grid_generator/square_one/element_factory.rb
 - lib/grid_generator/square_one/face.rb
 - lib/grid_generator/square_one_face_parser.rb
-- lib/grid_generator/transformation.rb
 - lib/grid_generator/version.rb
 - sig/grid_generator.rbs
 homepage: https://github.com/mrlhumphreys/grid_generator

data/lib/grid_generator/pyraminx/grid.rb

@@ -1,84 +0,0 @@
-require_relative '../base_line'
-require_relative 'triangle_factory_v1'
-
-module GridGenerator
-  module Pyraminx
-    class Grid 
-      def initialize(x: ,y:, size: ,units: ,elements:)
-        @x, @y = x, y
-        @size = size
-        @units = units
-        @elements = elements
-      end
-    
-      attr_reader :x, :y, :size, :units, :elements
-    
-      def shape_points
-        [
-          [ x+size*units, y ],
-          [ x+2*size*units, y+size*units ],
-          [ x+size*units, y+2*size*units ],
-          [ x, y+size*units ]
-        ]
-      end
-    
-      def shape_points_string
-        shape_points.map { |x,y| [x,y].join(',') }.join(' ')
-      end
-    
-      def vertical_line_points
-        Array.new((2*size)-1) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x+((i+1)-size).abs*units, 
-            y1: y+(i+1)*units,  
-            x2: x+((((i+1)-size).abs*-1)+2*size)*units,
-            y2: y+(i+1)*units 
-          ) 
-        end
-      end
-    
-      def diagonal_down_line_points
-        Array.new(size-1) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x+((i-1).abs + 1)*units,
-            y1: y+(i+1)*units,
-            x2: x+((i-1).abs + 1 + size)*units,
-            y2: y+(i+1+size)*units
-          ) 
-        end
-      end
-    
-      def diagonal_up_line_points
-        Array.new(size-1) do |i|
-          GridGenerator::BaseLine.new( 
-            x1: x+(i+1)*units,
-            y1: y+(i+1+size)*units,
-            x2: x+(i+1+size)*units,
-            y2: y+(i+1)*units
-          ) 
-        end
-      end
-    
-      def element_shapes
-        elements.map do |row|
-          row.map do |element|
-            if element 
-              GridGenerator::Pyraminx::TriangleFactoryV1.new(x: x, y: y, units: units, direction: element[:direction], colour: element[:colour], opacity: element[:opacity]).build
-            else
-              nil
-            end
-          end
-        end.flatten.compact
-      end
-
-      def as_json
-        {
-          "vertical_line_points" => vertical_line_points,
-          "diagonal_down_line_points" => diagonal_down_line_points,
-          "diagonal_up_line_points" => diagonal_up_line_points,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
-      end
-    end
-  end
-end

data/lib/grid_generator/pyraminx/triangle_factory_v1.rb

@@ -1,45 +0,0 @@
-require_relative '../base_element'
-
-module GridGenerator
-  module Pyraminx
-    class TriangleFactoryV1
-      def initialize(x:, y:, units:, direction:, colour:, opacity:)
-        @x, @y = x, y
-        @units = units
-        @direction = direction
-        @colour = colour
-        @opacity = opacity
-      end
-
-      attr_reader :x, :y, :units, :direction, :colour, :opacity
-
-      def up_points
-        [
-          Matrix.column_vector([ x+units, y ]),
-          Matrix.column_vector([ x+2*units, y+units ]),
-          Matrix.column_vector([ x, y+units ])
-        ]
-      end
-
-      def down_points
-        [
-          Matrix.column_vector([ x+units, y+units ]),
-          Matrix.column_vector([ x+2*units, y ]),
-          Matrix.column_vector([ x, y ])
-        ]
-      end
-
-      def points
-        if direction == :up
-          up_points
-        else
-          down_points
-        end
-      end
-      
-      def build
-        GridGenerator::BaseElement.new(points: points, colour: colour, opacity: opacity)
-      end
-    end
-  end
-end

data/lib/grid_generator/transformation.rb

@@ -1,5 +0,0 @@
-module GridGenerator
-  class Transformation
-
-  end
-end