ruby-processing 2.6.2 → 2.6.3

data/samples/external_library/ruby_gem/draw_test.rb

@@ -108,13 +108,13 @@ def train
 end
 
 def result_label(result)
-  if result.inject(0, :+).between?(1.9, 2.1)
+  if result.reduce(0, :+).between?(1.9, 2.1)
     if result[0] < 0.01 && result[1].between?(0.99, 1.0) && result[2].between?(0.99, 1.0)
       return "CIRCLE"
     else
       return "UNKNOWN"
     end
-  elsif result.inject(0, :+).between?(0.95, 1.1)
+  elsif result.reduce(0, :+).between?(0.95, 1.1)
     if result[0].between?(0.95, 1.0) && (result[1] + result[2]) < 0.01
       return "TRIANGLE"
     elsif result[1].between?(0.95, 1.0) && (result[0] + result[2]) < 0.01

data/samples/external_library/ruby_gem/game_of_life.rb

@@ -87,8 +87,8 @@ def tick!  # When the clock ticks
     (0 ... column).each do |y|
       # And visit all the neighbours of each cell
       neighbours = 0 # We'll count the neighbours
-      (x - 1 .. x + 1).each do |xx|
-        (y - 1 .. y + 1).each do |yy|
+      (x - 1..x + 1).each do |xx|
+        (y - 1..y + 1).each do |yy|
           # Make sure you are not out of bounds
           if [(xx>=0), (xx<row), (yy>=0), (yy<column)].all? {|in_bounds| in_bounds == true}
             # Make sure to check against self
@@ -101,7 +101,7 @@ def tick!  # When the clock ticks
         end # End of yy loop
       end #End of xx loop
       # We've checked the neighbours: apply rules in one line (only in ruby)!
-      cells.set([x, y], (cells_buffer.get([x, y]))?  ((2 .. 3) === neighbours) : (neighbours == 3))
+      cells.set([x, y], (cells_buffer.get([x, y]))?  ((2..3) === neighbours) : (neighbours == 3))
     end # End of y loop
   end # End of x loop
 end # End of function

data/samples/processing_app/basics/arrays/array_objects.rb

@@ -12,7 +12,7 @@ def setup
   @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))
+      mods << CustomObject.new(j * UNIT, i * UNIT, UNIT/2, UNIT/2, rand(0.05..0.8))
     end
   end    
   no_stroke
@@ -41,7 +41,7 @@ class CustomObject
   
   def update
     @x += @speed * @xdir
-    unless (0 .. size).cover? x 
+    unless (0..size).cover? x 
       @xdir *= -1
       @x += @xdir
       @y += @ydir

data/samples/processing_app/basics/color/hue.rb

@@ -15,7 +15,7 @@ end
 def draw
   (width/@bar_width).times do |i|
     n = i * @bar_width
-    range = (n .. n + @bar_width)
+    range = (n..n + @bar_width)
     @hue[i] = mouse_y if range.include?(mouse_x)
     fill @hue[i], height/1.2, height/1.2
     rect n, 0, @bar_width, height

data/samples/processing_app/basics/control/conditionals1.rb

@@ -1,14 +1,14 @@
-# Conditions are like questions. 
-# They allow a program to decide to take one action if 
+# Conditions are like questions.
+# They allow a program to decide to take one action if
 # the answer to a question is true or to do another action
-# if the answer to the question is false. 
+# if the answer to the question is false.
 # The questions asked within a program are always logical
-# or relational statements. For example, if the variable 'i' is 
+# or relational statements. For example, if the variable 'i' is
 # "even" then draw short line, else draw a long one.
 
 
 def setup
-  size 640, 360  
+  size 640, 360
   background 0
   stroke_weight 8
   (5 ... width/2).step(5) do |i|
@@ -25,22 +25,3 @@ def draw_long(i)
   stroke 153
   line i * 2, 20, i * 2, 180
 end
-
-
-# Ruby allows us to extend base classes, such as numbers, with
-# methods of our choosing. In this case we'll add methods that tell
-# you whether a given integer is divisible by 2, which here we declare
-# as even or odd.
-
-class Fixnum
-  
-  def even?
-    self % 2 == 0
-  end
-  
-  def odd?
-    !even?
-  end
-  
-end
-

data/samples/processing_app/basics/control/conditionals2.rb

@@ -12,7 +12,7 @@ def setup
   (2 ... width - 2 ).step(2) do |i|
     
     # If 'i' divides by 20 with no remainder 
-    # draw the first line .. 
+    # draw the first line..
     # else if 'i' divides by 10 with no remainder 
     # draw second line, else draw third line
     

data/samples/processing_app/basics/form/bezier_ellipse.rb

@@ -24,7 +24,7 @@ end
 def draw
   background 145
   draw_ellipse
-  set_ellipse rand(3 .. 12), rand(-100 .. 150), rand(-100 .. 150)
+  set_ellipse rand(3..12), rand(-100..150), rand(-100..150)
 end
 
 def draw_ellipse    

data/samples/processing_app/basics/form/brick_tower.rb

@@ -12,7 +12,7 @@ def setup
   @brick_layers = 18
   @brick_width, @brick_height, @brick_depth = 60, 25, 25
   @radius = 175.0
-  @angle = 0  
+  @angle = 0
   @brick = Cubeish.new(@brick_width, @brick_height, @brick_depth)
 end
 
@@ -24,7 +24,7 @@ def draw
   lights
   translate(width / 2.0, height * 1.2, -380)             # move viewpoint into position
   rotate_x(-45.radians)                                  # tip tower to see inside
-  rotate_y(frame_count * PI/600)                         # slowly rotate tower
+  rotate_y(frame_count * PI / 600)                         # slowly rotate tower
   brick_layers.times { |i| draw_layer(i) }
 end
 
@@ -42,9 +42,8 @@ def draw_bricks(brick_num)
   translate temp_x, temp_y, temp_z
   rotate_y(angle.radians)
   top_layer = layer_num == brick_layers - 1
-  even_brick = brick_num % 2 == 0
   brick.create unless top_layer                          # main tower
-  brick.create if top_layer && even_brick                # add crenelation
+  brick.create if top_layer && brick_num.even?           # add crenelation
   pop_matrix
   @angle += 360.0 / bricks_per_layer
 end
@@ -65,13 +64,11 @@ class Cubeish
            top: ['-- ', '---', ' --', ' - '],
            bottom: ['-  ', '- -', '  -', '   ']}
 
-  SIGNS = {'-' => -1,
-           ' ' =>  1}
+  SIGNS = {'-' => -1, ' ' =>  1}
 
   def initialize(width, height, depth)
     @vertices = {}
     @w, @h, @d = width, height, depth
-
     SIDES.each do |side, signs|
       vertices[side] = signs.map do |s|
         s = s.split('').map { |el| SIGNS[el] }
@@ -87,7 +84,6 @@ class Cubeish
       end_shape
     end
   end
-
 end
 
 Vect = Struct.new(:x, :y, :z)

data/samples/processing_app/basics/form/regular_polygon.rb

@@ -37,7 +37,7 @@ end
 def polygon(x, y, radius, npoints)
   angle = TAU / npoints
   begin_shape
-  (0 .. TAU).step(angle) do |a|
+  (0..TAU).step(angle) do |a|
     sx = x + cos(a) * radius
     sy = y + sin(a) * radius
     vertex(sx, sy)

data/samples/processing_app/basics/form/star.rb

@@ -36,7 +36,7 @@ def star(x, y, radius1, radius2, npoints)
   angle = TAU / npoints
   half_angle = angle/2.0
   begin_shape
-  (0 .. TAU).step(angle) do |a|
+  (0..TAU).step(angle) do |a|
     sx = x + cos(a) * radius2
     sy = y + sin(a) * radius2
     vertex(sx, sy)

data/samples/processing_app/basics/form/triangle_strip.rb

@@ -24,7 +24,7 @@ def draw
   step = 180.0/pts # degrees
   
   begin_shape TRIANGLE_STRIP
-  (0 .. pts).each do 
+  (0..pts).each do 
     px = x + cos(angle.radians)*outer_radius
     py = y + sin(angle.radians)*outer_radius
     angle += step

data/samples/processing_app/basics/input/storing_input.rb

@@ -30,7 +30,7 @@ def draw
   which = frame_count % NUM
   pos[which] = Vec.new(mouse_x, mouse_y)
   
-  (1 .. NUM).each do |i|
+  (1..NUM).each do |i|
     # which + 1 is the smallest (the oldest in the array)
     idx = (which + i) % NUM
     ellipse(pos[idx].x, pos[idx].y, i, i)

data/samples/processing_app/basics/lights/spot.rb

@@ -9,7 +9,7 @@ def setup
   
   size 640, 360, P3D
   
-  @concentration = 600 # try values between 1 <-> 10000
+  @concentration = 600 # try values between 1 <-> 10_000
   
   no_stroke
   fill 204

data/samples/processing_app/basics/math/additive_wave.rb

@@ -16,8 +16,8 @@ def setup
   @dx = []					        # Value for incrementing X, to be calculated as a function of period and x_spacing
   
   @max_waves.times do |i|
-    amplitude << rand(10 .. 30)
-    period = rand(100 .. 300) # How many pixels before the wave repeats
+    amplitude << rand(10..30)
+    period = rand(100..300) # How many pixels before the wave repeats
     dx << (TAU / period) * @x_spacing
   end
   

data/samples/processing_app/basics/math/double_random.rb

@@ -22,9 +22,9 @@ def draw
   background 0
   rand_y = 0.0  
   (1 ... steps).each do |i|
-    noise_y = (rand_y > 0)? rand(-rand_y .. rand_y) : rand(rand_y .. -rand_y)    
+    noise_y = (rand_y > 0)? rand(-rand_y..rand_y) : rand(rand_y..-rand_y)    
     point( (width/steps) * i, (height/2) + noise_y )
-    rand_y += rand(-5 .. 5)  
+    rand_y += rand(-5..5)  
   end
 end
 

data/samples/processing_app/basics/math/noise_wave.rb

@@ -23,7 +23,7 @@ def draw
   # xoff = yoff # Option #2: 1D Noise
   
   # Iterate over horizontal pixels
-  (0 .. width).step(10) do |x|
+  (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

data/samples/processing_app/basics/math/random.rb

@@ -14,7 +14,7 @@ def draw
   background 0    
   (0...width).each do |i|    
     r = rand(255)
-    x = rand(0 .. width)
+    x = rand(0..width)
     stroke(r, 100)
     line(i, 0, x, height)
   end    

data/samples/processing_app/basics/objects/module.rb

@@ -62,7 +62,7 @@ class Particle
   attr_reader :loc, :vel, :acc, :lifespan
   def initialize(loc) 
     @acc = Vec2D.new(0, 0.05)
-    @vel = Vec2D.new(rand(-1.0 .. 1), rand(-2.0 .. 0))
+    @vel = Vec2D.new(rand(-1.0..1), rand(-2.0..0))
     @loc = loc    # loc.clone is unecessary in ruby
     @lifespan = 255.0
   end

data/samples/processing_app/basics/objects/struct.rb

@@ -30,7 +30,7 @@ def draw
   which = frame_count % NUM
   pos[which] = Vec.new(mouse_x, mouse_y)
   
-  (1 .. NUM).each do |i|
+  (1..NUM).each do |i|
     # which + 1 is the smallest (the oldest in the array)
     idx = (which + i) % NUM
     ellipse(pos[idx].x, pos[idx].y, i, i)

data/samples/processing_app/basics/structure/loop.rb

@@ -1,25 +1,30 @@
-# No Loop. 
-# 
+# No Loop.
+#
 # The noLoop() function causes draw() to only
 # execute once. Without calling noLoop(), draw()
-# executed continually. 
-attr_reader :y
+# executed continually.
+attr_reader :y, :clicked
 
-def setup    
-  size 640, 360    
-  @y = height / 2    
+def setup
+  size 640, 360
+  @y = height / 2
   stroke 255
-  frame_rate 30    
-  no_loop
+  frame_rate 30
+  @clicked = true
 end
 
-def draw  
-  background 0  	
+def draw
+  background 0
   @y = y - 1
-  @y = height if y < 0  	
+  @y = height if y < 0
   line 0, y, width, y
-end 
+end
 
 def mouse_pressed
-  loop
+  unless clicked
+    no_loop
+  else
+    loop
+  end
+  @clicked = !clicked
 end

data/samples/processing_app/basics/structure/recursion2.rb

@@ -12,9 +12,9 @@ def draw_circle (x, y, radius, level)
   ellipse x, y, radius * 2, radius * 2  	
   if level > 1  	    
     level = level - 1
-    num = rand(2 .. 6)  		
+    num = rand(2..6)  		
     0.upto(num-1) do |i|  			
-      a = rand(0 .. TAU)
+      a = rand(0..TAU)
       nx = x + cos(a) * 8.0 * level
       ny = y + sin(a) * 6.0 * level
       draw_circle nx, ny, radius / 2, level

data/samples/processing_app/basics/textures/texture3.rb

@@ -1,64 +1,44 @@
-# Texture 3. 
-# 
-# Load an image and draw it onto a cylinder and a quad. 
+# Texture 3.
+#
+# Load an image and draw it onto a cylinder and a quad.
 
 attr_reader :tube_res, :tube_x, :tube_y, :img
 
 def setup
-  
   size 640, 360, P3D
-  
   @tube_res = 32
   @tube_x = []
   @tube_y = []
-  
-  @img = load_image "berlin-1.jpg"
-  
+  @img = load_image 'berlin-1.jpg'
   angle = 270.0 / tube_res
-  
-  (0...tube_res).each { |i|
-    tube_x.push cos( radians( i * angle ) )
-    tube_y.push sin( radians( i * angle ) )
+  (0 ... tube_res).each { |i|
+    tube_x.push cos((i * angle).radians)
+    tube_y.push sin((i * angle).radians)
   }
-  
   no_stroke
-  
 end
 
 def draw
-  
   background 0
-  
-  translate width/2, height/2
-  rotate_x map( mouse_y, 0, height, -PI, PI )
-  rotate_y map( mouse_x, 0, width, -PI, PI )
-  
+  translate width / 2, height / 2
+  rotate_x map1d(mouse_y, (0..height), (-PI..PI))
+  rotate_y map1d(mouse_x, (0..width), (-PI..PI))
   begin_shape QUAD_STRIP
-    
   texture img
-  
-  (0...tube_res).each { |i|
-    
+  (0 ... tube_res).each { |i|
     x = tube_x[i] * 100
     z = tube_y[i] * 100
     u = img.width / tube_res * i
-    
     vertex x, -100, z, u, 0
     vertex x,  100, z, u, img.height
-    
   }
-  
   end_shape
-  	
   begin_shape QUADS
-  
   texture img
-  
   vertex   0, -100, 0,   0, 0
   vertex 100, -100, 0, 100, 0
   vertex 100,  100, 0, 100, 100
   vertex   0,  100, 0,   0, 100
-  
   end_shape
-  
-end  
+
+end

data/samples/processing_app/basics/transform/birds.rb

@@ -13,11 +13,11 @@ def setup
   size 640, 360, P3D
   no_stroke
   lights
-  @birds = (0 .. BIRD_COUNT).map {     
-    Bird.new(rand(-300 .. 300), rand(-300 .. 300), rand(-2500 .. -500), rand(5 .. 30), rand(5 .. 30))   
-    .set_flight(rand(20 .. 340), rand(30 .. 350), rand( 1000 .. 4800 ), rand(-160 .. 160), rand(-55 .. 55), rand(-20 .. 20))    
-    .set_wing_speed(rand(0.1 .. 3.75))
-    .set_rot_speed(rand(0.025 .. 0.15))    
+  @birds = (0..BIRD_COUNT).map {     
+    Bird.new(rand(-300..300), rand(-300..300), rand(-2500..-500), rand(5..30), rand(5..30))   
+    .set_flight(rand(20..340), rand(30..350), rand( 1000..4800 ), rand(-160..160), rand(-55..55), rand(-20..20))    
+    .set_wing_speed(rand(0.1..3.75))
+    .set_rot_speed(rand(0.025..0.15))    
   } 
 end
 

data/samples/processing_app/basics/transform/cubes_in_cube.rb

@@ -20,11 +20,11 @@ def setup
   @cubes = []
   
   0.upto( @cube_count ) do |i|    
-    cube_size = rand(5 .. 15)    
+    cube_size = rand(5..15)    
     c = Cube.new(cube_size)    
     c.position = Vec3D.new(0.0, 0.0, 0.0)
-    c.speed    = Vec3D.new(rand(-1.0 .. 1), rand(-1.0 .. 1), rand(-1.0 .. 1)) 
-    c.rotation = Vec3D.new(rand(40 .. 100), rand(40 .. 100), rand(40 .. 100))    
+    c.speed    = Vec3D.new(rand(-1.0..1), rand(-1.0..1), rand(-1.0..1)) 
+    c.rotation = Vec3D.new(rand(40..100), rand(40..100), rand(40..100))    
     @cubes << c
   end