grid_generator 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b4decfd16c0f0358a935123fed5fb0a190d2379d14a37b83e2f0c958d41a624
-  data.tar.gz: 50883416a3a299e9ea384b14777eef77d1767ffb22ff11b7449fb1d79f6c8bae
+  metadata.gz: 64d15af10326ad444f4760ddbe17746cbfc05661e50e1fb5b81ce8f13b08d871
+  data.tar.gz: b3ba4a0c2b51159418ee98606b0d8ade3964741ab662458214c849c02ead5a5b
 SHA512:
-  metadata.gz: 4a35b02c742ec97e40f5b674232ab528b00fe7ee401ae47340b1bc0539e29cd3c75e2bfa31349dc9a66a3b6e51da3d59209f3aebbf1d06423b168aea0343e083
-  data.tar.gz: 12e781e8a1d8c0b125b4395a0bdf20b29636a632f2a4b288226f718a6ddac223756db2a06a078797f2dbaf0ec786673c126da1e4fdea780cb29acc6bd3f28f13
+  metadata.gz: 0a5212a5f5a42b696b9b2a3508aa9f0b0adcd7939dbaf556e4697d8a9eb3556a085372583138da04f601e7d5f3d66033ba6ae8cb143e95e0324dc11a96b3a872
+  data.tar.gz: fee3fdecb1114c47e7c94b3b2717d86d0d77e107dcf9c722c16e5f3654e89d93a093bd8cf92bb5f8e3c2939577150e90bd6217491d07245cae10735dfa3766bb

data/Gemfile.lock

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

data/lib/grid_generator/helper.rb

@@ -18,6 +18,28 @@ module GridGenerator
         Matrix.column_vector([x, y])
       end
     end
+
+    def self.intersection(ab,cd)
+        x1 = ab.a[0,0]
+        y1 = ab.a[1,0]
+        x2 = ab.b[0,0]
+        y2 = ab.b[1,0]
+        x3 = cd.a[0,0]
+        y3 = cd.a[1,0]
+        x4 = cd.b[0,0]
+        y4 = cd.b[1,0]
+
+        px_numerator = (x1 * y2 - y1 * x2) * (x3 - x4) - (x1 - x2) * (x3 * y4 - y3 * x4)
+        px_denominator = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4)
+
+        py_numerator = (x1 * y2 - y1 * x2) * (y3 - y4) - (y1 - y2) * (x3 * y4 - y3 * x4)
+        py_denominator = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4)
+
+        px = px_numerator.to_f / px_denominator
+        py = py_numerator.to_f / py_denominator
+
+        Matrix.column_vector([px, py])
+    end
   end
 end
 

data/lib/grid_generator/megaminx/face_element_factory.rb

@@ -0,0 +1,92 @@
+require_relative '../face_parser'
+
+module GridGenerator
+  module Megaminx
+    class FaceElementFactory
+      def initialize(x:, y:, index:, face_points: , face_lines:, face:)
+        @x, @y = x, y
+        @index = index
+        @face_points = face_points
+        @face_lines = face_lines
+        face_attr = FaceParser.new(face).parse
+        @colour = face_attr && face_attr[:colour]
+        @opacity = face_attr && face_attr[:opacity]
+      end
+
+      attr_reader :x, :y, :index, :face_points, :face_lines, :colour, :opacity 
+
+      def offset
+        Matrix.column_vector([x, y])
+      end
+
+      # front face points
+      # 0 top corner
+      # 1 right corner
+      # 2 bottom right corner
+      # 3 bottom left corner
+      # 4 left corner
+      
+      # front face lines - parallel
+      # 0 - top right 
+      # 1 - right 
+      # 2 - down 
+      # 3 - left
+      # 4 - top left right
+      
+      def center_points
+        face_lines.each_with_index.map do |line, i|
+          a = line
+          b = face_lines[(i+1)%5]
+          GridGenerator::Helper.intersection(a, b) 
+        end
+      end
+     
+      def edge_points(i)
+        previous_line = face_linex[(i-1)%5]
+        this_line = face_lines[i]
+        next_line = face_lines[(i+1)%5]
+
+        previous_this_point = GridGenerator::Helper.intersection(previous_line, this_line)
+        this_next_point = GridGenerator::Helper.intersection(this_line, next_line)
+
+        [
+          previous_line.b,
+          next_line.a,
+          this_next_point,
+          previous_this_point 
+        ]
+      end
+
+      def corner_points(i)
+        line_a = face_lines[(i+3) % 5]
+        line_b = face_lines[(i+4) % 5]
+        intersection = GridGenerator::Helper.intersection(line_a, line_b)
+
+        [
+          face_points[i], 
+          line_a.b,
+          line_b.a,
+          intersection
+        ]
+      end
+
+      def points
+        all_points = if index == 0
+          center_points
+        else
+          if index % 2 == 0
+            edge_points(index / 2) 
+          else
+            corner_points((index - 1) / 2)
+          end
+        end
+
+        all_points.map { |p| p + offset }
+      end
+
+      def build
+        GridGenerator::BaseElement.new(points: points, colour: colour, opacity: opacity)
+      end
+    end
+  end
+end

data/lib/grid_generator/megaminx/face_projection.rb

@@ -2,30 +2,20 @@ require 'matrix'
 require_relative '../rotator'
 require_relative '../helper'
 require_relative '../line'
+require_relative 'face_element_factory'
 
 module GridGenerator
   module Megaminx
     class FaceProjection
       # units 30 - pentagon 90 - megaminx - 150
       # units * 5 
-      #       *****
-      #        *** 
-      #        ***
-      #        
-      #  ***   ***   ***
-      #  ***   ***   ***
-      # ***** ***** *****
-      #
-      #    ***** *****
-      #     ***   ***
-      #     ***   ***
-      def initialize(x:, y:, units:, elements: [])
+      def initialize(x:, y:, units:, front_face_elements: "")
         @x, @y = x, y
         @units = units
-        @elements = elements
+        @front_face_elements = front_face_elements.split(',')
       end
 
-      attr_reader :x, :y, :units, :elements
+      attr_reader :x, :y, :units, :front_face_elements
 
       def offset
         @offset ||= Matrix.column_vector([x, y])
@@ -87,22 +77,26 @@ module GridGenerator
         ]
       end
 
-      def right_pentagon_points
-        @right_pentagon_points ||= [
-          decagon_points[2],
-          decagon_points[3],
-          decagon_points[4],
-          pentagon_points[2],
-          pentagon_points[1]
-        ]
+      def front_face_lines_raw
+        (0..4).map do |i|
+          a = pentagon_points[i-1] # offset one so first line is top right
+          b = pentagon_points[(i)%5]
+          c = pentagon_points[(i+1)%5]
+          d = pentagon_points[(i+2)%5]
+
+          ab_intervals = GridGenerator::Helper.intervals(a,b,2)
+          cd_intervals = GridGenerator::Helper.intervals(c,d,2)
+
+          GridGenerator::Line.new(a: ab_intervals[-1], b: cd_intervals[0])
+        end
       end
 
       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]
-          c = top_right_pentagon_points[(i+2)%5]
-          d = top_right_pentagon_points[(i+3)%5]
+          a = top_right_pentagon_points[i-1] # offset by one so first line is top right
+          b = top_right_pentagon_points[(i)%5]
+          c = top_right_pentagon_points[(i+1)%5]
+          d = top_right_pentagon_points[(i+2)%5]
 
           ab_intervals = GridGenerator::Helper.intervals(a,b,2)
           cd_intervals = GridGenerator::Helper.intervals(c,d,2)
@@ -126,26 +120,31 @@ module GridGenerator
 
       # 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
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 0.4, rotation_point: rotation_point)
+        top_right_face_lines_raw.map { |l| rotator.rotate(l) + offset } 
       end
 
       # for svg
-      def front_face_lines
-        (0..4).map do |i| 
-          a = pentagon_points[i]
-          b = pentagon_points[(i+1)%5]
-          c = pentagon_points[(i+2)%5]
-          d = pentagon_points[(i+3)%5]
+      def down_face_lines
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 0.8, rotation_point: rotation_point)
+        top_right_face_lines_raw.map { |l| rotator.rotate(l) + offset } 
+      end
 
-          ab_intervals = GridGenerator::Helper.intervals(a,b,2)
-          cd_intervals = GridGenerator::Helper.intervals(c,d,2)
+      # for svg
+      def left_face_lines
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 1.2, rotation_point: rotation_point)
+        top_right_face_lines_raw.map { |l| rotator.rotate(l) + offset } 
+      end
 
-          GridGenerator::Line.new(a: ab_intervals[-1], b: cd_intervals[0]) + offset
-        end
+      # for svg
+      def top_left_face_lines
+        rotator = GridGenerator::Rotator.new(angle: Math::PI * 1.6, rotation_point: rotation_point)
+        top_right_face_lines_raw.map { |l| rotator.rotate(l) + offset } 
+      end
+
+      # for svg
+      def front_face_lines
+        front_face_lines_raw.map { |l| l + offset }
       end
 
       # for svg
@@ -158,6 +157,19 @@ module GridGenerator
         pentagon_points.map { |p| p + offset }.map { |p| "#{p[0,0].round},#{p[1,0].round}" }.join(' ')
       end
 
+      # for svg
+      def front_face_element_shapes
+        front_face_elements.each_with_index.map do |element, i|
+          GridGenerator::Megaminx::FaceElementFactory.new(
+            x: x,
+            y: y,
+            index: i,
+            face_points: pentagon_points,
+            face_lines: front_face_lines_raw,
+            face: element
+          ).build unless element == '-'
+        end.compact
+      end
     end
   end
 end

data/lib/grid_generator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grid_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - Mark Humphreys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-05 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: matrix
@@ -62,6 +62,7 @@ files:
 - lib/grid_generator/megaminx/common.rb
 - lib/grid_generator/megaminx/element_factory.rb
 - lib/grid_generator/megaminx/face.rb
+- lib/grid_generator/megaminx/face_element_factory.rb
 - lib/grid_generator/megaminx/face_projection.rb
 - lib/grid_generator/megaminx/front_face.rb
 - lib/grid_generator/pyraminx/face.rb