grid_generator 0.5.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11c0a7be05f3d64ebbf4a9280d08523a43ba8fb1e0591a865a8cc7cfdd9cd017
-  data.tar.gz: 6312025ad36904f7ad8ffe078d74a1ea08dca518f1082ed7711b51fdf052972f
+  metadata.gz: 4944667761bfba0b07a3b0006f4e701f2da552fa4c0417c6fd4006dc9b86168d
+  data.tar.gz: d846a3acfe6ad43a0820c354f2f987d26b2039c28596d14d117bf8d6138db9c3
 SHA512:
-  metadata.gz: 6397a82b5bb9a173b95ca5ba30ecdfdaf5d5573b70a82e51694019fc59e54bab5d2d02fed4da30f64ea9e20d03f0a46ee666ac6f5f1da370d953790f0b1c596b
-  data.tar.gz: f0f1a7576c2e202e80a7e0979ba2ea919412261bc9cc79bda8374e77cc30a40d47a3cfbfa42dab359028d75b6398538ae5afc2f55bf2f00efa9a7a7c6377b3db
+  metadata.gz: 8ab4cf6858257bde00b2602d002f73e302c0ce45adf9500c3de79abf49738081b25c6fc640d38616533e5552f28c76fc139228afff58591f8406a1b5a026a2bd
+  data.tar.gz: 18653cac4a61a0ac31c4c2a04469eb5622d1a967af0154f79728fba30be0ae35228fd30aea0be5eb6bfb9bd69696eae9c0299a50d1346bd5154d6618af0134cd

data/Gemfile.lock

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

data/lib/grid_generator/rex_cube/element_factory.rb

@@ -0,0 +1,120 @@
+require 'matrix'
+require_relative '../svg/style'
+require_relative '../svg/path'
+require_relative '../svg/move_command'
+require_relative '../svg/line_command'
+require_relative '../svg/quadratic_command'
+require_relative '../svg/close_command'
+
+module GridGenerator
+  module RexCube 
+    class ElementFactory
+      def initialize(grid_x:, grid_y:, row_num:, col_num:, units:, colour:, opacity:)
+        @grid_x, @grid_y = grid_x, grid_y
+        @row_num, @col_num = row_num, col_num
+        @units =  units
+        @colour, @opacity = colour, opacity
+      end
+
+      attr_reader :grid_x, :grid_y, :row_num, :col_num, :units, :colour, :opacity
+
+      def offset
+        @offset ||= Matrix.column_vector([grid_x, grid_y])
+      end
+
+      def anchors
+        {}
+      end
+
+      def commands 
+        case [row_num, col_num]
+        when [0, 0] # Top Edge 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_left_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:top_right_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_top]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:top_left_corner]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [1, 0] # Top Left Petal 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_left_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_top]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_left]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [1, 1] # Top Right Petal 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_right_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_right]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_top]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:top_right_corner]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [2, 0] # Left Edge 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_left_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_left]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_left_corner]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [2, 1] # Center 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:center_top]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_right]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_bottom]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_left]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [2, 2] # Right Edge 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_right_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_left_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_right]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:top_right_corner]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [3, 0] # Bottom Left Petal 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:center_left]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_bottom]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_left_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_left]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [3, 1] # Bottom Right Petal 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:center_right]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_right_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_bottom]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [4, 0] # Bottom Edge 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:center_bottom]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_right_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_left_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:center_bottom]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        else
+          [] 
+        end
+      end
+
+      def style
+        GridGenerator::Svg::Style.new(fill: colour, opacity: opacity)
+      end
+
+      def d
+        commands.map do |c| 
+          (c + offset) 
+        end
+      end
+
+      def build
+        GridGenerator::Svg::Path.new(d: d, style: style)
+      end
+    end
+  end
+end

data/lib/grid_generator/rex_cube/grid.rb

@@ -0,0 +1,56 @@
+require_relative '../face_parser'
+
+module GridGenerator
+  module RexCube 
+    class Grid
+      def initialize(x:, y:, units: , elements: )
+        @x, @y = x, y
+        @units = units
+        @elements = case elements
+                    when String
+                      FaceParser.new(elements).parse
+                    when Array
+                      elements
+                    else
+                      raise ArgumentError, "elements must be array or string"
+                    end
+      end
+
+      attr_reader :x, :y, :units, :elements
+
+      def to_svg
+        output = ''
+
+        element_shapes.each { |element| output += element.to_svg if element }
+
+        output
+      end
+
+      private
+
+      def build_element(row_num, col_num, data)
+        if data
+          element_factory_class.new(
+            grid_x: x,
+            grid_y: y,
+            row_num: row_num,
+            col_num: col_num,
+            units: units,
+            colour: data[:colour],
+            opacity: data[:opacity]
+          ).build
+        else
+          nil
+        end
+      end
+
+      def element_shapes
+        elements.each_with_index.map do |row, row_num|
+          row.each_with_index.map do |col, col_num|
+            build_element(row_num, col_num, col)
+          end
+        end.flatten.compact
+      end
+    end
+  end
+end

data/lib/grid_generator/rex_cube/left_element_factory.rb

@@ -0,0 +1,21 @@
+require_relative './element_factory'
+
+module GridGenerator
+  module RexCube 
+    class LeftElementFactory < ElementFactory
+      def anchors
+        @anchors ||= {
+          top_left_corner: Matrix.column_vector([0, 0]),
+          top_right_corner: Matrix.column_vector([3*units, 1.5*units]),
+          bottom_left_corner: Matrix.column_vector([0, 3*units]),
+          bottom_right_corner: Matrix.column_vector([3*units, 4.5*units]),
+
+          center_top: Matrix.column_vector([1.5*units, 2.25*units]),
+          center_right: Matrix.column_vector([2*units, 2.5*units]),
+          center_bottom: Matrix.column_vector([1.5*units, 3.25*units]),
+          center_left: Matrix.column_vector([1*units, 2*units])
+        }
+      end
+    end
+  end
+end

data/lib/grid_generator/rex_cube/left_grid.rb

@@ -0,0 +1,13 @@
+require_relative '../face_parser'
+require_relative './grid'
+require_relative './left_element_factory'
+
+module GridGenerator
+  module RexCube 
+    class LeftGrid < Grid
+      def element_factory_class
+        LeftElementFactory
+      end
+    end
+  end
+end

data/lib/grid_generator/rex_cube/right_element_factory.rb

@@ -0,0 +1,21 @@
+require_relative './element_factory'
+
+module GridGenerator
+  module RexCube 
+    class RightElementFactory < ElementFactory
+      def anchors
+        @anchors ||= {
+          top_left_corner: Matrix.column_vector([0, 1.5*units]),
+          top_right_corner: Matrix.column_vector([3*units, 0]),
+          bottom_left_corner: Matrix.column_vector([0, 4.5*units]),
+          bottom_right_corner: Matrix.column_vector([3*units, 3*units]),
+
+          center_top: Matrix.column_vector([1.5*units, 2.25*units]),
+          center_right: Matrix.column_vector([2*units, 2*units]),
+          center_bottom: Matrix.column_vector([1.5*units, 3.25*units]),
+          center_left: Matrix.column_vector([1*units, 2.5*units])
+        }
+      end
+    end
+  end
+end

data/lib/grid_generator/rex_cube/right_grid.rb

@@ -0,0 +1,13 @@
+require_relative '../face_parser'
+require_relative './grid'
+require_relative './right_element_factory'
+
+module GridGenerator
+  module RexCube 
+    class RightGrid < Grid
+      def element_factory_class
+        RightElementFactory
+      end
+    end
+  end
+end

data/lib/grid_generator/rex_cube/top_element_factory.rb

@@ -0,0 +1,21 @@
+require_relative './element_factory'
+
+module GridGenerator
+  module RexCube 
+    class TopElementFactory < ElementFactory
+      def anchors
+        @anchors ||= {
+          top_left_corner: Matrix.column_vector([3*units, 0*units]),
+          top_right_corner: Matrix.column_vector([6*units, 1.5*units]),
+          bottom_left_corner: Matrix.column_vector([0, 1.5*units]),
+          bottom_right_corner: Matrix.column_vector([3*units, 3*units]),
+
+          center_top: Matrix.column_vector([3.5*units, 1.25*units]),
+          center_right: Matrix.column_vector([3.5*units, 1.75*units]),
+          center_bottom: Matrix.column_vector([2.5*units, 1.75*units]),
+          center_left: Matrix.column_vector([2.5*units, 1.25*units])
+        }
+      end
+    end
+  end
+end

data/lib/grid_generator/rex_cube/top_grid.rb

@@ -0,0 +1,13 @@
+require_relative '../face_parser'
+require_relative './grid'
+require_relative './top_element_factory'
+
+module GridGenerator
+  module RexCube 
+    class TopGrid < Grid
+      def element_factory_class
+        TopElementFactory
+      end
+    end
+  end
+end

data/lib/grid_generator/skewb/{left_skewb_grid.rb → left_grid.rb}

@@ -4,7 +4,7 @@ require_relative 'left_element_factory'
 
 module GridGenerator
   module Skewb
-    class LeftSkewbGrid < Skewb::SkewbGrid
+    class LeftGrid < Skewb::SkewbGrid
       def factory_class
         GridGenerator::Skewb::LeftElementFactory
       end

data/lib/grid_generator/skewb/{right_skewb_grid.rb → right_grid.rb}

@@ -5,7 +5,7 @@ require_relative 'right_element_factory.rb'
 
 module GridGenerator
   module Skewb
-    class RightSkewbGrid < Skewb::SkewbGrid
+    class RightGrid < Skewb::SkewbGrid
       def factory_class
         GridGenerator::Skewb::RightElementFactory
       end

data/lib/grid_generator/skewb/{top_skewb_grid.rb → top_grid.rb}

@@ -5,7 +5,7 @@ require_relative 'top_element_factory'
 
 module GridGenerator
   module Skewb
-    class TopSkewbGrid < Skewb::SkewbGrid
+    class TopGrid < Skewb::SkewbGrid
       def factory_class
         GridGenerator::Skewb::TopElementFactory
       end

data/lib/grid_generator/version.rb

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

data/lib/grid_generator.rb

@@ -9,15 +9,18 @@ require_relative 'grid_generator/cubic/right_grid'
 require_relative 'grid_generator/cubic/facing_grid'
 require_relative 'grid_generator/cubic/bordered_grid'
 require_relative 'grid_generator/cubic/square_factory'
-require_relative 'grid_generator/skewb/top_skewb_grid'
-require_relative 'grid_generator/skewb/left_skewb_grid'
-require_relative 'grid_generator/skewb/right_skewb_grid'
+require_relative 'grid_generator/skewb/top_grid'
+require_relative 'grid_generator/skewb/left_grid'
+require_relative 'grid_generator/skewb/right_grid'
 require_relative 'grid_generator/curvy_copter/top_grid'
 require_relative 'grid_generator/curvy_copter/left_grid'
 require_relative 'grid_generator/curvy_copter/right_grid'
 require_relative 'grid_generator/dino_cube/top_grid'
 require_relative 'grid_generator/dino_cube/left_grid'
 require_relative 'grid_generator/dino_cube/right_grid'
+require_relative 'grid_generator/rex_cube/top_grid'
+require_relative 'grid_generator/rex_cube/left_grid'
+require_relative 'grid_generator/rex_cube/right_grid'
 require_relative 'grid_generator/square_one/face'
 require_relative 'grid_generator/pyraminx/face'
 require_relative 'grid_generator/megaminx/face_projection'
@@ -50,16 +53,16 @@ module GridGenerator
     ).build
   end
 
-  def self.top_skewb_grid(args)
-    Skewb::TopSkewbGrid.new(**args)
+  def self.skewb_top_grid(args)
+    Skewb::TopGrid.new(**args)
   end
 
-  def self.left_skewb_grid(args)
-    Skewb::LeftSkewbGrid.new(**args)
+  def self.skewb_left_grid(args)
+    Skewb::LeftGrid.new(**args)
   end
 
-  def self.right_skewb_grid(args)
-    Skewb::RightSkewbGrid.new(**args)
+  def self.skewb_right_grid(args)
+    Skewb::RightGrid.new(**args)
   end
 
   def self.curvy_copter_top_grid(args)
@@ -86,6 +89,18 @@ module GridGenerator
     DinoCube::RightGrid.new(**args)
   end
 
+  def self.rex_cube_top_grid(args)
+    RexCube::TopGrid.new(**args)
+  end
+
+  def self.rex_cube_left_grid(args)
+    RexCube::LeftGrid.new(**args)
+  end
+
+  def self.rex_cube_right_grid(args)
+    RexCube::RightGrid.new(**args)
+  end
+
   def self.square_one_face(args)
     SquareOne::Face.new(**args)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.1
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-03 00:00:00.000000000 Z
+date: 2023-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -74,16 +74,24 @@ files:
 - lib/grid_generator/megaminx/face_projection.rb
 - lib/grid_generator/pyraminx/face.rb
 - lib/grid_generator/pyraminx/triangle_factory.rb
+- lib/grid_generator/rex_cube/element_factory.rb
+- lib/grid_generator/rex_cube/grid.rb
+- lib/grid_generator/rex_cube/left_element_factory.rb
+- lib/grid_generator/rex_cube/left_grid.rb
+- lib/grid_generator/rex_cube/right_element_factory.rb
+- lib/grid_generator/rex_cube/right_grid.rb
+- lib/grid_generator/rex_cube/top_element_factory.rb
+- lib/grid_generator/rex_cube/top_grid.rb
 - lib/grid_generator/rotator.rb
 - lib/grid_generator/scaler.rb
 - lib/grid_generator/skewb/element_factory.rb
 - lib/grid_generator/skewb/left_element_factory.rb
-- lib/grid_generator/skewb/left_skewb_grid.rb
+- lib/grid_generator/skewb/left_grid.rb
 - lib/grid_generator/skewb/right_element_factory.rb
-- lib/grid_generator/skewb/right_skewb_grid.rb
+- lib/grid_generator/skewb/right_grid.rb
 - lib/grid_generator/skewb/skewb_grid.rb
 - lib/grid_generator/skewb/top_element_factory.rb
-- lib/grid_generator/skewb/top_skewb_grid.rb
+- lib/grid_generator/skewb/top_grid.rb
 - lib/grid_generator/square_one/element_factory.rb
 - lib/grid_generator/square_one/face.rb
 - lib/grid_generator/square_one_face_parser.rb