ruby-processing 2.6.2 → 2.6.3

data/samples/processing_app/library/vecmath/vec2d/morph.rb

@@ -21,7 +21,7 @@ def setup
   @renderer = AppRender.new(self)
   frame_rate(15)
   # Create a circle using vectors pointing from center
-  (ALPHA .. OMEGA).step(THETA) do |angle|
+  (ALPHA..OMEGA).step(THETA) do |angle|
     # Note we are not starting from 0 in order to match the
     # path of a circle.
     circle << Vec2D.from_angle(angle) * 100
@@ -31,11 +31,11 @@ def setup
 
   # A square is a bunch of vertices along straight line
   # Top of square
-  (-50 .. 50).step(10) do |x|
+  (-50..50).step(10) do |x|
     square << Vec2D.new(x, -50)
   end
   # Right side
-  (-50 .. 50).step(10) do |y|
+  (-50..50).step(10) do |y|
     square << Vec2D.new(50, y)
   end
   # Bottom, NB: can't negative step ruby so use your loaf

data/samples/processing_app/library/vecmath/vec2d/particle_system_pshape.rb

@@ -12,14 +12,14 @@ attr_reader :ps
 def setup
   size(640, 360, P2D)
   # Load the image
-  sprite = loadImage('sprite.png')
+  sprite = load_image('sprite.png')
   # A new particle system with 10,000 particles
   @ps = ParticleSystem.new(width, height, sprite, 10_000)
   # Writing to the depth buffer is disabled to avoid rendering
   # artifacts due to the fact that the particles are semi-transparent
   # but not z-sorted.
   hint(DISABLE_DEPTH_MASK)
-end 
+end
 
 def draw
   background(0)
@@ -31,6 +31,6 @@ def draw
   # Display frame rate
   fill(255, 0, 255)
   text_size(16)
-  text("Frame rate: #{frame_rate.round(1)}", 10, 20)
+  text("Frame rate: #{format('%0.1f', frame_rate)}", 10, 20)
 end
 

data/samples/processing_app/library/vecmath/vec2d/reflection1.rb

@@ -87,8 +87,8 @@ def draw
     @position.y = radius
     @direction.y *= -1
     # randomize base top
-    @base1.y = rand(height - 100 .. height)
-    @base2.y = rand(height - 100 .. height)
+    @base1.y = rand(height - 100..height)
+    @base2.y = rand(height - 100..height)
     @coords = create_ground
   end
 end

data/samples/processing_app/library/vecmath/vec2d/seeking_neural.rb

@@ -9,7 +9,7 @@ module SeekingNeural
   class Perceptron
     # Perceptron is created with n weights and learning constant
     def initialize(n, c)
-      @weights = Array.new(n) { rand(0 .. 1.0) }
+      @weights = Array.new(n) { rand(0..1.0) }
       @c = c
     end
     
@@ -25,7 +25,8 @@ module SeekingNeural
     # Give me a steering result
     def feedforward(forces)
       # Sum all values
-      forces.zip(@weights).map { |a, b| a * b }.inject(Vec2D.new, :+)
+      forces.zip(@weights).map { |a, b| a * b }.reduce(Vec2D.new, :+)
+      # forces.zip(@weights).map { |a, b| a * b }.reduce(:+)
     end
   end
   

data/samples/processing_app/library/vecmath/vec2d/simple_particle_system.rb

@@ -58,7 +58,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/library/vecmath/vec3d/frame_of_reference.rb

@@ -20,10 +20,10 @@ def setup
   FACE_COUNT.times do |i|
 
     # calc some random triangles in 3 space
-    val = Vec3D.new(rand(-width/2 .. width/2), rand(-width/2 .. width/2), rand(-width/2 .. width/2))
-    v0 = Vec3D.new(rand(-val.x .. -val.x + 100), rand(-val.y .. -val.y + 100), rand(-val.z .. -val.z + 100))
-    v1 = Vec3D.new(rand(-val.x .. -val.x + 100), rand(-val.y .. -val.y + 100), rand(-val.z .. -val.z + 100))
-    v2 = Vec3D.new(rand(-val.x .. -val.x + 100), rand(-val.y .. -val.y + 100), rand(-val.z .. -val.z + 100))
+    val = Vec3D.new(rand(-width/2..width/2), rand(-width/2..width/2), rand(-width/2..width/2))
+    v0 = Vec3D.new(rand(-val.x..-val.x + 100), rand(-val.y..-val.y + 100), rand(-val.z..-val.z + 100))
+    v1 = Vec3D.new(rand(-val.x..-val.x + 100), rand(-val.y..-val.y + 100), rand(-val.z..-val.z + 100))
+    v2 = Vec3D.new(rand(-val.x..-val.x + 100), rand(-val.y..-val.y + 100), rand(-val.z..-val.z + 100))
     p << Plane.new([v0, v1, v2])
 
     # build some cute little cylinders

data/samples/processing_app/topics/advanced_data/library/word/word.rb

@@ -12,7 +12,7 @@ class Word
   def initialize(s)
     @width, @height = $app.width, $app.height
     @count_dracula, @count_franken, @total_count = 0, 0, 0
-    @position = [rand(width), rand(-height .. height*2)]
+    @position = [rand(width), rand(-height..height*2)]
     @word = s
   end
 

data/samples/processing_app/topics/advanced_data/load_save_XML.rb

@@ -90,7 +90,7 @@ def mouse_pressed
   # Set the diameter element
   diameter = bubble.add_child('diameter')
   # Here for a node's content, we have to convert to a String
-  diameter.set_content(rand(40.0 .. 80).to_s)
+  diameter.set_content(rand(40.0..80).to_s)
 
   # Set a label
   label = bubble.add_child('label')

data/samples/processing_app/topics/advanced_data/load_save_json.rb

@@ -47,7 +47,7 @@ class BubbleData
   end  
   
   def create_new_bubble x, y
-    self.add Bubble.new(x, y, rand(40 .. 80), 'new label')    
+    self.add Bubble.new(x, y, rand(40..80), 'new label')    
     save_data 
     load_data path
   end

data/samples/processing_app/topics/advanced_data/load_save_struct_yaml.rb

@@ -42,7 +42,7 @@ class BubbleData
   end
 
   def create_new_bubble x, y
-    self.add Bubble.new(x, y, rand(40 .. 80), 'new label')
+    self.add Bubble.new(x, y, rand(40..80), 'new label')
     save_data
     load_data path
   end

data/samples/processing_app/topics/advanced_data/load_save_yaml.rb

@@ -41,7 +41,7 @@ class BubbleData
   end  
   
   def create_new_bubble x, y
-    self.add Bubble.new(x, y, rand(40 .. 80), 'new label')    
+    self.add Bubble.new(x, y, rand(40..80), 'new label')    
     save_data 
     load_data path
   end

data/samples/processing_app/topics/advanced_data/threads_two.rb

@@ -16,8 +16,7 @@ def setup
   @curr = 0
   thread do    # supply a block in ruby-processing rather than use reflection
     FRAMES.times do |i|
-      frames << load_image("a#{i.to_s.rjust(3, "0")} copy.jpg") # ruby syntax
-      #frames << load_image("a#{nf(i, 3)} copy.jpg") # processing function nf           
+      frames << load_image("a#{i.to_s.rjust(3, '0')} copy.jpg") # ruby syntax
       @curr = i
       delay(75) #just slows down this thread - the main draw cycle is unaffected...
     end

data/samples/processing_app/topics/cellular_automata/game_of_life.rb

@@ -82,8 +82,8 @@ def tick!  # When the clock ticks
     column.times 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
@@ -96,7 +96,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[x][y] = (cells_buffer[x][y])?  ((2 .. 3) === neighbours) : (neighbours == 3)
+      cells[x][y] = (cells_buffer[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/topics/cellular_automata/library/ca/ca.rb

@@ -23,7 +23,7 @@ class CA
   
   # Return a random ruleset
   def randomize
-    @rules = Array.new(8) {rand(0 .. 1)}
+    @rules = Array.new(8) {rand(0..1)}
   end
   
   # Reset to generation 0
@@ -46,7 +46,7 @@ class CA
       nextgen[i] = execute_rules(left, me, right) # Compute next generation state based on ruleset
     end
     # Copy the array into current value
-    (1 .. cells.length - 1).each do |i|
+    (1..cells.length - 1).each do |i|
       cells[i] = nextgen[i]
     end
     @generation += 1

data/samples/processing_app/topics/cellular_automata/library/cell/cell.rb

@@ -38,7 +38,7 @@ class Cell
       elsif (outer.getpix(x + 1, y) == spore1 && outer.getpix(x + 1, y - 1) == black)
         move(1, -1)
       else
-        move(rand(1 .. 2), 0)
+        move(rand(1..2), 0)
       end
     elsif (my_color == spore2)
       if (outer.getpix(x - 1, y + 1) == black && outer.getpix(x + 1, y + 1) == black && outer.getpix(x, y + 1) == black)
@@ -52,7 +52,7 @@ class Cell
       elsif (outer.getpix(x - 1, y) == spore2 && outer.getpix(x - 1, y - 1) == black)
         move(-1, -1)
       else
-        move(rand(1 .. 2), 0)
+        move(rand(1..2), 0)
       end
     elsif (my_color == spore3)
       if (outer.getpix(x - 1, y - 1) == black && outer.getpix(x + 1, y - 1) == black && outer.getpix(x, y - 1) == black)
@@ -66,7 +66,7 @@ class Cell
       elsif (outer.getpix(x + 1, y) == spore3 && outer.getpix(x + 1, y + 1) == black)
         move(1, 1)
       else
-        move(rand(1 .. 2), 0)
+        move(rand(1..2), 0)
       end
     elsif (my_color == spore4)
       if (outer.getpix(x - 1, y - 1) == black && outer.getpix(x + 1, y - 1) == black && outer.getpix(x, y - 1) == black)
@@ -80,7 +80,7 @@ class Cell
       elsif (outer.getpix(x - 1, y) == spore4 && outer.getpix(x - 1, y + 1) == black)
         move(-1, 1)
       else
-        move(rand(1 .. 2), 0)
+        move(rand(1..2), 0)
       end
     end
   end

data/samples/processing_app/topics/cellular_automata/library/simple_cell/simple_cell.rb

@@ -28,7 +28,7 @@ class Cell
     if (outer.getpix(x + 1, y) == black)
       move(0, 1)
     elsif (outer.getpix(x, y - 1) != black && outer.getpix(x - 1, y - 1) != black)
-      move(rand(-4 .. 4), rand(-4 .. 4))     
+      move(rand(-4..4), rand(-4..4))     
     end
   end
   

data/samples/processing_app/topics/cellular_automata/spore1.rb

@@ -15,7 +15,7 @@ attr_reader  :cells, :black, :spore_colour
 MAX_CELLS = 6700
 
 # set lower for smoother animation, higher for faster simulation
-RUNS_PER_LOOP = 10000
+RUNS_PER_LOOP = 10_000
 
 def setup 
   size(640, 360)

data/samples/processing_app/topics/cellular_automata/spore2.rb

@@ -15,7 +15,7 @@ attr_reader  :cells, :black, :colours, :spore1, :spore2, :spore3, :spore4
 MAX_CELLS = 8000
 
 # set lower for smoother animation, higher for faster simulation
-RUNS_PER_LOOP = 10000
+RUNS_PER_LOOP = 10_000
 
 def setup 
   size(640, 360)

data/samples/processing_app/topics/create_shapes/group_pshape.rb

@@ -36,8 +36,8 @@ def setup
   path.begin_shape
   path.no_fill
   path.stroke(255)
-  (-PI .. 0).step(0.1) do |theta|
-    r = rand(60 .. 70)
+  (-PI..0).step(0.1) do |theta|
+    r = rand(60..70)
     path.vertex(r*cos(theta), r*sin(theta))
   end
   path.end_shape

data/samples/processing_app/topics/create_shapes/library/particle/particle_system.rb

@@ -50,7 +50,7 @@ class Particle
 
   def initialize width, height, sprite
     @width, @height, @sprite = width, height, sprite
-    part_size = rand(10 .. 60)
+    part_size = rand(10..60)
     # The particle is a textured quad
     @s_shape = create_shape
     s_shape.begin_shape(QUAD)
@@ -71,8 +71,8 @@ class Particle
   end
 
   def rebirth(x, y)
-    theta = rand(-PI .. PI)
-    speed = rand(0.5 .. 4)
+    theta = rand(-PI..PI)
+    speed = rand(0.5..4)
     # A velocity with random angle and magnitude
     @velocity = Vec2D.from_angle(theta)
     @velocity *= speed

data/samples/processing_app/topics/create_shapes/library/polygon/polygon.rb

@@ -7,9 +7,9 @@ class Polygon
 
   def initialize(s_, width, height)
     @x = rand(width)
-    @y = rand(-500 .. -100)
+    @y = rand(-500..-100)
     @s = s_
-    @speed = rand(2 .. 6)
+    @speed = rand(2..6)
     @height = height
   end
   

data/samples/processing_app/topics/create_shapes/library/star/star.rb

@@ -6,9 +6,9 @@ class Star
   def initialize(width, height)
     @width = width
     @height = height
-    @x = rand(100 .. width-100)
-    @y = rand(100 .. height-100) 
-    @speed = rand(0.5 .. 3)
+    @x = rand(100..width-100)
+    @y = rand(100..height-100) 
+    @speed = rand(0.5..3)
     # First create the shape
     @s = createShape
     s.beginShape

data/samples/processing_app/topics/create_shapes/particle_system_pshape.rb

@@ -14,7 +14,7 @@ def setup
   # Load the image
   sprite = loadImage('sprite.png')
   # A new particle system with 10,000 particles
-  @ps = ParticleSystem.new(width, height, sprite, 10000)
+  @ps = ParticleSystem.new(width, height, sprite, 10_000)
   # Writing to the depth buffer is disabled to avoid rendering
   # artifacts due to the fact that the particles are semi-transparent
   # but not z-sorted.

data/samples/processing_app/topics/create_shapes/path_pshape.rb

@@ -20,7 +20,7 @@ def setup
   
   x = 0
   # Calculate the path as a sine wave
-  (0 .. TAU).step(0.1) do |theta|
+  (0..TAU).step(0.1) do |theta|
     path.vertex(x,sin(theta)*100)
     x += 5
   end

data/samples/processing_app/topics/drawing/scribble_plotter.rb

@@ -64,13 +64,13 @@ def scribble(x1, y1, x2, y2, steps, scrib_val, style)
   (0 ... steps).each do |i|
     if(style == SCRIBBLE)
       if (i < steps-1)
-        line(x1, y1, x1 += x_step+rand(-scrib_val .. scrib_val), y1 += y_step + rand(-scrib_val .. scrib_val))      
+        line(x1, y1, x1 += x_step+rand(-scrib_val..scrib_val), y1 += y_step + rand(-scrib_val..scrib_val))      
       else
         # extra line needed to attach line back to point- not necessary in HATCHING style
         line(x1, y1, x2, y2)
       end
     elsif (style == HATCHING)
-      line(x1, y1, (x1 += x_step)+rand(-scrib_val .. scrib_val), (y1 += y_step) + rand(-scrib_val .. scrib_val))
+      line(x1, y1, (x1 += x_step)+rand(-scrib_val..scrib_val), (y1 += y_step) + rand(-scrib_val..scrib_val))
     end
   end
 end

data/samples/processing_app/topics/gui/button.rb

@@ -1,8 +1,8 @@
 #
-# Button. 
-# 
-# Hover on one of the colored objects in the 
-# center of the image to change their color 
+# Button.
+#
+# Hover on one of the colored objects in the
+# center of the image to change their color
 #
 
 RECT_SIZE = 90     # Diameter of rect
@@ -21,16 +21,16 @@ def setup
   @base_color = color(102)
   @current_color = base_color
   @circle_x = (width + CIRCLE_SIZE) / 2 + 10
-  @circle_y = height/2
-  @rect_x = width/2 - RECT_SIZE - 10
-  @rect_y = height/2 - RECT_SIZE / 2
+  @circle_y = height / 2
+  @rect_x = width / 2 - RECT_SIZE - 10
+  @rect_y = height / 2 - RECT_SIZE / 2
   ellipse_mode(CENTER)
 end
 
 def draw
   update(mouse_x, mouse_y)
   background(current_color)
-  
+
   if (rect_over)
     fill(rect_highlight)
   else
@@ -38,7 +38,7 @@ def draw
   end
   stroke(255)
   rect(rect_x, rect_y, RECT_SIZE, RECT_SIZE)
-  
+
   if (circle_over)
     fill(circle_highlight)
   else
@@ -49,26 +49,26 @@ def draw
 end
 
 def update(x, y)
-  if over_circle?(circle_x, circle_y, CIRCLE_SIZE) 
+  if over_circle?(circle_x, circle_y, CIRCLE_SIZE)
     @circle_over, @rect_over = true, false
-  elsif over_rect?(rect_x, rect_y, RECT_SIZE, RECT_SIZE) 
+  elsif over_rect?(rect_x, rect_y, RECT_SIZE, RECT_SIZE)
     @circle_over, @rect_over = false, true
   else
     @circle_over, @rect_over = false, false
   end
 end
 
-def mouse_pressed  
-  @current_color = (circle_over)? circle_color : (rect_over)? 
-  rect_color : current_color 
+def mouse_pressed
+  @current_color = (circle_over)? circle_color : (rect_over)?
+  rect_color : current_color
 end
 
 def over_rect?(x, y, width, height)
-  (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height)
+  (x..width + x).include?(mouse_x) && (y..height + y).include?(mouse_y)
 end
 
 def over_circle?(x, y, diameter)
   dis_x = x - mouse_x
   dis_y = y - mouse_y
-  (sqrt(sq(dis_x) + sq(dis_y)) < diameter/2 )
+  hypot(dis_x, dis_y) < diameter / 2
 end

data/samples/processing_app/topics/gui/rollover.rb

@@ -1,9 +1,9 @@
 #
-# Button. 
-# 
-# Click on one of the colored squares in the 
-# center of the image to change the color of 
-# the background. 
+# Button.
+#
+# Click on one of the colored squares in the
+# center of the image to change the color of
+# the background.
 #
 
 RECT_SIZE = 90     # Diameter of rect
@@ -26,26 +26,26 @@ def setup
 end
 
 def draw
-  update(mouse_x, mouse_y) 
-  if (rect_over) 
+  update(mouse_x, mouse_y)
+  if (rect_over)
     background(rect_color)
-  elsif (circle_over) 
+  elsif (circle_over)
     background(circle_color)
-  else 
+  else
     background(base_color)
   end
   stroke(255)
   fill(rect_color)
-  rect(rect_x, rect_y, RECT_SIZE, RECT_SIZE) 
+  rect(rect_x, rect_y, RECT_SIZE, RECT_SIZE)
   stroke(0)
   fill(circle_color)
   ellipse(circle_x, circle_y, CIRCLE_SIZE, CIRCLE_SIZE)
 end
 
 def update(x, y)
-  if over_circle?(circle_x, circle_y, CIRCLE_SIZE) 
+  if over_circle?(circle_x, circle_y, CIRCLE_SIZE)
     @circle_over, @rect_over = true, false
-  elsif over_rect?(rect_x, rect_y, RECT_SIZE, RECT_SIZE) 
+  elsif over_rect?(rect_x, rect_y, RECT_SIZE, RECT_SIZE)
     @circle_over, @rect_over = false, true
   else
     @circle_over, @rect_over = false, false
@@ -59,5 +59,5 @@ end
 def over_circle?(x, y, diameter)
   dis_x = x - mouse_x
   dis_y = y - mouse_y
-  (sqrt(sq(dis_x) + sq(dis_y)) < diameter/2 )
+  (hypot(dis_x, dis_y) < diameter/2 )
 end