grid_generator 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75cdb06a79ebb644afccc577353a18b2a7f999251ffffd6f1f7617b08c23745
-  data.tar.gz: fb3fc73597223fed891b6857250e217f9c4ca057e1795574b2ae1a9fd2ce1c41
+  metadata.gz: bac6da73c0f3f0fae6985d7c6e9b2f91f75ff82faaaf6d4a5299af71e0980e3c
+  data.tar.gz: 53848371057b7cbb7743049bc992cdee7eb17fed5e26412fb3efe101710cf688
 SHA512:
-  metadata.gz: 06f2a4c827b2710abc6a379f6a45360a7caabafa4b0905f466e975968c0a622bb1f87296d7409b6225dabc7f807f126b4c93633af4b8a449830eb27703a5aee7
-  data.tar.gz: 1cb5b6a79655216376731edcd9724ceb9dd9cb5e6236df9cab39c8e048754a0aca33a17413a71d87aeb8985c48a74ad0500ac8f1035b2c7784a948db9b3f3976
+  metadata.gz: b75fad2b601e6b0b027961e53b0562bd5a916309c12dd161a7471e1805746bf694e9908d3433c3e00bddef4e5e7fb1ad190c2d8063ac88ffa061a8641325d45a
+  data.tar.gz: 0d4ee932026ea66b66ef3121bdf422bc56f1003c2acb4f4e461014eb20b80b1114c106965d0565a202dd767c9ca3eaf922909f1e0fc24ccd0220bb953afd8b88

data/Gemfile.lock

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

data/lib/grid_generator/base_element.rb

@@ -1,5 +1,10 @@
 module GridGenerator
   class BaseElement
+    COLOURS = {
+      fill: "#d0d0d0",
+      stroke: "#404040"
+    }
+
     def initialize(points:, colour: , opacity: 1)
       @points = points
       @colour = colour
@@ -26,5 +31,9 @@ module GridGenerator
         "opacity" => opacity
       }
     end
+
+    def to_svg
+      "<polygon points=\"#{points_string}\" style=\"fill:#{colour};stroke:#{COLOURS[:stroke]};stroke-width:1;opacity:#{opacity}\" />"
+    end
   end
 end

data/lib/grid_generator/cubic/bordered_grid.rb

@@ -1,4 +1,6 @@
 require 'matrix'
+require_relative '../svg/polygon'
+require_relative '../svg/style'
 require_relative '../line'
 require_relative '../face_parser'
 require_relative 'facing_square_factory'
@@ -6,6 +8,11 @@ require_relative 'facing_square_factory'
 module GridGenerator
   module Cubic
     class BorderedGrid
+      COLOURS = {
+        fill: "#d0d0d0",
+        stroke: "#404040"
+      }
+
       def initialize(x:, y:, units:, squares: )
         @x, @y = x, y
         @units = units
@@ -123,18 +130,23 @@ module GridGenerator
           Matrix.column_vector([ x, max_y ])
         ]
       end
-  
-      def points_string
-        points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
       end
 
-      def as_json
-        {
-          "points_string" => points_string,
-          "rows" => rows,
-          "columns" => columns,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
+      end
+
+      def to_svg
+        output = base_shape.to_svg
+
+        rows.each { |row| output += row.to_svg }
+        columns.each { |col| output += col.to_svg } 
+        element_shapes.each { |shape| output += shape.to_svg } 
+
+        output
       end
     end
   end

data/lib/grid_generator/cubic/facing_grid.rb

@@ -1,4 +1,6 @@
 require 'matrix'
+require_relative '../svg/polygon'
+require_relative '../svg/style'
 require_relative '../face_parser'
 require_relative '../line'
 require_relative 'facing_square_factory'
@@ -6,6 +8,11 @@ require_relative 'facing_square_factory'
 module GridGenerator
   module Cubic
     class FacingGrid
+      COLOURS = {
+        fill: "#d0d0d0",
+        stroke: "#404040"
+      }
+
       def initialize(x:, y:, units:, squares: )
         @x, @y = x, y
         @units = units
@@ -103,18 +110,23 @@ module GridGenerator
           Matrix.column_vector([ x, max_y ])
         ]
       end
-  
-      def points_string
-        points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
       end
 
-      def as_json
-        {
-          "points_string" => points_string,
-          "rows" => rows,
-          "columns" => columns,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
+      end
+
+      def to_svg
+        output = base_shape.to_svg
+
+        rows.each { |row| output += row.to_svg }
+        columns.each { |col| output += col.to_svg } 
+        element_shapes.each { |shape| output += shape.to_svg } 
+
+        output
       end
     end
   end

data/lib/grid_generator/cubic/grid.rb

@@ -4,6 +4,11 @@ require_relative '../line'
 module GridGenerator
   module Cubic
     class Grid
+      COLOURS = {
+        fill: "#d0d0d0",
+        stroke: "#404040"
+      }
+
       def initialize(x:, y:, units: , squares: ) 
         @x, @y = x, y
         @units = units
@@ -148,18 +153,23 @@ module GridGenerator
           bottom_left
         ]
       end
-  
-      def points_string
-        points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
       end
 
-      def as_json
-        {
-          "points_string" => points_string,
-          "rows" => rows,
-          "columns" => columns,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
+      end
+
+      def to_svg
+        output = base_shape.to_svg
+
+        rows.each { |row| output += row.to_svg }
+        columns.each { |col| output += col.to_svg } 
+        element_shapes.each { |shape| output += shape.to_svg } 
+
+        output
       end
     end
   end

data/lib/grid_generator/cubic/iso_view.rb

@@ -29,6 +29,13 @@ module GridGenerator
           "right" => right.as_json
         }
       end
+
+      def to_svg
+        output = top.to_svg
+        output += front.to_svg
+        output += right.to_svg
+        output
+      end
     end
   end
 end

data/lib/grid_generator/line.rb

@@ -1,5 +1,10 @@
 module GridGenerator
   class Line
+    COLOURS = {
+      fill: "#d0d0d0",
+      stroke: "#404040"
+    }
+
     def initialize(a:, b:)
       @a, @b = a, b
     end
@@ -37,6 +42,10 @@ module GridGenerator
     def y2
       b[1,0]
     end
+
+    def to_svg
+      "<line x1=\"#{x1}\" y1=\"#{y1}\" x2=\"#{x2}\" y2=\"#{y2}\" style=\"stroke:#{COLOURS[:stroke]};stroke-width:1\" />"
+    end
   end
 end
 

data/lib/grid_generator/megaminx/face_projection.rb

@@ -1,4 +1,6 @@
 require 'matrix'
+require_relative '../svg/polygon'
+require_relative '../svg/style'
 require_relative '../rotator'
 require_relative '../helper'
 require_relative '../line'
@@ -7,6 +9,10 @@ require_relative 'face_element_factory'
 module GridGenerator
   module Megaminx
     class FaceProjection
+      COLOURS = {
+        fill: "#d0d0d0",
+        stroke: "#404040"
+      }
       # units 30 - pentagon 90 - megaminx - 150
       # units * 5 
       def initialize(x:, y:, units:, front_face_elements: "", top_right_face_elements: "", right_face_elements: "", down_face_elements: "", left_face_elements: "", top_left_face_elements: "", rotation_offset: 0)
@@ -145,13 +151,13 @@ module GridGenerator
       end
 
       # for svg
-      def decagon_points_string
-        decagon_points.map { |p| offset_rotator.rotate(p) + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+      def decagon_points_transformed
+        decagon_points.map { |p| offset_rotator.rotate(p) + offset }
       end
 
       # for svg
-      def pentagon_points_string
-        pentagon_points.map { |p| offset_rotator.rotate(p) + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+      def pentagon_points_transformed
+        pentagon_points.map { |p| offset_rotator.rotate(p) + offset }
       end
 
       # for svg
@@ -205,6 +211,41 @@ module GridGenerator
           end.compact
         end
       end
+
+      def decagon_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
+      end
+
+      def decagon_shape
+        GridGenerator::Svg::Polygon.new(points: decagon_points_transformed, style: decagon_shape_style)
+      end
+
+      def pentagon_shape_style
+        GridGenerator::Svg::Style.new(fill: 'none', stroke: COLOURS[:stroke])
+      end
+
+      def pentagon_shape
+        GridGenerator::Svg::Polygon.new(points: pentagon_points_transformed, style: pentagon_shape_style)
+      end
+
+      def to_svg
+        output = decagon_shape.to_svg
+        output += pentagon_shape.to_svg
+
+        connecting_lines.each { |line| output += line.to_svg }
+
+        front_face_lines.each { |line| output += line.to_svg }
+        outside_face_lines.each do |face|
+          face.each { |line| output += line.to_svg }
+        end
+
+        front_face_element_shapes.each { |shape| output += shape.to_svg }
+        outside_face_element_shapes.each do |face|
+          face.each { |shape| output += shape.to_svg }
+        end
+
+        output
+      end
     end
   end
 end

data/lib/grid_generator/pyraminx/face.rb

@@ -1,7 +1,9 @@
-require_relative 'triangle_factory'
+require_relative '../svg/polygon'
+require_relative '../svg/style'
 require_relative '../rotator'
 require_relative '../scaler'
 require_relative '../line'
+require_relative 'triangle_factory'
 
 module GridGenerator
   module Pyraminx
@@ -9,6 +11,11 @@ module GridGenerator
     # * * *
     # * * * * * 
     class Face
+      COLOURS = {
+        fill: "#d0d0d0",
+        stroke: "#404040"
+      }
+
       def initialize(x:, y:, units:, elements:, vertical_scale: 1, rotation_angle: 0)
         @x, @y = x, y
         @units = units
@@ -169,10 +176,6 @@ module GridGenerator
         end
       end
 
-      def points_string
-        points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
-      end
-
       def element_shapes
         elements.map.each_with_index do |row, row_num|
           row.map.each_with_index do |col, col_num|
@@ -190,6 +193,25 @@ module GridGenerator
           end
         end.flatten.compact
       end
+
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
+      end
+
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
+      end
+
+      def to_svg
+        output = base_shape.to_svg
+
+        vertical_lines.each { |line| output += line.to_svg }
+        diagonal_up_lines.each { |line| output += line.to_svg }
+        diagonal_down_lines.each { |line| output += line.to_svg }
+        element_shapes.each { |shape| output += shape.to_svg }
+
+        output
+      end
     end
   end
 end

data/lib/grid_generator/skewb/left_skewb_grid.rb

@@ -9,12 +9,12 @@ module GridGenerator
         GridGenerator::Skewb::LeftElementFactory
       end
   
-      def border_points
+      def points
         [
-          [ x, y ],
-          [ x + side_size*2*units, y + side_size*units ],
-          [ x + side_size*2*units, y + side_size*3*units ],
-          [ x, y + side_size*2*units ]
+          Matrix.column_vector([ x, y ]),
+          Matrix.column_vector([ x + side_size*2*units, y + side_size*units ]),
+          Matrix.column_vector([ x + side_size*2*units, y + side_size*3*units ]),
+          Matrix.column_vector([ x, y + side_size*2*units ])
         ]
       end 
   

data/lib/grid_generator/skewb/right_skewb_grid.rb

@@ -10,12 +10,12 @@ module GridGenerator
         GridGenerator::Skewb::RightElementFactory
       end
   
-      def border_points
+      def points
         [
-          [ x, y + side_size*units ],
-          [ x + side_size*2*units, y ],
-          [ x + side_size*2*units, y + side_size*2*units ],
-          [ x, y + side_size*3*units ]
+          Matrix.column_vector([ x, y + side_size*units ]),
+          Matrix.column_vector([ x + side_size*2*units, y ]),
+          Matrix.column_vector([ x + side_size*2*units, y + side_size*2*units ]),
+          Matrix.column_vector([ x, y + side_size*3*units ])
         ]
       end 
   

data/lib/grid_generator/skewb/skewb_grid.rb

@@ -3,6 +3,11 @@ require_relative '../face_parser'
 module GridGenerator
   module Skewb
     class SkewbGrid
+      COLOURS = {
+        fill: "#d0d0d0",
+        stroke: "#404040"
+      }
+
       def initialize(x:, y:, units: , elements: )
         @x, @y = x, y
         @units = units
@@ -39,10 +44,6 @@ module GridGenerator
         end
       end
   
-      def border_points_string
-        border_points.map { |x| x.join(',') }.join(' ') 
-      end
-  
       def element_shapes
         elements.each_with_index.map do |row, row_num|
           row.each_with_index.map do |col, col_num|
@@ -51,11 +52,22 @@ module GridGenerator
         end.flatten.compact
       end
 
-      def as_json
-        {
-          "border_points_string" => border_points_string,
-          "element_shapes" => element_shapes.map(&:as_json)
-        }
+      def base_shape_style
+        GridGenerator::Svg::Style.new(fill: COLOURS[:fill], stroke: COLOURS[:stroke])
+      end
+
+      def base_shape
+        GridGenerator::Svg::Polygon.new(points: points, style: base_shape_style)
+      end
+
+      def to_svg
+        output = base_shape.to_svg
+
+        rows.each { |row| output += row.to_svg }
+        columns.each { |col| output += col.to_svg }
+        element_shapes.each { |element| output += element.to_svg if element } 
+
+        output
       end
     end
   end

data/lib/grid_generator/skewb/top_skewb_grid.rb

@@ -10,12 +10,12 @@ module GridGenerator
         GridGenerator::Skewb::TopElementFactory
       end
   
-      def border_points
+      def points
         [
-          [ x + side_size*2*units, y ],
-          [ x + side_size*4*units, y + side_size*units ],
-          [ x + side_size*2*units, y + side_size*2*units ],
-          [ x, y + side_size*units ]
+          Matrix.column_vector([ x + side_size*2*units, y ]),
+          Matrix.column_vector([ x + side_size*4*units, y + side_size*units ]),
+          Matrix.column_vector([ x + side_size*2*units, y + side_size*2*units ]),
+          Matrix.column_vector([ x, y + side_size*units ])
         ]
       end 
   

data/lib/grid_generator/square_one/face.rb

@@ -5,6 +5,11 @@ require_relative 'element_factory'
 module GridGenerator
   module SquareOne
     class Face 
+      COLOURS = {
+        fill: "#d0d0d0",
+        stroke: "#404040"
+      }
+
       def initialize(x:, y: , units: , elements:, axis_direction: :forward)
         @x, @y = x, y
         @units = units
@@ -88,6 +93,20 @@ module GridGenerator
           "element_shapes" => element_shapes.map(&:as_json)
         }
       end
+
+      def to_svg
+        output = ""
+        element_shapes.each do |element|
+          if element.opacity == 0.4
+            output += "<polygon points=\"#{ element.points_string }\" style=\"fill:#{ COLOURS[:fill] };stroke:#{ COLOURS[:stroke] };stroke-width:1;opacity:1;\" />"
+          end
+          output += "<polygon points=\"#{ element.points_string }\" style=\"fill:#{ element.colour };stroke:#{ COLOURS[:stroke] };stroke-width:1;opacity:#{ element.opacity };\" />"
+         end
+
+        output += "<line x1=\"#{ axis.x1 }\" y1=\"#{ axis.y1 }\" x2=\"#{ axis.x2 }\" y2=\"#{ axis.y2 }\" style=\"stroke:#{ COLOURS[:stroke] };stroke-width:5\" />"
+
+        output
+      end
     end
   end
 end

data/lib/grid_generator/svg/polygon.rb

@@ -0,0 +1,21 @@
+module GridGenerator
+  module Svg 
+    class Polygon
+      def initialize(points: , style:)
+        @points = case points
+                  when Array
+                    points.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
+                  else
+                    points
+                  end
+        @style = style
+      end
+
+      attr_reader :points, :style
+
+      def to_svg
+        "<polygon points=\"#{points}\" style=\"#{style.to_s}\" />"
+      end
+    end
+  end
+end

data/lib/grid_generator/svg/style.rb

@@ -0,0 +1,18 @@
+module GridGenerator
+  module Svg 
+    class Style
+      def initialize(fill: , stroke: , stroke_width: 1, opacity: 1) 
+        @fill = fill
+        @stroke = stroke
+        @stroke_width = stroke_width
+        @opacity = opacity
+      end
+
+      attr_reader :fill, :stroke, :stroke_width, :opacity
+
+      def to_s
+        "fill:#{fill};stroke:#{stroke};stroke-width:#{stroke_width};opacity:#{opacity};"
+      end
+    end
+  end
+end

data/lib/grid_generator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -70,6 +70,8 @@ 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/polygon.rb
+- lib/grid_generator/svg/style.rb
 - lib/grid_generator/version.rb
 - sig/grid_generator.rbs
 homepage: https://github.com/mrlhumphreys/grid_generator