some refactoring

Author: monkstone

library/video/capture/mirror2.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env jruby -w
+# frozen_string_literal: true
+
 require 'picrate'
 # Mirror 2
 # by Daniel Shiffman.
@@ -8,19 +10,15 @@
 class Mirror2 < Processing::App
   load_library :video
   java_import 'processing.video.Capture'
-  attr_reader :video, :cols, :rows
+  attr_reader :video
   # Size of each cell in the grid
   CELL_SIZE = 15
 
   def setup
     sketch_title 'mirror'
-    frame_rate(30)
-    @cols = width / CELL_SIZE
-    @rows = height / CELL_SIZE
     colorMode(RGB, 255, 255, 255, 100)
-    # Try test_capture to find name of your Camera
-    @video = Capture.new(self, width, height, "UVC Camera (046d:0825)")
-    # Start capturing the images from the camera
+    # Try test_capture to find the name of your Camera
+    @video = Capture.new(self, width, height, 'UVC Camera (046d:0825)')
     video.start
   end
 
@@ -30,25 +28,18 @@ def draw
     background(0, 0, 255)
     video.read
     video.load_pixels
-    grid(cols, rows) do |i, j|
-      x = i * CELL_SIZE
-      y = j * CELL_SIZE
-      loc = (width - x -1 + y * width)# Reversing x to mirror the image
-      col = video.pixels[loc]
-      # Code for drawing a single rect
-      # Using translate in order for rotation to work properly
-      # rectangle size is based on brightness
-      sz = g.brightness(col) / 255 * CELL_SIZE
+    grid(width, height, CELL_SIZE, CELL_SIZE) do |x, y|
+      loc = (width - x - 1 + y * width) # Reversing x to mirror the image
+      sz = brightness(video.pixels[loc]) / 255 * CELL_SIZE
       rect_mode(CENTER)
       fill(255)
       no_stroke
-      # Rects are larger than the cell for some overlap
-      rect(x + CELL_SIZE / 2, y + CELL_SIZE / 2, sz, sz)
+      rect(x + CELL_SIZE / 2.0, y + CELL_SIZE / 2.0, sz, sz)
     end
   end
 
   def settings
-    size(480, 360)
+    size(960, 544)
   end
 end
 

lsystems/chequer.rb

@@ -44,7 +44,7 @@ def initialize(xpos, ypos)
   end
 
   def render
-    production.each do |element|
+    production.scan(/./) do |element|
       case element
       when 'F'
         x_temp = xpos

lsystems/david_tour.rb

@@ -54,7 +54,7 @@ def create_grammar(gen)
   def translate_rules(prod)
     swap = false
     [].tap do |points| # An array to store lines as a flat array of points
-      prod.each do |ch|
+      prod.scan(/./) do |ch|
         case ch
         when 'F'
           new_pos = pos + Vec2D.from_angle(theta) * draw_length

lsystems/library/cs_grammar/cs_grammar.rb

@@ -41,7 +41,7 @@ def generate(repeat = 0) # repeat iteration grammar rules
 
   def new_production(prod)  # single iteration grammar rules
     @idx = -1
-    prod.gsub!(/./) do |ch|
+    prod.gsub(/./) do |ch|
       get_rule(prod, ch)
     end
   end

lsystems/library/grammar/grammar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ############################
 # Simple lsystem grammar
 ############################
@@ -8,23 +10,17 @@ def initialize(axiom, rules)
     @rules = rules
   end
 
-  def expand(production, iterations, &block)
-    production.each_char do |token|
-      if rules.key?(token) && iterations > 0
-        expand(rules[token], iterations - 1, &block)
-      else
-        yield token
-      end
-    end
-  end
-
-  def each(gen)
-    expand(axiom, gen) { |token| yield token }
+  def apply_rules(prod)
+    prod.gsub(/./) { |token| rules.fetch(token, token) }
   end
 
   def generate(gen)
-    [].tap do |output|
-      each(gen) { |token| output << token }
+    return axiom if gen.zero?
+
+    prod = axiom
+    gen.times do
+      prod = apply_rules(prod)
     end
+    prod
   end
 end

lsystems/library/penrose/penrose.rb

@@ -43,7 +43,7 @@ def render
     repeated = %w[1 2 3 4]
     pen = Turtle.new(pos, theta, RED) # simple Struct for pen, symbol
     stack = [] # simple array for stack
-    production.each do |element|
+    production.scan(/./) do |element|
       case element
       when 'F'
         pen = draw_line(pen, draw_length)

lsystems/library/snowflake/snowflake.rb

@@ -3,11 +3,11 @@ class PenroseSnowflake
 
   attr_accessor :axiom, :grammar, :start_length, :theta, :production,
                 :draw_length, :pos
-  DELTA = PI / 10
+  DELTA = 36.radians
 
   def initialize(pos)
-    @axiom = 'F3-F3-F3-F3-F'
-    @grammar = Grammar.new(axiom, 'F' => 'F3-F3-F45-F++F3-F')
+    @axiom = 'F2-F2-F2-F2-F'
+    @grammar = Grammar.new(axiom, 'F' => 'F2-F2-F5-F+F2-F')
     @start_length = 450.0
     @theta = 0
     @pos = pos
@@ -21,7 +21,7 @@ def initialize(pos)
 
   def render
     repeats = 1
-    production.each do |element|
+    production.scan(/./) do |element|
       case element
       when 'F'
         new_pos = pos + Vec2D.from_angle(theta) * draw_length
@@ -34,8 +34,8 @@ def render
       when '-'
         @theta -= DELTA * repeats
         repeats = 1
-      when '3', '4', '5'
-        repeats += element.to_i
+      when '2', '5'
+        repeats = element.to_i
       else
         puts "Character '#{element}' is not in grammar"
       end

lsystems/mandelbrot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'picrate'
 # The Mandelbrot Set
 # by Daniel Shiffman.
@@ -46,6 +48,7 @@ def setup
           b = twoab + y
           # Infinity in our finite world is simple, let's just consider it 16
           break if dist(aa, bb, 0, 0) > 4.0 # Bail
+
           n += 1
         end
         # We color each pixel based on how long it takes to get to infinity

lsystems/moore_curve.rb

@@ -65,7 +65,7 @@ def generate(gen)
 
   def translate_rules(prod)
     [].tap do |pts| # An array to store line vertices as Vec2D
-      prod.each do |ch|
+      prod.scan(/./) do |ch|
         case ch
         when 'F'
           pts << vec

lsystems/mpeano.rb

@@ -62,7 +62,7 @@ def generate(gen)
 
   def translate_rules(prod)
     [].tap do |points|      # An empty array to store line vertices
-      prod.each do |ch|
+      prod.scan(/./) do |ch|
         case ch
         when 'F'
           points << xpos << ypos << (@xpos -= draw_length * cos(theta)) << (@ypos -= draw_length * sin(theta))

lsystems/peano.rb

@@ -69,7 +69,7 @@ def forward(pos)
 
   def translate_rules(prod)
     [].tap do |pts| # An array to store line vertices as Vec2D
-      prod.each do |ch|
+      prod.scan(/./) do |ch|
         case ch
         when 'F'
           new_pos = forward(pos)

lsystems/pentagonal.rb

@@ -85,7 +85,7 @@ def make_shape
       shape.stroke 200
       shape.stroke_weight 3
       shape.vertex(pos.x, pos.y)
-      production.each do |element|
+      production.scan(/./) do |element|
         case element
         when 'F'
           @pos = forward(pos)

lsystems/snake_kolam.rb

@@ -55,7 +55,7 @@ def setup_grammar
 
     def render                     # NB not using affine transforms here
       turtle = [xpos, ypos, 0]
-      production.each do |element|
+      production.scan(/./) do |element|
         case element
         when 'F'
           turtle = draw_line(turtle, draw_length)