grid_generator 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22222fe473957054950f616c6000c02a60064192425785a6b59495733f89e8e7
-  data.tar.gz: 940e4285e164e679d52a7f40afb6fc01d774505450b1a38e285baff76cc0cb02
+  metadata.gz: b10fb3da899b2d8a0b24adfd979503d79cb3e0fab6e3d789e9e2b7ca19bad30b
+  data.tar.gz: 1341aeb6ba35080f70011eee8433c8d49176688677a113d22fe4edb75cc07e03
 SHA512:
-  metadata.gz: 222aa50cb0c31e3c80283758011b49dde53b442348d5e833dab5cb0b400f386e11814b91a538f009c6fab9331099cd7ae0f3e631fc3c80ff6b7b33fc811068dc
-  data.tar.gz: cd2c7f75557ef04436dfa83327a3282fd1fcb5ebc65526c01d01a52f6af9f3fa35181699485f110ad5fe2ed289e184a862862d719772abaff4ba109f5f84072f
+  metadata.gz: fd32eb362a453be9e33a5d56dda8a2ea21131decb0366f8e0ebd72bd4cf414b77457186289e37952fbb69dd433ac3980d470ccb3f08be843862a98fb422d18f8
+  data.tar.gz: 5d8a1e79cc4a5675927fcf634ebfd22e9f8429a5f77f6a527b202227dd7105886ed7822dc7cd5c7ef708f68152557555325e9301c84b974a8575892e6d45fe1b

data/Gemfile.lock

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

data/lib/grid_generator/curvy_copter/top_element_factory.rb

@@ -0,0 +1,169 @@
+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 CurvyCopter 
+    class TopElementFactory
+      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
+        Matrix.column_vector([grid_x, grid_y])
+      end
+
+      def anchors
+        @anchors ||= {
+          top_left_corner: Matrix.column_vector([3*units, 0]),
+          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]),
+
+          top_edge_left: Matrix.column_vector([4*units, 0.5*units]),
+          top_edge_right: Matrix.column_vector([5*units, units]),
+          right_edge_top: Matrix.column_vector([5*units, 2*units]),
+          right_edge_bottom: Matrix.column_vector([4*units, 2.5*units]),
+          bottom_edge_left: Matrix.column_vector([units, 2*units]),
+          bottom_edge_right: Matrix.column_vector([2*units, 2.5*units]),
+          left_edge_top: Matrix.column_vector([2*units, 0.5*units]),
+          left_edge_bottom: Matrix.column_vector([units, units]),
+
+          center: Matrix.column_vector([3*units, 1.5*units]), 
+
+          top_edge_center: Matrix.column_vector([3.75*units, 1.125*units]), 
+          right_edge_center: Matrix.column_vector([3.75*units, 1.875*units]), 
+          bottom_edge_center: Matrix.column_vector([2.25*units, 1.875*units]), 
+          left_edge_center: Matrix.column_vector([2.25*units, 1.125*units]), 
+
+          top_left_corner_center: Matrix.column_vector([3*units, 0.75*units]), 
+          top_right_corner_center: Matrix.column_vector([4.5*units, 1.5*units]), 
+          bottom_left_corner_center: Matrix.column_vector([1.5*units, 1.5*units]), 
+          bottom_right_corner_center: Matrix.column_vector([3*units, 2.25*units]) 
+        }
+      end
+
+      def commands 
+        case [row_num, col_num]
+        when [0, 0] # Top Left Corner 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_left_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:top_edge_left]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:top_left_corner_center], anchors[:left_edge_top]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [0, 1] # Top Middle Edge
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_edge_left]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:top_edge_right]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:top_edge_center], anchors[:center]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:top_edge_center], anchors[:top_edge_left]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [0, 2] # Top Right Corner
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_edge_right]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:top_right_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:right_edge_top]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:top_right_corner_center], anchors[:top_edge_right]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [1, 0] # Top Left Middle
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_edge_left]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:top_edge_center], anchors[:center]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:left_edge_center], anchors[:left_edge_top]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:top_left_corner_center], anchors[:top_edge_left]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [1, 1] # Top Right Middle
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:top_edge_right]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:top_right_corner_center], anchors[:right_edge_top]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:right_edge_center], anchors[:center]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:top_edge_center], anchors[:top_edge_right]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [2, 0] # Middle Left Edge 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:left_edge_top]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:left_edge_center], anchors[:center]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:left_edge_center], anchors[:left_edge_bottom]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [2, 1] # Middle Right Edge
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:right_edge_top]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:right_edge_bottom]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:right_edge_center], anchors[:center]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:right_edge_center], anchors[:right_edge_top]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [3, 0] # Bottom Left Middle 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:left_edge_bottom]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:left_edge_center], anchors[:center]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:bottom_edge_center], anchors[:bottom_edge_left]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:bottom_left_corner_center], anchors[:left_edge_bottom]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [3, 1] # Bottom Right Middle
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:center]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:right_edge_center], anchors[:right_edge_bottom]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:bottom_right_corner_center], anchors[:bottom_edge_right]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:bottom_edge_center], anchors[:center]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [4, 0] # Bottom Left Corner 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:left_edge_bottom]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:bottom_left_corner_center], anchors[:bottom_edge_left]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_left_corner]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [4, 1] # Bottom Middle Edge 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:center]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:bottom_edge_center], anchors[:bottom_edge_right]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_edge_left]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:bottom_edge_center], anchors[:center]]),
+            GridGenerator::Svg::CloseCommand.new
+          ]
+        when [4, 2] # Bottom Right Corner 
+          [
+            GridGenerator::Svg::MoveCommand.new(points: [anchors[:right_edge_bottom]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_right_corner]]),
+            GridGenerator::Svg::LineCommand.new(points: [anchors[:bottom_edge_right]]),
+            GridGenerator::Svg::QuadraticCommand.new(points: [anchors[:bottom_right_corner_center], anchors[:right_edge_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/curvy_copter/top_grid.rb

@@ -0,0 +1,57 @@
+require_relative '../face_parser'
+require_relative './top_element_factory'
+
+module GridGenerator
+  module CurvyCopter 
+    class TopGrid
+      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
+          TopElementFactory.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/svg/close_command.rb

@@ -0,0 +1,20 @@
+require_relative './path_command'
+
+module GridGenerator
+  module Svg 
+    class CloseCommand < GridGenerator::Svg::PathCommand
+      def type
+        'Z'
+      end
+
+      def +(_offset)
+        self
+      end
+
+      def to_s
+        type
+      end
+    end
+  end
+end
+

data/lib/grid_generator/svg/line_command.rb

@@ -0,0 +1,12 @@
+require_relative './path_command'
+
+module GridGenerator
+  module Svg 
+    class LineCommand < GridGenerator::Svg::PathCommand
+      def type
+        'L'
+      end
+    end
+  end
+end
+

data/lib/grid_generator/svg/move_command.rb

@@ -0,0 +1,12 @@
+require_relative './path_command'
+
+module GridGenerator
+  module Svg 
+    class MoveCommand < GridGenerator::Svg::PathCommand
+      def type
+        'M'
+      end
+    end
+  end
+end
+

data/lib/grid_generator/svg/path.rb

@@ -0,0 +1,30 @@
+module GridGenerator
+  module Svg 
+    class Path 
+      def initialize(d: , style:)
+        @d = case d
+             when String
+               d
+             when Array
+               d.map(&:to_s).join(' ')
+             else
+               raise ArgumentError, "d must be String or Array" 
+             end
+        @style = case style
+                 when GridGenerator::Svg::Style
+                   style.to_s
+                 when String
+                   style
+                 else
+                   raise ArgumentError, "style must be String or Style" 
+                 end
+      end
+
+      attr_reader :d, :style
+
+      def to_svg
+        "<path d=\"#{d}\" style=\"#{style}\" />"
+      end
+    end
+  end
+end

data/lib/grid_generator/svg/path_command.rb

@@ -0,0 +1,38 @@
+module GridGenerator
+  module Svg 
+    class PathCommand 
+      def initialize(points: []) 
+        @points = points
+      end
+
+      attr_reader :points
+
+      def type
+        'M'
+      end
+
+      def +(offset)
+        if offset.class == Matrix 
+          new_points = points.map { |p| p + offset }
+          self.class.new(points: new_points)
+        else
+          raise ArgumentError, "Offset must be Matrix"
+        end
+      end
+
+      def ==(other)
+        self.class == other.class && self.points == other.points
+      end
+
+      def to_s
+        [type, points_string].join(' ')
+      end
+
+      private
+
+      def points_string
+        points.map { |p| "#{p[0,0].round} #{p[1,0].round}" }.join(' ')
+      end
+    end
+  end
+end

data/lib/grid_generator/svg/polygon.rb

@@ -5,10 +5,19 @@ module GridGenerator
         @points = case points
                   when Array
                     points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
-                  else
+                  when String
                     points
+                  else
+                    raise ArgumentError, "points must be Array or String" 
                   end
-        @style = style
+        @style = case style
+                 when GridGenerator::Svg::Style
+                   style.to_s
+                 when String
+                   style
+                 else
+                   raise ArgumentError, "style must be String or Style" 
+                 end
       end
 
       attr_reader :points, :style

data/lib/grid_generator/svg/quadratic_command.rb

@@ -0,0 +1,12 @@
+require_relative './path_command'
+
+module GridGenerator
+  module Svg 
+    class QuadraticCommand < GridGenerator::Svg::PathCommand
+      def type
+        'Q'
+      end
+    end
+  end
+end
+

data/lib/grid_generator/svg/style.rb

@@ -1,7 +1,7 @@
 module GridGenerator
   module Svg 
     class Style
-      def initialize(fill: , stroke: , stroke_width: 1, opacity: 1) 
+      def initialize(fill: , stroke: '#404040', stroke_width: 1, opacity: 1) 
         @fill = fill
         @stroke = stroke
         @stroke_width = stroke_width

data/lib/grid_generator/version.rb

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

data/lib/grid_generator.rb

@@ -12,6 +12,7 @@ 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/curvy_copter/top_grid'
 require_relative 'grid_generator/square_one/face'
 require_relative 'grid_generator/pyraminx/face'
 require_relative 'grid_generator/megaminx/face_projection'
@@ -56,6 +57,10 @@ module GridGenerator
     Skewb::RightSkewbGrid.new(**args)
   end
 
+  def self.curvy_copter_top_grid(args)
+    CurvyCopter::TopGrid.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.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -52,6 +52,8 @@ files:
 - lib/grid_generator/cubic/square_factory.rb
 - lib/grid_generator/cubic/top_grid.rb
 - lib/grid_generator/cubic/units_factory.rb
+- lib/grid_generator/curvy_copter/top_element_factory.rb
+- lib/grid_generator/curvy_copter/top_grid.rb
 - lib/grid_generator/face_parser.rb
 - lib/grid_generator/helper.rb
 - lib/grid_generator/megaminx/face_element_factory.rb
@@ -70,7 +72,13 @@ 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/svg/close_command.rb
+- lib/grid_generator/svg/line_command.rb
+- lib/grid_generator/svg/move_command.rb
+- lib/grid_generator/svg/path.rb
+- lib/grid_generator/svg/path_command.rb
 - lib/grid_generator/svg/polygon.rb
+- lib/grid_generator/svg/quadratic_command.rb
 - lib/grid_generator/svg/style.rb
 - lib/grid_generator/version.rb
 - sig/grid_generator.rbs