modified: samples/processing_app/basics/data/variable_scope.rb

	modified:   samples/processing_app/basics/data/variables.rb
	modified:   samples/processing_app/basics/math/additive_wave.rb
	modified:   samples/processing_app/basics/math/graphing_2_d_equation.rb
	modified:   samples/processing_app/basics/math/interpolate.rb
	modified:   samples/processing_app/basics/math/modulo.rb
	modified:   samples/processing_app/basics/math/random_gaussian.rb
	modified:   samples/processing_app/basics/math/sine.rb
	modified:   samples/processing_app/basics/math/sine_cosine.rb

Author: monkstone

samples/processing_app/basics/data/variable_scope.rb

@@ -1,63 +1,54 @@
-# Variables may either have a global or local "scope". 
+# Variables may either have a global or local "scope".
 # For example, variables declared within either the
 # setup or draw functions may be only used in these
 # functions. Global variables, variables declared outside
 # of setup and draw, may be used anywhere within the program.
 # If a local variable is declared with the same name as a
-# global variable, the program will use the local variable to make 
+# global variable, the program will use the local variable to make
 # its calculations within the current scope. Variables may be localized
 # within classes, functions, and iterative statements.
 
-# Please note that there are some changes on variable scope inside blocks
-# between Ruby versions 1.8 and 1.9.
-
-
 def setup
   background 51
   stroke 255
   no_loop
-  
-  @a = 20 # Use "@" before the name to create an instance variable ("@a"), 
+  @a = 20 # Use "@" before the name to create an instance variable ("@a"),
   # which will be available anywhere inside this instance of "VariableScope".
 end
 
 def draw
-  # Draw a line using the instance variable "a", 
+  # Draw a line using the instance variable "a",
   # as returned by its getter function below
   line a, 0, a, height
-  
   # Create a new variable "a" local to the block (do-end)
   (50..80).step(2) do |a|
     line a, 0, a, height
   end
-  
   # Create a new variable "a" local to the draw method
   a = 100
   line a, 0, a, height
-  
   # Make a call to the custom function draw_another_line
   draw_another_line
-  
   # Make a call to the custom function draw_yet_another_line
   draw_yet_another_line
 end
 
 def draw_another_line
   # Create a new variable "a" local to this method
   a = 185
-  
   # Draw a line using the local variable "a"
   line a, 0, a, height
 end
 
 def draw_yet_another_line
-  # Because no new local variable "a" is set, this line draws using the 
-  # instance variable "a" (returned by its getter function) which was 
+  # Because no new local variable "a" is set, this line draws using the
+  # instance variable "a" (returned by its getter function) which was
   # set to the value 20 in setup.
-  line a+2, 0, a+2, height
+  line a + 2, 0, a + 2, height
 end
 
-# This is a "getter" function, it returns the value of the instance variable "a"
+# This is a "getter" function, it returns the value of the instance variable "a" which is
+# completely pointless in ruby, use instead attr_reader see below
 def a
   @a
 end
@@ -71,4 +62,3 @@ def a
 
 # Or you could just have Ruby add both at once with:
 # attr_accessor :a
-

samples/processing_app/basics/data/variables.rb

@@ -1,35 +1,30 @@
-# Variables are used for storing values. In this example, changing 
-# the values of variables @one and @two significantly changes the composition. 
+# Variables are used for storing values. In this example, changing
+# the values of variables @one and @two significantly changes the composition.
 
 load_library :control_panel
 attr_reader :panel
 def setup
-  size 200, 200  
-  stroke 153    
+  size 200, 200
+  stroke 153
   @one = 20 # Change these with the sliders
-  @two = 50    
+  @two = 50
   control_panel do |c|
     c.slider :one, -20..100
     c.slider :two, -20..100
     @panel = c
-  end  
+  end
 end
 
-
 def draw
   panel.set_visible(true)
-  background 0    
+  background 0
   c = @one * 8
   d = @one * 9
   e = @two - @one
   f = @two * 2
   g = f  + e
-  
   line @one, f, @two,  g
   line @two, e, @two,  g
   line @two, e, d,     c
-  line @one, e, d-e,   c
+  line @one, e, d - e,   c
 end
-
-
-

samples/processing_app/basics/math/additive_wave.rb

@@ -1,26 +1,25 @@
-
-
 # Additive Wave
-# by Daniel Shiffman. 
-# 
-# Create a more complex wave by adding two waves together. 
+# by Daniel Shiffman.
+#
+# Create a more complex wave by adding two waves together.
 attr_reader :dx, :amplitude, :max_waves, :y_values
 
 def setup
   size 640, 360
-  @max_waves = 4				    # Total number of waves to add together
-  @wave_width = width + 16	# Width of entire wave
-  @x_spacing = 8				    # How far apart should each horizontal location be spaced
+  @max_waves = 4				     # Total number of waves to add together
+  @wave_width = width + 16	 # Width of entire wave
+  @x_spacing = 8				     # How far apart each horizontal location is spaced
   @theta = 0.0
-  @amplitude = []				    # Height of wave
-  @dx = []					        # Value for incrementing X, to be calculated as a function of period and x_spacing
-  
-  @max_waves.times do |i|
+  @amplitude = []	           # Height of wave
+  # Value for incrementing X, to be calculated as a function of period and x_spacing
+  @dx = []
+
+  @max_waves.times do
     amplitude << rand(10..30)
     period = rand(100..300) # How many pixels before the wave repeats
     dx << (TAU / period) * @x_spacing
   end
-  
+
   frame_rate 30
   color_mode RGB, 255, 255, 255, 100
   smooth
@@ -35,16 +34,14 @@ def draw
 def calculate_wave
   # Increment theta (try different values for 'angular velocity' here
   @theta += 0.02
-  
   # Set all height values to zero
-  @y_values = Array.new @wave_width/@x_spacing, 0
-  
+  @y_values = Array.new @wave_width / @x_spacing, 0
   # Accumulate wave height values
   max_waves.times do |j|
     x = @theta
     y_values.length.times do |i|
       # Every other wave is cosine instead of sine
-      value = (j % 2) == 0 ? sin(x) : cos(x)
+      value = j.even? ? sin(x) : cos(x)
       y_values[i] += value * amplitude[j]
       x += dx[j]
     end
@@ -57,8 +54,6 @@ def render_wave
   fill 255, 50
   ellipse_mode CENTER
   y_values.each_with_index do |y, i|
-    ellipse i*@x_spacing, width/2+y, 16, 16
+    ellipse i * @x_spacing, width / 2 + y, 16, 16
   end
 end
-
-

samples/processing_app/basics/math/graphing_2_d_equation.rb

@@ -1,12 +1,12 @@
 #
 # Graphing 2D Equations
-# by Daniel Shiffman. 
-# 
-# Graphics the following equation: 
-# sin(n*cos(r) + 5*theta) 
-# where n is a function of horizontal mouse location.  
+# by Daniel Shiffman.
 #
- 
+# Graphics the following equation:
+# sin(n*cos(r) + 5*theta)
+# where n is a function of horizontal mouse location.
+#
+
 def setup
   size(640, 360)
 end
@@ -22,18 +22,17 @@ def draw
   width.times do |i|
     y = -h / 2        # Start y at -1 * height / 2
     height.times do |j|
-      r = sqrt((x * x) + (y * y))    # Convert cartesian to polar
-      theta = atan2(y, x)            # Convert cartesian to polar
+      r = sqrt((x * x) + (y * y))          # Convert cartesian to polar
+      theta = atan2(y, x)                  # Convert cartesian to polar
       # Compute 2D polar coordinate function
-      val = sin(n * cos(r) + 5 * theta)        # Results in a value between -1 and 1
-      #val = cos(r)                            # Another simple function
-      #val = sin(theta)                        # Another simple function
-      # Map the resulting value to a grayscale value
-      pixels[i + j * width] = color((val + 1.0) * 255.0/2.0)     # Scale to between 0 and 255
-      y += dy                # Increment y
+      val = sin(n * cos(r) + 5 * theta)    # Results in a value between -1 and 1
+      # val = cos(r)                       # Another simple function
+      # val = sin(theta)                   # Another simple function
+      # Map the resulting value to a grayscale value. Scale to between 0 and 255
+      pixels[i + j * width] = color((val + 1.0) * 255.0 / 2.0)
+      y += dy                              # Increment y
     end
-    x += dx                  # Increment x
+    x += dx                                # Increment x
   end
   update_pixels
 end
-

samples/processing_app/basics/math/interpolate.rb

@@ -1,33 +1,31 @@
 #
-# Linear Interpolation. 
-# 
-# Move the mouse across the screen and the symbol will follow.  
-# Between drawing each frame of the animation, the ellipse moves 
-# part of the distance (0.05) from its current position toward 
+# Linear Interpolation.
+#
+# Move the mouse across the screen and the symbol will follow.
+# Between drawing each frame of the animation, the ellipse moves
+# part of the distance (0.05) from its current position toward
 # the cursor using the lerp() function
 #
-# This is the same as the Easing under input only with lerp() instead. 
+# This is the same as the Easing under input only with lerp() instead.
 #
- 
+
 attr_reader :x, :y
 
 def setup
-  size(640, 360) 
-  no_stroke  
+  size(640, 360)
+  no_stroke
+  @x, @y = width / 2, height / 2
 end
 
-def draw 
+def draw
   background(51)
-  
-  # lerp() calculates a number between two numbers at a specific increment. 
-  # The amt parameter is the amount to interpolate between the two values 
-  # where 0.0 equal to the first point, 0.1 is very near the first point, 0.5 
-  # is half-way in between, etc.  
-  
+  # lerp() calculates a number between two numbers at a specific increment.
+  # The amt parameter is the amount to interpolate between the two values
+  # where 0.0 equal to the first point, 0.1 is very near the first point, 0.5
+  # is half-way in between, etc.
   # Here we are moving 5% of the way to the mouse location each frame
   @x = lerp(x, mouse_x, 0.05)
   @y = lerp(y, mouse_y, 0.05)
-  
   fill(255)
   stroke(255)
   ellipse(x, y, 66, 66)

samples/processing_app/basics/math/modulo.rb

@@ -1,39 +1,25 @@
-# Modulo. 
-# 
-# The modulo operator (%) returns the remainder of a number 
-# divided by another. As in this example, it is often used 
-# to keep numerical values within a set range. 
-
+# Modulo.
+#
+# The modulo operator (%) returns the remainder of a number
+# divided by another. As in this example, it is often used
+# to keep numerical values within a set range.
 
 def setup
-  
   size 200, 200
-  
   @c = 0.0
   @num = 20
-  
   fill 255
   frame_rate 30
-  
 end
 
 def draw
-  
   background 0
-  
   @c += 0.1
-  
-  (1...(height/@num)).each { |i|
-    
-    x = (@c %i ) * i * i
+  (1...height / @num).each do |i|
+    x = (@c % i) * i * i
     stroke 102
-    
-    line 0, i*@num, x, i*@num
-    
+    line 0, i * @num, x, i * @num
     no_stroke
-    
-    rect x, i*@num-@num/2, 8, @num
-  }
-  
+    rect x, i * @num - @num / 2, 8, @num
+  end
 end
-

samples/processing_app/basics/math/random_gaussian.rb

@@ -1,8 +1,7 @@
-#
 # Random Gaussian. 
 # 
-# This sketch draws ellipses with x and y locations tied to a gaussian distribution of random numbers.
-#
+# This sketch draws ellipses with x and y locations tied to a gaussian distribution of 
+# random numbers.
 
 def setup
   size(640, 360)
@@ -12,12 +11,10 @@ def setup
 def draw
   # Get a gaussian random number w/ mean of 0 and standard deviation of 1.0
   val = random_gaussian
-  sd = 60                  # Define a standard deviation
-  mean = width/2           # Define a mean value (middle of the screen along the x-axis)
-  x = (val * sd) + mean    # Scale the gaussian random number by standard deviation and mean
+  sd = 60                # Define a standard deviation
+  mean = width / 2       # Define a mean value (middle of the screen along the x-axis)
+  x = (val * sd) + mean  # Scale the gaussian random number by standard deviation and mean
   fill(200, 20)
   no_stroke
-  ellipse(x, height/2, 32, 32)   # Draw an ellipse at our "normal" random location
+  ellipse(x, height / 2, 32, 32)   # Draw an ellipse at our "normal" random location
 end
-
-