promote grid convenience method

Author: monkstone

contributed/25_squares.rb

@@ -4,6 +4,7 @@
 # # # # #
 # Interpretation by Martin Vögeli
 # Converted to propane Martin Prout
+# features the :grid convenience method
 # # # # #
 # Based on code by Indae Hwang and Jon McCormack
 def settings
@@ -24,12 +25,10 @@ def draw
   # calculate the size of each square for the given number of squares and gap between them
   cellsize = (width - (grid_size + 1) * gap) / grid_size
   position = -> (count) { gap * (count + 1) + cellsize * count + rand(-5..5) }
-  grid_size.times do |i|
-    grid_size.times do |j|
-      # Note how to create transparent fill with web color JRubyArt
-      rand(0..5) > 4 ? fill(color('#a11220'), 180.0) : fill(color('#884444'), 180.0)
-      rect(position.call(i), position.call(j), cellsize, cellsize)
-    end
+  grid(grid_size, grid_size) do |i, j| # the grid convenience method takes a block
+    # Note how to create transparent fill with web color JRubyArt
+    rand(0..5) > 4 ? fill(color('#a11220'), 180.0) : fill(color('#884444'), 180.0)
+    rect(position.call(i), position.call(j), cellsize, cellsize)
   end
   # save your drawings when you press keyboard 's' continually
   save_frame('######.jpg') if key_pressed? && key == 's'

processing_app/basics/arrays/array_2d.rb

@@ -10,11 +10,9 @@ def setup
   @distances = Array.new(width) { Array.new(height) }
   stroke_weight 2
   max_distance = dist(width / 2, height / 2, width, height)
-  width.times do |x|
-    height.times do |y|
-      distance = dist(width / 2, height / 2, x, y)
-      distances[x][y] = distance / max_distance * 255
-    end
+  grid(width, height) do |x, y|
+    distance = dist(width / 2, height / 2, x, y)
+    distances[x][y] = distance / max_distance * 255
   end
 end
 

processing_app/basics/arrays/array_objects.rb

@@ -8,10 +8,8 @@ def setup
   wide_count = width / UNIT
   height_count = height / UNIT
   @mods = []
-  wide_count.times do |i|
-    height_count.times do |j|
-      mods << CustomObject.new(j * UNIT, i * UNIT, UNIT / 2, UNIT / 2, rand(0.05..0.8))
-    end
+  grid(wide_count, height_count) do |i, j|
+    mods << CustomObject.new(j * UNIT, i * UNIT, UNIT / 2, UNIT / 2, rand(0.05..0.8))
   end
   no_stroke
 end

processing_app/basics/arrays/custom_array.rb

@@ -8,10 +8,8 @@ def setup
   wide_count = width / UNIT
   height_count = height / UNIT
   @custom_array = CustomArray.new
-  height_count.times do |i|
-    wide_count.times do |j|
-      custom_array.add_object(j * UNIT, i * UNIT, UNIT / 2, UNIT / 2, rand(0.05..0.8))
-    end
+  grid(wide_count, height_count) do |i, j|
+    custom_array.add_object(j * UNIT, i * UNIT, UNIT / 2, UNIT / 2, rand(0.05..0.8))
   end
   no_stroke
 end
@@ -33,19 +31,19 @@ def settings
 
 # The custom Array created using Forwardable
 # Processing::Proxy gives access to PApplet methods
-class CustomArray 
+class CustomArray
   extend Forwardable
   def_delegators(:@objs, :each, :<<)
   include Enumerable, Processing::Proxy
-  
+
   def initialize
     @objs = []
   end
-  
+
   def add_object(mx, my, x, y, speed)
     self << Particle.new(x.to_i, y.to_i, mx, my, UNIT, speed, 1, 1)
   end
-  
+
   def update
     each do |obj|
       update_x obj
@@ -54,15 +52,15 @@ def update
       obj.y += obj.ydir
     end
   end
-  
+
   def update_x(obj)
     obj.x += obj.speed * obj.xdir
     return if (0..UNIT).cover? obj.x
     obj.xdir *= -1
     obj.x += obj.xdir
     obj.y += obj.ydir
   end
-  
+
   def draw
     background(0)
     fill(255)
@@ -71,4 +69,3 @@ def draw
     end
   end
 end
-

processing_app/topics/cellular_automata/game_of_life.rb

@@ -34,12 +34,10 @@ def setup
 def draw
   background(0)
   # Draw live cells
-  row.times do |x|
-    column.times do |y|
-      if cells[x][y]
-        fill(alive)
-        rect(x * CELL_SIZE, y * CELL_SIZE, CELL_SIZE, CELL_SIZE)
-      end
+  grid(row, column) do |x, y|
+    if cells[x][y]
+      fill(alive)
+      rect(x * CELL_SIZE, y * CELL_SIZE, CELL_SIZE, CELL_SIZE)
     end
   end
   # Iterate if timer ticks
@@ -88,9 +86,9 @@ def tick!  # When the clock ticks
       (x - 1..x + 1).each do |xx|
         (y - 1..y + 1).each do |yy|
           # Make sure you are not out of bounds
-          next unless [(xx >= 0), (xx < row), (yy >= 0), (yy < column)].all? 
+          next unless [(xx >= 0), (xx < row), (yy >= 0), (yy < column)].all?
           # Make sure to check against self
-          next if [(xx == x), (yy == y)].all? 
+          next if [(xx == x), (yy == y)].all?
           # Check alive neighbours and count them
           neighbours += 1 if cells_buffer[xx][yy]
         end # End of yy loop