refactor penrose

Author: monkstone

processing_app/library/vecmath/vec2d/library/tile/tile.rb

@@ -1,31 +1,33 @@
-module Tiler
-  @acute = false
+# frozen_string_literal: true
+# Tile factory
+class TileFactory
+  attr_reader :acute
 
-  def self.acute(x)
-    @acute = x
+  def initialize(acute = false)
+    @acute = acute
   end
 
   # setup the initial tiling with all red tiles
-  def self.tile(a, b, c)
-    tile = @acute ? ATile.new(0, a, b, c) : Tile.new(0, a, b, c)
+  def tile(a, b, c)
+    return ATile.new(0, a, b, c) if acute
+    Tile.new(0, a, b, c)
   end
 end
 
+# Regular Tile class
 class Tile
   include Processing::Proxy
   PHI = (1.0 + Math.sqrt(5)) / 2.0 # golden ratio
-  RED = [255, 0, 0]
-  BLUE = [0, 0, 255]
-  COLORS = [RED, BLUE]
+  COLORS = %w(#ff0000 #0000ff).freeze # red blue
   attr_reader :a, :b, :c, :col
 
-  def initialize(col,  a,  b,  c)
+  def initialize(col, a,  b,  c)
     @col, @a, @b, @c = col, a, b, c
   end
 
   def display
     no_stroke
-    fill(*COLORS[col])
+    fill(color(COLORS[col]))
     triangle(a.x, a.y, b.x, b.y, c.x, c.y)
     # fill(0, 0, 255)
     # ellipse(a.x, a.y, 4,4)
@@ -35,7 +37,7 @@ def display
 
   def subdivide
     result = []
-    if (col == 0)
+    if col.zero?
       # Subdivide red triangle
       p = b - a
       p /= PHI
@@ -58,10 +60,11 @@ def subdivide
   end
 end
 
+# Acute Tile class
 class ATile < Tile
   def subdivide
     result = []
-    if (col == 0)
+    if col.zero?
       # Subdivide red (half kite) triangle
       q = b - a
       q /= PHI
@@ -80,6 +83,6 @@ def subdivide
       result << ATile.new(1, b, p, a)
       result << ATile.new(0, p, c, b)
     end
-   result
+    result
   end
 end

processing_app/library/vecmath/vec2d/penrose.rb

@@ -5,7 +5,7 @@
 # Translated (and refactored) to JRubyArt July 2015 by Martin Prout
 
 load_libraries :tile, :control_panel
-attr_reader :tris, :s, :panel, :hide, :acute
+attr_reader :tris, :s, :panel, :hide, :acute, :tiler
 
 def setup
   sketch_title 'Penrose'
@@ -19,6 +19,7 @@ def setup
     @panel = c
   end
   @hide = false
+  @tiler = TileFactory.new(acute) # set the Tiler first
   init false # defaults to regular penrose
 end
 
@@ -30,9 +31,7 @@ def draw
   end
   background(255)
   translate(width / 2, height / 2)
-  tris.each do |t|
-    t.display
-  end
+  tris.each(&:display)
 end
 
 def generate
@@ -47,26 +46,22 @@ def generate
 end
 
 def reset!
-  Tiler.acute(acute)  # set the Tiler first
+  @tiler = TileFactory.new(acute) # set the Tiler first
   init @seed
   java.lang.System.gc # but does it do any good?
 end
 
 def init(alt_seed)
   @tris = []
-  10.times do |i|     # create 36 degree segments
+  10.times do |i| # create 36 degree segments
     a = Vec2D.new
     b = Vec2D.from_angle((2 * i - 1) * PI / 10)
     c = Vec2D.from_angle((2 * i + 1) * PI / 10)
     b *= 370
     c *= 370
-    if alt_seed
-      tile = i.even? ? Tiler.tile(b, a, c) : Tiler.tile(c, a, b)
-      tris << tile
-    else
-      tile = i.even? ? Tiler.tile(a, b, c) : Tiler.tile(a, c, b)
-      tris << tile
-    end
+    tile = i.even? ? tiler.tile(b, a, c) : tiler.tile(c, a, b) if alt_seed
+    tile = i.even? ? tiler.tile(a, b, c) : tiler.tile(a, c, b) unless alt_seed
+    tris << tile
   end
 end