modified: samples/processing_app/basics/math/arctangent.rb

	modified:   samples/processing_app/basics/math/distance1.rb
	modified:   samples/processing_app/basics/math/distance2.rb
	modified:   samples/processing_app/basics/math/noise_1_d.rb
	modified:   samples/processing_app/basics/math/noise_2_d.rb
	modified:   samples/processing_app/basics/math/noise_3_d.rb
	modified:   samples/processing_app/basics/math/noise_wave.rb
	modified:   samples/processing_app/basics/math/operator_precedence.rb
	modified:   samples/processing_app/basics/math/polar_to_cartesian.rb
	modified:   samples/processing_app/basics/math/random.rb
	modified:   samples/processing_app/basics/math/sine_wave.rb

Author: monkstone

samples/processing_app/basics/math/arctangent.rb

@@ -1,44 +1,47 @@
-# Move the mouse to change the direction of the eyes. 
-# The atan2() function computes the angle from each eye 
-# to the cursor. 
+# Move the mouse to change the direction of the eyes.
+# The atan2() function computes the angle from each eye
+# to the cursor.
+attr_reader :eyes
 
 def setup
   size 640, 360
   @eyes = [
-  Eye.new(420, 230, 220),
-  Eye.new(250,  16, 120), 
-  Eye.new(164, 185,  80)
+    Eye.new(420, 230, 220),
+    Eye.new(250,  16, 120),
+    Eye.new(164, 185,  80)
   ]
   no_stroke
 end
 
 def draw
   background 102
-  
-  @eyes.each do |eye|
+  eyes.each do |eye|
     eye.update mouse_x, mouse_y
-    eye.display self
+    eye.display
   end
 end
 
+# Using Processing::Proxy to mimic java inner class access
 class Eye
+  include Processing::Proxy
+
+  attr_reader :angle, :x, :y, :size
   def initialize(x, y, sz) # contructor, called by Eye.new
     @x, @y, @size = x, y, sz
   end
-  
+
   def update(mx, my)
-    @angle = atan2(my - @y, mx - @x)
+    @angle = atan2(my - y, mx - x)
   end
-  
-  def display( context )
-    context.push_matrix
-    context.translate @x, @y
-    context.fill 255
-    context.ellipse 0, 0, @size, @size
-    context.rotate @angle
-    context.fill 153
-    context.ellipse @size/4, 0, @size/2, @size/2
-    context.pop_matrix
+
+  def display
+    push_matrix
+    translate x, y
+    fill 255
+    ellipse 0, 0, size, size
+    rotate angle
+    fill 153
+    ellipse size / 4, 0, size / 2, size / 2
+    pop_matrix
   end
 end
-

samples/processing_app/basics/math/distance1.rb

@@ -1,46 +1,35 @@
-# Distance 1D. 
-# 
-# Move the mouse left and right to control the 
-# speed and direction of the moving shapes. 
+# Distance 1D.
+#
+# Move the mouse left and right to control the
+# speed and direction of the moving shapes.
 
-
-def setup    
+def setup
   size 640, 360
   no_stroke
   frame_rate 60
-  
   @thin = 8
   @thick = 36
   @xpos1 = width / 2
   @xpos2 = width / 2
   @xpos3 = width / 2
   @xpos4 = width / 2
-  
 end
 
 def draw
-  
   background 0
-  
   mx = mouse_x * 0.4 - width / 5.0
-  
   fill 102
-  rect @xpos2, 0, @thick, height/2
-  
+  rect @xpos2, 0, @thick, height / 2
   fill 204
-  rect @xpos1, 0, @thin, height/2
-  
+  rect @xpos1, 0, @thin, height / 2
   fill 102
-  rect @xpos4, height/2, @thick, height/2
-  
+  rect @xpos4, height / 2, @thick, height / 2
   fill 204
-  rect @xpos3, height/2, @thin, height/2
-  
-  @xpos1 += mx/16
-  @xpos2 += mx/64
-  @xpos3 -= mx/16
-  @xpos4 -= mx/64
-  
+  rect @xpos3, height / 2, @thin, height / 2
+  @xpos1 += mx / 16
+  @xpos2 += mx / 64
+  @xpos3 -= mx / 16
+  @xpos4 -= mx / 64
   @xpos1 = width if @xpos1 < -@thin
   @xpos1 = -@thin if @xpos1 > width
   @xpos2 = width if @xpos2 < -@thick
@@ -49,5 +38,4 @@ def draw
   @xpos3 = -@thin if @xpos3 > width
   @xpos4 = width if @xpos4 < -@thick
   @xpos4 = -@thick if @xpos4 > width
-  
 end

samples/processing_app/basics/math/distance2.rb

@@ -1,22 +1,21 @@
-# Distance 2D. 
-# 
-# Move the mouse across the image to obscure and reveal the matrix.  
+# Distance 2D.
+#
+# Move the mouse across the image to obscure and reveal the matrix.
 # Measures the distance from the mouse to each square and sets the
-# size proportionally. 
+# size proportionally.
 
-def setup    
-  size 640, 360    
+def setup
+  size 640, 360
   no_stroke
-  @max_distance = dist(0, 0, width, height)    
+  @max_distance = dist(0, 0, width, height)
 end
 
-def draw  
-  background 51  
-  (0..width).step(20) do |i|  	
-    (0..height).step(20) do |j|  		
-      size = dist(mouse_x, mouse_y, i, j) 
-      size = size / @max_distance * 66      
+def draw
+  background 51
+  (0..width).step(20) do |i|
+    (0..height).step(20) do |j|
+      size = dist(mouse_x, mouse_y, i, j) / @max_distance * 66
       ellipse i, j, size, size
     end
-  end  
+  end
 end

samples/processing_app/basics/math/noise_1_d.rb

@@ -1,21 +1,20 @@
-# Noise1D. 
-# 
-# Using 1D Perlin Noise to assign location. 
+# Noise1D.
+#
+# Using 1D Perlin Noise to assign location.
 
-
-def setup  
-  size 640, 360  
+def setup
+  size 640, 360
   @xoff = 0.0
-  @x_increment = 0.01  
+  @x_increment = 0.01
   background 0
-  no_stroke  
+  no_stroke
 end
 
-def draw  
+def draw
   fill 0, 10
-  rect 0, 0, width, height  
-  n = noise(@xoff) * width  
-  @xoff += @x_increment  
+  rect 0, 0, width, height
+  n = noise(@xoff) * width
+  @xoff += @x_increment
   fill 200
-  ellipse n, height/2, 64, 64  
+  ellipse n, height / 2, 64, 64
 end

samples/processing_app/basics/math/noise_2_d.rb

@@ -1,30 +1,27 @@
-# Noise2D 
-# by Daniel Shiffman.  
-# 
-# Using 2D noise to create simple texture. 
+# Noise2D
+# by Daniel Shiffman.
+#
+# Using 2D noise to create simple texture.
 
-
-def setup    
-  size 640, 360   
-  @increment = 0.02   
+def setup
+  size 640, 360
+  @increment = 0.02
 end
 
-def draw    
-  background 0  	
-  load_pixels  	
-  xoff = 0.0 
-  detail = map(mouse_x, 0, width, 0.1, 0.6)
+def draw
+  background 0
+  load_pixels
+  xoff = 0.0
+  detail = map1d(mouse_x, (0..width), (0.1..0.6))
   noise_detail(8, detail)
-  (0...width).each { |x|  	    
+  (0...width).each do |x|
     xoff += @increment
-    yoff = 0.0  		
-    (0...height).each { |y|  		    
-      yoff += @increment  			
-      bright = noise(xoff, yoff) * 255  			
-      pixels[x+y*width] = color bright
-    }
-  }  	
-  update_pixels  	
+    yoff = 0.0
+    (0...height).each do |y|
+      yoff += @increment
+      bright = noise(xoff, yoff) * 255
+      pixels[x + y * width] = color(bright)
+    end
+  end
+  update_pixels
 end
-
-

samples/processing_app/basics/math/noise_3_d.rb

@@ -1,30 +1,30 @@
-# Noise3D. 
-# 
-# Using 3D noise to create simple animated texture. 
+# Noise3D.
+#
+# Using 3D noise to create simple animated texture.
 # Here, the third dimension ('z') is treated as time.
 attr_reader :increment, :z_increment
 
-def setup    
+def setup
   size 640, 360
-  frame_rate 30    
+  frame_rate 30
   @increment = 0.01
   @zoff = 0.0
-  @z_increment = 0.02    
+  @z_increment = 0.02
 end
 
-def draw    
-  background 0  	
-  load_pixels  	
-  xoff = 0.0  	
-  (0...width).each do |x|  	    
+def draw
+  background 0
+  load_pixels
+  xoff = 0.0
+  (0...width).each do |x|
     xoff += increment
-    yoff = 0.0  		
-    (0...height).each do |y|  		    
-      yoff += increment  			
-      bright = noise( xoff, yoff, @zoff ) * 255  			
+    yoff = 0.0
+    (0...height).each do |y|
+      yoff += increment
+      bright = noise(xoff, yoff, @zoff) * 255
       pixels[x + y * width] = color(bright, bright, bright)
     end
-  end  	
-  update_pixels  	
-  @zoff += z_increment  	
+  end
+  update_pixels
+  @zoff += z_increment
 end

samples/processing_app/basics/math/noise_wave.rb

@@ -1,35 +1,31 @@
 #
 # Noise Wave
-# by Daniel Shiffman.  
-# 
-# Using Perlin Noise to generate a wave-like pattern. 
+# by Daniel Shiffman.
 #
+# Using Perlin Noise to generate a wave-like pattern.
+# Note the use of ruby-processing map1d in place of processing "map"
 
 attr_reader :yoff         # 2nd dimension of perlin noise
 
 def setup
   size(640, 360)
-  @yoff = 0.0        
+  @yoff = 0.0
 end
 
 def draw
   background(51)
-
   fill(255)
   # We are going to draw a polygon out of the wave points
-  begin_shape 
-  
+  begin_shape
   xoff = 0       # Option #1: 2D Noise
   # xoff = yoff # Option #2: 1D Noise
-  
   # Iterate over horizontal pixels
   (0..width).step(10) do |x|
-    # Calculate a y value according to noise, map to 
-    y = map(noise(xoff, yoff), 0, 1, 200,300) # Option #1: 2D Noise
-    # y = map(noise(xoff), 0, 1, 200,300)    # Option #2: 1D Noise
-    
+    # Calculate a y value according to noise, map to
+    y = map1d(noise(xoff, yoff), (0..1.0), (200..300)) # Option #1: 2D Noise
+    # y = map1d(noise(xoff), (0..1.0), (200..300)) # Option #2: 1D Noise
     # Set the vertex
-    vertex(x, y) 
+    vertex(x, y)
     # Increment x dimension for noise
     xoff += 0.05
   end