ruby-processing 2.6.2 → 2.6.3

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

@@ -26,7 +26,7 @@ end
 
 def draw    
   background 51  	
-  @jitter = rand(-0.1 .. 0.1) if Time.now.sec.even? 	
+  @jitter = rand(-0.1..0.1) if Time.now.sec.even? 	
   @angle += @jitter
   translate width / 2, height / 2
   rotate cos(@angle)   	

data/samples/processing_app/basics/typography/kinetic_type.rb

@@ -49,7 +49,7 @@
     end
     
     def compute_curve(line_num)
-      base = millis / 10000.0 * PI * 2
+      base = millis / 10_000.0 * PI * 2
       sin((line_num + 1.0) * base) * sin((8.0 - line_num) * base)
     end
     

data/samples/processing_app/demos/graphics/bezier_patch.rb

@@ -16,7 +16,7 @@ RESI=NI*10
 RESJ=NJ*10
 
 attr_accessor :outp, :inp, :normp, :auto_normals, :arcball, :bez_patch
- 
+
 def setup
   size(1024, 768, P3D)
   ArcBall.init(self, width/2.0, height/2.0)
@@ -24,14 +24,14 @@ def setup
   build_geometry
   @bez_patch = build_shape
 end
- 
+
 def draw
   background(255)
   smooth(8)
   lights
   define_lights
   scale(0.9)
-  no_stroke 
+  no_stroke
   shape(bez_patch)
 end
 
@@ -44,34 +44,34 @@ def build_shape
   no_stroke
   bez = create_shape
   bez.begin_shape(QUAD_STRIP)
-  bez.fill(192, 192, 192) 
+  bez.fill(192, 192, 192)
   bez.ambient(20, 20, 20)
   bez.specular(30)
-  (0 ... RESI - 1).each do |i|        
+  (0 ... RESI - 1).each do |i|
     (0 ... RESJ).each do |j|
       if (!auto_normals)
         bez.normal(*normp[i][j])
       end
       bez.vertex(*outp[i][j])
-      bez.vertex(*outp[i+1][j])     
-    end    
+      bez.vertex(*outp[i+1][j])
+    end
   end
-  bez.end_shape     
-  return bez   
+  bez.end_shape
+  return bez
 end
 
 ##########
 # build geometry
 # for bez patch
 ##########
- 
+
 def build_geometry
   @outp = []
   @normp = []
-  @inp = Array.new(NI){|i| Array.new(NJ){|j| Vec3D.new(i, j, rand(-3.0 .. 3))}}
+  @inp = Array.new(NI){|i| Array.new(NJ){|j| Vec3D.new(i, j, rand(-3.0..3))}}
   uitang = Vec3D.new
-  ujtang = Vec3D.new  
-  
+  ujtang = Vec3D.new
+
   (0 ... RESI).each do |i|
     mui = i.fdiv(RESI - 1)
     row = []
@@ -88,7 +88,7 @@ def build_geometry
           bj = bezier_blend(kj, muj, NJ)
           dbj = d_bezier_blend(kj, muj, NJ)
 
-          vect += inp[ki][kj] * bi * bj        
+          vect += inp[ki][kj] * bi * bj
 
           uitang += inp[ki][kj] * dbi * bj
 
@@ -97,22 +97,22 @@ def build_geometry
       end
       vect += Vec3D.new(-NI / 2, -NJ / 2, 0)
       vect *= 100
-      row << vect.to_a       
+      row << vect.to_a
       uitang.normalize!
       ujtang.normalize!
-      row_n << uitang.cross(ujtang).to_a    
+      row_n << uitang.cross(ujtang).to_a
     end
     @outp << row
     @normp << row_n
   end
 end
- 
+
 def bezier_blend( k, mu,  n)
-  blend = 1.0 
+  blend = 1.0
   nn = n
   kn = k
   nkn = n - k
-  
+
   while (nn >= 1)
     blend *= nn
     nn -= 1
@@ -124,19 +124,19 @@ def bezier_blend( k, mu,  n)
       blend = blend.fdiv(nkn)
       nkn -= 1
     end
-  end    
-  blend *= pow(mu, k.to_f) if (k > 0)
-  blend *= pow(1-mu, (n - k).to_f) if (n - k > 0)
+  end
+  blend *= mu**k.to_f if (k > 0)
+  blend *= (1 - mu)**(n - k).to_f if (n - k > 0)
   return(blend)
 end
 
 def d_bezier_blend( k, mu,  n)
   dblendf = 1.0
-  
+
   nn = n
   kn = k
   nkn = n - k
-  
+
   while (nn >= 1)
     dblendf *= nn
     nn -= 1
@@ -149,25 +149,25 @@ def d_bezier_blend( k, mu,  n)
       nkn -= 1
     end
   end
-   
+
   fk = 1
   dk = 0
   fnk = 1
-  dnk = 0   
+  dnk = 0
   if (k > 0)
-    fk = pow(mu, k.to_f)
-    dk = k * pow(mu, (k - 1).to_f)
-  end 
+    fk = mu**k.to_f
+    dk = k * (mu**(k - 1).to_f)
+  end
   if (n - k > 0)
-    fnk = pow(1 - mu, (n - k).to_f)
-    dnk = (k - n)*pow(1 - mu, (n - k - 1).to_f)
+    fnk = (1 - mu)**(n - k).to_f
+    dnk = (k - n) * (1 - mu)**(n - k - 1).to_f
   end
   dblendf *= (dk * fnk + fk * dnk)
-  
-  return(dblendf) 
+
+  return(dblendf)
 end
 
-def define_lights    
+def define_lights
   ambient_light(40, 40, 40)
   point_light(30, 30, 30, 0, 0, 0)
   directional_light(60, 60, 60, 1, 0, 0)

data/samples/processing_app/demos/graphics/trefoil.rb

@@ -32,7 +32,7 @@ def draw
   background(0)
   
   pg.begin_draw    
-  pg.ellipse(rand(0.0 .. pg.width), rand(0.0 .. pg.height), 4, 4)
+  pg.ellipse(rand(0.0..pg.width), rand(0.0..pg.height), 4, 4)
   pg.end_draw 
 
   ambient(250, 250, 250)

data/samples/processing_app/demos/graphics/wiggling.rb

@@ -18,10 +18,10 @@ def setup
   @cosine = []
   wiggling = false 
   # Dry up that processing code a tiny bit
-  (0 .. TAU).step(TAU / CIRCLE_RES) do |i|
+  (0..TAU).step(TAU / CIRCLE_RES) do |i|
     sine << CIRCLE_RAD * sin(i)
   end
-  (0 .. TAU).step(TAU / CIRCLE_RES) do |i|
+  (0..TAU).step(TAU / CIRCLE_RES) do |i|
     cosine << CIRCLE_RAD * cos(i)
   end
   @cube = create_cube
@@ -41,9 +41,9 @@ def draw
       face = cube.get_child(i)
       face.get_vertex_count.times do |j|
       x, y, z = face.get_vertex_x(j), face.get_vertex_y(j), face.get_vertex_z(j)
-      x += rand(-NOISE_MAG/2 .. NOISE_MAG/2)
-      y += rand(-NOISE_MAG/2 .. NOISE_MAG/2)
-      z += rand(-NOISE_MAG/2 .. NOISE_MAG/2)
+      x += rand(-NOISE_MAG/2..NOISE_MAG/2)
+      y += rand(-NOISE_MAG/2..NOISE_MAG/2)
+      z += rand(-NOISE_MAG/2..NOISE_MAG/2)
       face.set_vertex(j, x, y, z)
     end
   end

data/samples/processing_app/demos/performance/esfera.rb

@@ -7,7 +7,7 @@
 #
 load_library :vecmath
 
-QUANTITY = 16000
+QUANTITY = 16_000
 
 attr_reader :orb, :phi, :radius, :rx, :ry
 
@@ -43,9 +43,9 @@ def draw
 end
 
 def create_hair radius
-  z = rand(-radius .. radius)
-  phi = rand(0 .. TAU)
-  len = rand(1.15 .. 1.2)
+  z = rand(-radius..radius)
+  phi = rand(0..TAU)
+  len = rand(1.15..1.2)
   theta = Math.asin(z / radius)
   Hair.new(z, phi, len, theta)
 end

data/samples/processing_app/demos/performance/text_rendering.rb

@@ -5,7 +5,7 @@ end
 
 def draw
   background(255)
-  (0 .. 10000).each do
+  (0..10_000).each do
     x = rand(width)
     y = rand(height)
     text("HELLO", x, y)

data/samples/processing_app/library/dxf/simple_export.rb

@@ -23,9 +23,9 @@ def draw
   translate(width / 3, height / 3, -200)
   rotate_z(map(mouse_y, 0, height, 0, PI))
   rotateY(map(mouse_x, 0, width, 0, HALF_PI))
-  (-2 .. 2).step do |y|
-    (-2 .. 2).step do |x| 
-      (-2 .. 2).step do |z|
+  (-2..2).step do |y|
+    (-2..2).step do |x| 
+      (-2..2).step do |z|
         push_matrix
         translate(120*x, 120*y, -120*z)
         sphere(30)

data/samples/processing_app/library/pdf/complex_3D.rb

@@ -21,35 +21,35 @@ def setup
     pt << rand(TAU) # Random X axis rotation
     pt << rand(TAU) # Random Y axis rotation
     
-    pt << rand(60 .. 80) # Short to quarter-circle arcs
+    pt << rand(60..80) # Short to quarter-circle arcs
     if (rand(100)>90)
-      pt[pt.length - 1] = rand(8 .. 27) * 10
+      pt[pt.length - 1] = rand(8..27) * 10
     end     
-    pt << rand(2 .. 50) * 5 # Radius. Space them out nicely
+    pt << rand(2..50) * 5 # Radius. Space them out nicely
     
-    pt << rand(4 .. 32) # Width of band
+    pt << rand(4..32) # Width of band
     if (rand(100) > 90)
-      pt[pt.length - 1] = rand(40 .. 60) # Width of band
+      pt[pt.length - 1] = rand(40..60) # Width of band
     end
     
-    pt << rand(0.005 .. 0.0334)# Speed of rotation
+    pt << rand(0.005..0.0334)# Speed of rotation
     
     # get colors
     prob = rand(100)
     case prob
-    when (0 .. 30)
+    when (0..30)
       style[i*2] = color_blended(rand, 255,0,100, 255,0,0, 210)
-    when (30 .. 70) 
+    when (30..70) 
       style[i*2] = color_blended(rand, 0,153,255, 170,225,255, 210)
-    when (70 .. 90) 
+    when (70..90) 
       style[i*2] = color_blended(rand, 200,255,0, 150,255,0, 210)
     else 
       style[i*2] = color(255,255,255, 220)
     end
     case prob
-    when (0 .. 50)
+    when (0..50)
       style[i*2] = color_blended(rand, 200,255,0, 50,120,0, 210)
-    when (50 .. 90)
+    when (50..90)
       style[i*2] = color_blended(rand, 255,100,0, 255,255,0, 210)
     else
       style[i*2] = color(255, 255, 255, 220)

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

@@ -30,7 +30,7 @@ def draw
   # Add gravity to velocity
   @velocity += gravity
   # Bounce off edges
-  velocity.x *= -1 unless (RADIUS .. width - RADIUS).include?(loc.x)
+  velocity.x *= -1 unless (RADIUS..width - RADIUS).include?(loc.x)
   if loc.y > (height - RADIUS)
     # We're reducing velocity ever so slightly 
     # when it hits the bottom of the window

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

@@ -72,7 +72,7 @@ end
 def empty_space(r)
   pos = nil
   while !pos || !empty_space?(pos, r) do
-    pos = Vec2D.new(rand(r .. width - r), rand(r .. height - r))
+    pos = Vec2D.new(rand(r..width - r), rand(r..height - r))
   end
   return pos
 end
@@ -162,8 +162,8 @@ end
 
 # reverse ball velocity if at sketch boundary
 def check_boundary_collision(ball)  
-  ball.velocity.x *= -1 unless (ball.r .. width - ball.r).include? ball.position.x 
-  ball.velocity.y *= -1 unless (ball.r .. height - ball.r).include? ball.position.y 
+  ball.velocity.x *= -1 unless (ball.r..width - ball.r).include? ball.position.x 
+  ball.velocity.y *= -1 unless (ball.r..height - ball.r).include? ball.position.y 
 end
 
 

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

@@ -7,7 +7,7 @@ class Flock
   include Enumerable
   
   def initialize(size, position)
-    @boids = (0 .. size).map{ Boid.new(position) }	  
+    @boids = (0..size).map{ Boid.new(position) }	  
   end
 
   def run
@@ -27,7 +27,7 @@ class Boid
   attr_reader :width, :height
   def initialize(loc)
     @acceleration = Vec2D.new
-    @velocity = Vec2D.new(rand(-1.0 .. 1), rand(-1.0 .. 1))
+    @velocity = Vec2D.new(rand(-1.0..1), rand(-1.0..1))
     @location = loc
     @r = 2.0
     @maxspeed = 2
@@ -122,7 +122,7 @@ class Boid
     boids.reject{ |bd| bd.equal? self }.each do |other|
       d = location.dist(other.location)
       # If the distance is greater than 0 and less than an arbitrary amount 
-      if (0.0001 .. desiredseparation).include? d
+      if (0.0001..desiredseparation).include? d
         # Calculate vector pointing away from neighbor
         diff = location - other.location
         diff.normalize!
@@ -156,7 +156,7 @@ class Boid
     count = 0
     boids.reject{ |bd| bd.equal? self }.each do |other|
       d = location.dist(other.location)
-      if (0 .. neighbordist).include? d
+      if (0..neighbordist).include? d
         sum += other.velocity
         count += 1
       end
@@ -180,7 +180,7 @@ class Boid
     count = 0
     boids.reject { |bd| bd.equal? self }.each do |other|
       d = location.dist(other.location)
-      if (0.0001 .. neighbordist).include? d
+      if (0.0001..neighbordist).include? d
         sum += other.location # Add location
         count += 1
       end

data/samples/processing_app/library/vecmath/vec2d/library/particle/{particle_system.rb → particle.rb}

@@ -1,17 +1,17 @@
 # The Particle System
 
-class ParticleSystem 
+class ParticleSystem
   include Processing::Proxy
 
   attr_reader :particles, :particle_shape
 
-  def initialize(width, height, sprite, n) 
+  def initialize(width, height, sprite, n)
     @particles = []
     # The PShape is a group
     @particle_shape = create_shape(GROUP)
 
     # Make all the Particles
-    n.times do |i|       
+    n.times do |i|
       particles << Particle.new(width, height, sprite)
       # Each particle's PShape gets added to the System PShape
       particle_shape.add_child(particles[i].s_shape)
@@ -24,10 +24,10 @@ class ParticleSystem
     end
   end
 
-  def set_emitter(x, y) 
+  def set_emitter(x, y)
     particles.each do |p|
-      # Each particle gets reborn at the emitter location     
-      p.rebirth(x, y) if (p.dead?) 
+      # Each particle gets reborn at the emitter location
+      p.rebirth(x, y) if (p.dead?)
     end
   end
 
@@ -41,15 +41,16 @@ end
 class Particle
   include Processing::Proxy
   
-  GRAVITY = Vec2D.new(0, 0.1) 
-  
-  attr_reader :center, :velocity, :lifespan, :s_shape, :part_size, 
-  :width, :height, :sprite
- 
+  GRAVITY = Vec2D.new(0, 0.1)
+
+  attr_reader :center, :velocity, :lifespan, :s_shape, :part_size,
+  :boundary_x, :boundary_y, :sprite
 
   def initialize width, height, sprite
-    @width, @height, @sprite = width, height, sprite
-    part_size = rand(10 .. 60)
+    @sprite = sprite
+    @boundary_x = Boundary.new(0, width)
+    @boundary_y = Boundary.new(0, height)
+    part_size = rand(10..60)
     # The particle is a textured quad
     @s_shape = create_shape
     s_shape.begin_shape(QUAD)
@@ -61,10 +62,8 @@ class Particle
     s_shape.vertex(+part_size / 2.0, +part_size / 2.0, sprite.width, sprite.height)
     s_shape.vertex(-part_size / 2.0, +part_size / 2.0, 0, sprite.height)
     s_shape.end_shape
-
     # Initialize center vector
-    @center = Vec2D.new 
-    
+    @center = Vec2D.new
     # Set the particle starting location
     rebirth(width / 2.0, height / 2.0)
   end
@@ -79,16 +78,17 @@ class Particle
     @lifespan = 255
     # Set location using translate
     s_shape.reset_matrix
-    s_shape.translate(x, y) 
-    
+    s_shape.translate(x, y)
     # Update center vector
     center.x, center.y = x, y
   end
 
   # Is it off the screen, or its lifespan is over?
   def dead?
-    (center.x > width  || center.x < 0 || 
-        center.y > height || center.y < 0 || lifespan < 0)
+    return true if lifespan < 0
+    return true if boundary_y.exclude? center.y
+    return true if boundary_x.exclude? center.x
+    false
   end
 
   def update
@@ -99,8 +99,15 @@ class Particle
     s_shape.set_tint(color(255, lifespan))
     # Move the particle according to its velocity
     s_shape.translate(velocity.x, velocity.y)
-    # and also update the center
+    # and also update the center location
     @center += velocity
   end
 end
 
+# unusually in this case we are looking for excluded values
+
+Boundary = Struct.new(:lower, :upper) do
+  def exclude? val
+    true unless (lower...upper).cover? val
+  end
+end