ruby-processing 2.6.2 → 2.6.3

data/samples/processing_app/topics/image_processing/blur.rb

@@ -28,8 +28,8 @@ def draw
   (1 ... img.height - 1).each do |y| 
     (1 ... img.width - 1).each do |x| 
       sum = 0 # Kernel sum for this pixel
-      (-1 .. 1).each do |ky| 
-        (-1 .. 1).each do |kx|
+      (-1..1).each do |ky| 
+        (-1..1).each do |kx|
           # Calculate the adjacent pixel for this kernel point
           pos = (y + ky) * img.width + (x + kx)
           # Image is grayscale, red/green/blue are identical

data/samples/processing_app/topics/image_processing/edge_detection.rb

@@ -25,8 +25,8 @@ def draw
   (1 ... img.height - 1).each do |y| 
     (1 ... img.width - 1).each do |x| 
       sum = 0 # Kernel sum for this pixel
-      (-1 .. 1).each do |ky| 
-        (-1 .. 1).each do |kx|
+      (-1..1).each do |ky| 
+        (-1..1).each do |kx|
           # Calculate the adjacent pixel for this kernel point
           pos = (y + ky)*img.width + (x + kx)
           # Image is grayscale, red/green/blue are identical

data/samples/processing_app/topics/lsystems/cstest.rb

@@ -10,7 +10,7 @@ def setup
   fill(200, 200, 0)
   f = create_font('Arial', 16, true)
   text_font(f)
-  (0 .. 7).each do |i|
+  (0..7).each do |i|
     grammar = Grammar.new(
       'baaaaaa',
       {

data/samples/processing_app/topics/lsystems/library/stochastic_grammar/stochastic_grammar.rb

@@ -17,7 +17,7 @@ class StochasticGrammar
   #####################################################
 
   def stochastic_rule(rules)
-    total = rules.inject(0) do |sum, rule_and_weight|
+    total = rules.reduce(0) do |sum, rule_and_weight|
       sum + rule_and_weight[PROB]
     end
     srand

data/samples/processing_app/topics/motion/bouncy_bubbles.rb

@@ -16,7 +16,7 @@ def setup
   size(640, 360)
   @balls = []
   (0 ... NUM_BALLS).each do |i|
-    balls << Ball.new(rand(width), rand(height), rand(30 .. 70), i, balls)
+    balls << Ball.new(rand(width), rand(height), rand(30..70), i, balls)
   end
   noStroke
   fill(255, 204)

data/samples/processing_app/topics/motion/brownian.rb

@@ -24,8 +24,8 @@ def draw
     ay[i-1] = ay[i]
   end  
   # Put a new value at the end of the array
-  ax[NUM-1] += rand(-RANGE .. RANGE)
-  ay[NUM-1] += rand(-RANGE .. RANGE)
+  ax[NUM-1] += rand(-RANGE..RANGE)
+  ay[NUM-1] += rand(-RANGE..RANGE)
   
   # Constrain all points to the screen
   ax[NUM-1] = constrain(ax[NUM-1], 0, width)

data/samples/processing_app/topics/motion/circle_collision.rb

@@ -10,7 +10,7 @@ class Ball
     @position = Vec2D.new(x, y)
     @r = r
     @m = r * 0.1
-    @velocity = Vec2D.new(rand(-3.0 .. 3), rand(-3.0 .. 3))
+    @velocity = Vec2D.new(rand(-3.0..3), rand(-3.0..3))
   end 
   
   def update

data/samples/processing_app/topics/motion/cubes_in_cube.rb

@@ -27,7 +27,7 @@ def setup
   @cubies = []
   CUBE_NO.times do 
     # Cubies are randomly sized
-    cubie_size = rand(5 .. 15)
+    cubie_size = rand(5..15)
     cubies << Cube.new(cubie_size, cubie_size, cubie_size)
   end
   smooth 8

data/samples/processing_app/topics/motion/library/cube/cube.rb

@@ -22,7 +22,7 @@ class Cube
     # Random velocity vector
     @velocity = Vect.random_3d
     # Random rotation
-    @rotation = Vect.new(rand(40 .. 100), rand(40 .. 100), rand(40 .. 100))
+    @rotation = Vect.new(rand(40..100), rand(40..100), rand(40..100))
     
     # cube composed of 6 quads
     #front
@@ -116,7 +116,7 @@ end
 Vect = Struct.new(:x, :y, :z) do
 
   def self.random_3d
-    Vect.new(rand(-1 .. 1.0), rand(-1 .. 1.0), rand(-1 .. 1.0))
+    Vect.new(rand(-1..1.0), rand(-1..1.0), rand(-1..1.0))
   end
 
   def add v

data/samples/processing_app/topics/motion/morph.rb

@@ -1,6 +1,6 @@
 #
-# Morph. 
-# see vecmath library for a variant using Vec2D instead of PVector 
+# Morph.
+# see vecmath library for a variant using Vec2D instead of PVector
 # Changing one shape into another by interpolating
 # vertices from one to another
 #
@@ -14,10 +14,10 @@ def setup
   @morph = []
   @state = false
   # Create a circle using vectors pointing from center
-  (0 .. 360).step(9) do |angle|
+  (0..360).step(9) do |angle|
     # Note we are not starting from 0 in order to match the
-    # path of a circle.  
-    v = PVector.from_angle(radians(angle-135))
+    # path of a circle.
+    v = PVector.from_angle((angle - 135).radians)
     v.mult(100)
     circle << v
     # Let's fill out morph Array with blank PVectors while we are at it
@@ -26,11 +26,11 @@ def setup
 
   # A square is a bunch of vertices along straight lines
   # Top of square
-  (-50 .. 50).step(10) do |x|
+  (-50..50).step(10) do |x|
     square << PVector.new(x, -50)
   end
   # Right side
-  (-50 .. 50).step(10) do |y|
+  (-50..50).step(10) do |y|
     square << PVector.new(50, y)
   end
   # Bottom, NB: can't negative step ruby so use your loaf
@@ -48,25 +48,25 @@ def draw
 
   # We will keep how far the vertices are from their target
   total_distance = 0
-  
+
   # Look at each vertex
   circle.length.times do |i|
     # Are we lerping to the circle or square?
     v1 = (state)?  circle[i] : square[i]
     # Get the vertex we will draw
     v2 = morph[i]
-    
+
     # Lerp to the target
     v2.lerp(v1, 0.1)
     # Check how far we are from target
     total_distance += PVector.dist(v1, v2)
   end
-  
+
   # If all the vertices are close, switch shape
   if (total_distance < 0.1)
     @state = !state
   end
-  
+
   # Draw relative to center
   translate(width/2, height/2)
   stroke_weight(4)

data/samples/processing_app/topics/motion/moving_on_curves.rb

@@ -1,6 +1,6 @@
 #
-# Moving On Curves. 
-# 
+# Moving On Curves.
+#
 # In this example, the circles moves along the curve y = x^4.
 # Click the mouse to have it move to a new position.
 #
@@ -13,7 +13,7 @@ def setup
   @begin_x = 20.0  # Initial x-coordinate
   @begin_y = 10.0  # Initial y-coordinate
   @end_x = 570.0   # Final x-coordinate
-  @end_y = 320.0   # Final y-coordinate  
+  @end_y = 320.0   # Final y-coordinate
   @exponent = 4   # Determines the curve
   @x = 0.0        # Current x-coordinate
   @y = 0.0        # Current y-coordinate
@@ -29,7 +29,7 @@ def draw
   @pct += STEP
   if (pct < 1.0)
     @x = begin_x + (pct * dist_x)
-    @y = begin_y + (pow(pct, exponent) * dist_y)
+    @y = begin_y + pct**exponent * dist_y
   end
   fill(255)
   ellipse(x, y, 20, 20)

data/samples/processing_app/topics/motion/puff.rb

@@ -21,10 +21,10 @@ def setup
   @speed_x = 0.7
   @speed_y = 0.9
   # Fill body arrays
-  @radii_x = Array.new(CELLS, rand(-7 .. 7)) 
-  @radii_y = Array.new(CELLS, rand(-7 .. 7) )
-  @frequency = Array.new(CELLS, rand(-7 .. 7) )
-  @cell_radius= Array.new(CELLS, rand(16 .. 30) )
+  @radii_x = Array.new(CELLS, rand(-7..7)) 
+  @radii_y = Array.new(CELLS, rand(-7..7) )
+  @frequency = Array.new(CELLS, rand(-7..7) )
+  @cell_radius= Array.new(CELLS, rand(16..30) )
   @angle = Array.new(CELLS, 0)
   @px = Array.new(CELLS, 0)
   @py = Array.new(CELLS, 0)

data/samples/processing_app/topics/motion/reflection1.rb

@@ -22,7 +22,7 @@ def setup
   # start ellipse at middle top of screen
   @position = Vec2D.new(width/2, 0)  
   # set initial random direction
-  @direction = Vec2D.new(rand(-1.0 .. 1), rand(-1.0 .. 1))
+  @direction = Vec2D.new(rand(-1.0..1), rand(-1.0..1))
   @velocity = Vec2D.new
 end
 
@@ -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/topics/motion/reflection2.rb

@@ -21,7 +21,7 @@ def setup
   # Initialize ground peak heights 
   @peakHeights = []
   (SEGS + 1).times do
-    @peakHeights << rand(height - 40.0 .. height - 30.0)
+    @peakHeights << rand(height - 40.0..height - 30.0)
   end
   @ground = []  
   

data/samples/processing_app/topics/shaders/bw_shader.rb

@@ -26,7 +26,7 @@ def create_can(r, h, detail, tex)
   sh.begin_shape(QUAD_STRIP)
   sh.no_stroke
   sh.texture(tex)
-  (0 .. detail).each do |i|
+  (0..detail).each do |i|
     angle = TAU / detail
     x = sin(i * angle)
     z = cos(i * angle)

data/samples/processing_app/topics/shaders/glsl_heightmap_noise.rb

@@ -53,10 +53,10 @@ def draw
   rotate_z(frame_count * 0.005)  # dynamic frameCount-based rotation over the Z axis
 
   background(0) # black background
-  perspective(PI/3.0, width.to_f / height, 0.1, 1000000) # perspective for close shapes
+  perspective(PI/3.0, width.to_f / height, 0.1, 1_000_000) # perspective for close shapes
   scale(750) # scale by 750 (the model itself is unit length
 
-  displace.set('time', millis / 5000.0) # feed time to the GLSL shader
+  displace.set('time', millis / 5_000.0) # feed time to the GLSL shader
   shader(displace)                        # use shader
   shape(height_map)                       # display the PShape
 

data/samples/processing_app/topics/simulate/flocking.rb

@@ -1,11 +1,11 @@
 #
-# Flocking 
-# by Daniel Shiffman.  
-# 
+# Flocking
+# by Daniel Shiffman.
+#
 # An implementation of Craig Reynold's Boids program to simulate
-# the flocking behavior of birds. Each boid steers itself based on 
+# the flocking behavior of birds. Each boid steers itself based on
 # rules of avoidance, alignment, and coherence.
-# 
+#
 # Click the mouse to add a new boid.
 #
 load_libraries :flock, :vecmath
@@ -17,7 +17,7 @@ def setup
   @flock = Flock.new
   # Add an initial set of boids into the system
   150.times do
-    flock << Boid.new(width/2, height/2)
+    flock << Boid.new(width / 2, height / 2)
   end
 end
 

data/samples/processing_app/topics/simulate/library/flock/flock.rb

@@ -1,63 +1,55 @@
 # The Flock (a list of Boid objects)
+require 'forwardable'
+
+class Flock
+  include Enumerable
+  extend Forwardable
+  def_delegators(:@boids, :<<, :each)
 
-class Flock 
-  extend Enumerable
-  
   attr_reader :boids
-  
-  def initialize
-    @boids = []	  
-  end
 
-  def each &block
-    boids.each &block	  
-  end
-  
-  def << obj
-    boids << obj
+  def initialize
+    @boids = []
   end
 
   def run
-    self.each do |bird|
+    each do |bird|
       bird.run(self)  # Passing the entire list of boids to each boid individually
     end
   end
-  
 end
 
 # The Boid class
 
 class Boid
   include Processing::Proxy
-  
+
   MAXSPEED = 2
   MAXFORCE = 0.03
-  
+
   attr_reader :width, :height
-  attr_reader :location, :velocity, :acceleration, :sz, :maxforce_squared, :maxspeed_squared
-  
+  attr_reader :location, :velocity, :acceleration, :sz
+
   def initialize(x, y)
     @width, @height = $app.width, $app.height
     @acceleration = Vec2D.new(0, 0)
-    @velocity = Vec2D.new(rand(-1.0 .. 1), rand(-1.0 .. 1))
+    @velocity = Vec2D.new(rand(-1.0..1), rand(-1.0..1))
     @location = Vec2D.new(x, y)
     @sz = 4.0
-    @maxspeed_squared = MAXSPEED * MAXSPEED
-    @maxforce_squared = MAXFORCE * MAXFORCE
   end
-  
+
   def run(boids)
     flock(boids)
     update
     borders
     render
   end
-  
+
   def apply_force(force)
     # We could add mass here if we want A = F / M
     @acceleration += force
   end
-  
+
   # We accumulate a new acceleration each time based on three rules
   def flock boids
     sep = separate(boids)   # Separation
@@ -72,18 +64,18 @@ class Boid
     apply_force(ali)
     apply_force(coh)
   end
-  
+
   # Method to update location
   def update
     # Update velocity
     @velocity += acceleration
     # Limit speed
-    velocity.set_mag(MAXSPEED) {velocity.mag_squared > maxspeed_squared}
+    velocity.set_mag(MAXSPEED) {velocity.mag > MAXSPEED}
     @location += velocity
     # Reset accelertion to 0 each cycle
     @acceleration *= 0
   end
-  
+
   # A method that calculates and applies a steering force towards a target
   # STEER = DESIRED MINUS VELOCITY
   def seek(target)
@@ -93,13 +85,13 @@ class Boid
     desired *= MAXSPEED
     # Steering = Desired minus Velocity
     steer = desired - velocity
-    steer.set_mag(MAXFORCE) {steer.mag_squared > maxforce_squared} # Limit to maximum steering force
+    steer.set_mag(MAXFORCE) {steer.mag > MAXFORCE} # Limit to maximum steering force
     steer
   end
 
   def render
     # Draw a triangle rotated in the direction of velocity
-    theta = velocity.heading + radians(90)
+    theta = velocity.heading + 90.radians
     fill(200,100)
     stroke(255)
     push_matrix
@@ -115,7 +107,7 @@ class Boid
 
   # Wraparound
   def borders
-    if (location.x < -sz * 0.5) 
+    if (location.x < -sz * 0.5)
       location.x = width + sz * 0.5
     end
     if (location.y < -sz * 0.5)
@@ -128,7 +120,7 @@ class Boid
       location.y = -sz * 0.5
     end
   end
-          
+
   # Separation
   # Method checks for nearby boids and steers away
   def separate boids
@@ -137,7 +129,7 @@ class Boid
     count = 0
     # For every boid in the system, check if it's too close
     boids.each do |other|
-      d = Vec2D.dist(location, other.location)
+      d = location.dist(other.location)
       # If the distance is greater than 0 and less than an arbitrary amount (0 when you are yourself)
       if ((d > 0) && (d < desiredseparation))
         # Calculate vector pointing away from neighbor
@@ -152,18 +144,18 @@ class Boid
     if (count > 0)
       steer /= count.to_f
     end
-    
+
     # As long as the vector is greater than 0
     if (steer.mag > 0)
       # Implement Reynolds: Steering = Desired - Velocity
       steer.normalize!
       steer *= MAXSPEED
       steer -= velocity
-      steer.set_mag(MAXFORCE) {steer.mag_squared > maxforce_squared}
+      steer.set_mag(MAXFORCE) {steer.mag > MAXFORCE}
     end
     return steer
   end
-    
+
   # Alignment
   # For every nearby boid in the system, calculate the average velocity
   def align boids
@@ -171,7 +163,7 @@ class Boid
     sum = Vec2D.new(0, 0)
     count = 0
     boids.each do |other|
-      d = Vec2D.dist(location, other.location)
+      d = location.dist(other.location)
       if ((d > 0) && (d < neighbordist))
         sum += other.velocity
         count += 1
@@ -182,13 +174,13 @@ class Boid
       sum.normalize!
       sum *= MAXSPEED
       steer = sum - velocity
-      steer.set_mag(MAXFORCE) {steer.mag_squared > maxforce_squared}
+      steer.set_mag(MAXFORCE) {steer.mag > MAXFORCE}
       return steer
     else
       return Vec2D.new
     end
   end
-    
+
   # Cohesion
   # For the average location (i.e. center) of all nearby boids, calculate steering vector towards that location
   def cohesion boids
@@ -196,14 +188,14 @@ class Boid
     sum = Vec2D.new   # Start with empty vector to accumulate all locations
     count = 0
     boids.each do |other|
-      d = Vec2D.dist(location, other.location)
+      d = location.dist(other.location)
       if ((d > 0) && (d < neighbordist))
         sum += other.location # Add location
         count += 1
       end
     end
     sum /= count unless (count == 0)        # avoid div by zero
-    return (count > 0)? seek(sum) : Vec2D.new 
+    return (count > 0)? seek(sum) : Vec2D.new
   end
 end