ruby-processing 2.6.2 → 2.6.3

data/samples/contributed/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
@@ -18,10 +18,10 @@ class Ball
   end
   
   def check_boundary width, height 
-    if !(r .. width - r).include?(position.x)
+    if !(r..width - r).include?(position.x)
       (position.x > width - r)? position.x = width - r : position.x = r
       velocity.x *= -1
-    elsif !(r .. height - r).include?(position.y)
+    elsif !(r..height - r).include?(position.y)
       (position.y > height - r)? position.y = height - r : position.y = r
       velocity.y *= -1
     end    

data/samples/contributed/fern.rb

@@ -2,7 +2,7 @@
 # by Luis Correia
 
 attr_reader :boundary
-  
+
 def setup
   size 500, 500
   @boundary = Boundary.new(0, width )
@@ -16,10 +16,9 @@ def draw
   x0, y0 = 0.0, 0.0
   x, y, r = 0.0, 0.0, 0.0
   i, j = 0, 0
-  max_iterations = 200000
-  
+  max_iterations = 200_000
   max_iterations.times do
-    r = rand(0 .. 100.0)
+    r = rand(0..100.0)
     if r <= 1
       x = 0.0
       y = 0.16 * y0
@@ -29,26 +28,24 @@ def draw
     elsif r <= 14
       x = -0.15 * x0 + 0.28 * y0
       y = 0.26 * x0 + 0.24 * y0
-    else 
+    else
       x = 0.85 * x0 + 0.04 * y0
       y = -0.004 * x0 + 0.85 * y0 + 1.6
     end
-    
     i = height - (y * 45).to_i
     j = width / 2 + (x * 45).to_i
-    pixels[i * height + j] += 2560 if (boundary.include?(i) && boundary.include?(j))
+    pixels[i * height + j] += 2_560 if (boundary.include?(i) && boundary.include?(j))
     x0, y0 = x, y
   end
-  
   update_pixels
 end
 
 # Abstract boundary checking to this
 # lightweight class
 #
-  
+
 Boundary = Struct.new(:lower, :upper) do
   def include? x
-    (lower ... upper).cover? x
+    (lower...upper).cover? x
   end
 end

data/samples/contributed/fibonacci_sphere.rb

@@ -52,7 +52,7 @@ end
 
 def render_globe
   push_matrix
-  (0 .. [nbr_points, pts.length].min).each do |i|    
+  (0..[nbr_points, pts.length].min).each do |i|    
     lat = pts[i].lat 
     lon = pts[i].lon    
     push_matrix
@@ -73,7 +73,7 @@ end
 SpherePoint = Struct.new(:lat, :lon)
 
 def init_sphere(num)  
-  (0 .. num).each do |i| 
+  (0..num).each do |i| 
     lon = GA * i
     lon /= TAU
     lon -= lon.floor

data/samples/contributed/full_screen.rb

@@ -2,27 +2,28 @@
 # This is a full-screen demo 
 # Since processing-2.0 it is opengl
 
-full_screen
-
-
-def setup
-  size displayWidth, displayHeight, P3D
-  no_stroke
-end
-
-def draw
-  lights
-  background 0
-  fill 120, 160, 220
-  (width/100).times do |x|
-    (height/100).times do |y|
-      new_x, new_y = x * 100, y * 100
-      push_matrix
-      translate new_x + 50, new_y + 50
-      rotate_y(((mouse_x.to_f + new_x) / width) * Math::PI)
-      rotate_x(((mouse_y.to_f + new_y) / height) * Math::PI)
-      box 90
-      pop_matrix
-    end
+class FullScreen < Processing::App  
+  def setup
+    size displayWidth, displayHeight, P3D
+    no_stroke
   end
+  
+  def draw
+    lights
+    background 0
+    fill 120, 160, 220
+    (width/100).times do |x|
+      (height/100).times do |y|
+        new_x, new_y = x * 100, y * 100
+        push_matrix
+        translate new_x + 50, new_y + 50
+        rotate_y(((mouse_x.to_f + new_x) / width) * Math::PI)
+        rotate_x(((mouse_y.to_f + new_y) / height) * Math::PI)
+        box 90
+        pop_matrix
+      end
+    end
+  end  
 end
+# Full screen should now be set at runtime, now there is only one way to do it!
+FullScreen.new(full_screen: true)

data/samples/contributed/grapher.rb

@@ -15,12 +15,12 @@ def setup
   no_stroke
   color_mode(HSB, 1.0)
   background(0)
-  frame_rate(4000)
+  frame_rate(4_000)
 end
 
 def draw
   translate(width / 2, height / 2)
-  dot(rand(-180 .. 180), rand(-180 .. 180), rand(CMIN .. CMAX)) unless frame_count > 200_000
+  dot(rand(-180..180), rand(-180..180), rand(CMIN..CMAX)) unless frame_count > 200_000
 end
 
 def dot(px, py, c)
@@ -31,6 +31,6 @@ def dot(px, py, c)
     fill(((CMIN - c) / (CMIN - CMAX)), 1, 1)
     ellipse px * width / 360, py * height / 360, SZ, SZ
   else
-    dot(rand(-180 .. 180), rand(-180 .. 180), rand(CMIN .. CMAX))
+    dot(rand(-180..180), rand(-180..180), rand(CMIN..CMAX))
   end
 end

data/samples/contributed/gravity.rb

@@ -23,7 +23,7 @@ end
 def mouse_pressed
   return if mouse_x == 0 || mouse_y == 0
   return if particle_grab
-  particles << Particle.new(mouse_x, mouse_y, rand(0.1 .. 8))
+  particles << Particle.new(mouse_x, mouse_y, rand(0.1..8))
 end
 
 def mouse_released

data/samples/contributed/mandelbrot.rb

@@ -1,26 +1,27 @@
 # Mandelbrot Set example
 # by Jordan Scales (http://jordanscales.com)
-# 27 Dec 2012
-
-
+# Modified to use map1d (instead of map), and somewhat 
+# optimized (update_pixels instead of set, and hypot for abs)
 # default size 900x600
 # no need to loop
+
 def setup
   size 900, 600
+  load_pixels
   no_loop
 end
 
 # main drawing method
 def draw
-  (0..900).each do |x|
-    (0..600).each do |y|
-      c = Complex.new(map(x, 0, 900, -3, 1.5), map(y, 0, 600, -1.5, 1.5))
-  
+  (0...900).each do |x|
+    (0...600).each do |y|
+      c = Complex.new(map1d(x, (0...900), (-3..1.5)), map1d(y, (0...600), (-1.5..1.5)))  
       # mandel will return 0 to 20 (20 is strong)
       #   map this to 0, 255 (and flip it)
-      set(x, y, color(255 - map(mandel(c,20), 0, 20, 0, 255).to_i))
+      pixels[x + y * 900] = color(255 - map1d(mandel(c, 20), (0..20), (0..255)).to_i)
     end
   end
+  update_pixels
 end
 
 # calculates the "accuracy" of a given point in the mandelbrot set
@@ -33,14 +34,11 @@ def mandel(z, max = 10)
     z.square
     z.add c
     break if z.abs > 2
-
     score += 1
   end
-
   score
 end
 
-
 # rolled my own Complex class
 #   stripped of all functionality, except for what I needed (abs, square, add, to_s)
 #   
@@ -72,11 +70,10 @@ class Complex
 
   # computes the magnitude
   def abs
-    sqrt(real * real + imag * imag)
+    hypot(real, imag)
   end
 
   def to_s
     "#{real} + #{imag}i"
   end
-
 end

data/samples/external_library/java_processing/box2d_processing/bumpy_surface_noise.rb

@@ -38,7 +38,7 @@ def draw
   # Draw the surface
   surface.display
   # NB question mark is reqd to call mouse_pressed value, else method gets called.
-  particles << Particle.new(box2d, mouse_x, mouse_y, rand(2.0 .. 6)) if mouse_pressed?    
+  particles << Particle.new(box2d, mouse_x, mouse_y, rand(2.0..6)) if mouse_pressed?    
   # Draw all particles
   particles.each do |p|
     p.display

data/samples/external_library/java_processing/box2d_processing/library/custom_shape/custom_shape.rb

@@ -91,8 +91,8 @@ module B2D
       
       
       # Give it some initial random velocity
-      body.set_linear_velocity(Vec2.new(rand(-5 .. 5), rand(2 .. 5)))
-      body.set_angular_velocity(rand(-5 .. 5))
+      body.set_linear_velocity(Vec2.new(rand(-5..5), rand(2..5)))
+      body.set_angular_velocity(rand(-5..5))
     end
   end
   

data/samples/external_library/java_processing/box2d_processing/library/particle_system/particle_system.rb

@@ -122,7 +122,7 @@ module PS
       @body = box2d.create_body(bd)
       
       # Give it some initial random velocity
-      body.set_linear_velocity(PS::Vec2.new(rand(-1 .. 1), rand(-1 .. 1)))
+      body.set_linear_velocity(PS::Vec2.new(rand(-1..1), rand(-1..1)))
       
       # Make the body's shape a circle
       cs = PS::CircleShape.new

data/samples/external_library/java_processing/box2d_processing/library/surface/surface.rb

@@ -144,8 +144,8 @@ module SB
       # Attach fixture to body
       body.create_fixture(fd)      
       # Give it a random initial velocity (and angular velocity)
-      body.set_linear_velocity(SB::Vec2.new(rand(-10 .. 10), rand(5 .. 10)))
-      body.set_angular_velocity(rand(-10 .. 10))      
+      body.set_linear_velocity(SB::Vec2.new(rand(-10..10), rand(5..10)))
+      body.set_angular_velocity(rand(-10..10))      
     end      
   end    
 end  

data/samples/external_library/java_processing/box2d_processing/liquidy.rb

@@ -37,7 +37,7 @@ def draw
   if systems.size > 0
     systems.each do |system|
       system.run 
-      system.add_particles(box2d, rand(0 .. 2)) 
+      system.add_particles(box2d, rand(0..2)) 
     end
   end  
   # Display all the boundaries

data/samples/external_library/java_processing/fisica/bubbles.rb

@@ -56,9 +56,9 @@ def draw
   fill(0)
   if ((frame_count % 40) == 1)
     b = FBlob.new
-    s = rand(30 .. 40)
+    s = rand(30..40)
     space = (width - SIDE_MARGIN * 2-s)
-    @x_pos = (x_pos + rand(s .. space/2.0)) % space
+    @x_pos = (x_pos + rand(s..space/2.0)) % space
     b.set_as_circle(SIDE_MARGIN + x_pos + s / 2, height - rand(100), s, 20)
     b.set_stroke(0)
     b.set_stroke_weight(2)

data/samples/external_library/java_processing/fisica/joints.rb

@@ -62,11 +62,11 @@ def key_pressed
 end
 
 def create_spider
-  pos_x = rand(MAIN_SIZE/2 .. width-MAIN_SIZE/2)
-  pos_y = rand(MAIN_SIZE/2 .. height-MAIN_SIZE/2)  
+  pos_x = rand(MAIN_SIZE/2..width-MAIN_SIZE/2)
+  pos_y = rand(MAIN_SIZE/2..height-MAIN_SIZE/2)  
   main = Fis::FCircle.new(MAIN_SIZE)
   main.set_position(pos_x, pos_y)
-  main.set_velocity(rand(-20 .. 20), rand(-20 .. 20))
+  main.set_velocity(rand(-20..20), rand(-20..20))
   main.set_fill_color(body_color)
   main.set_no_stroke
   main.set_group_index(2)
@@ -78,7 +78,7 @@ def create_spider
     y = LEG_SIZE * sin(i * TAU/3) + pos_y    
     leg = Fis::FCircle.new(MAIN_SIZE/2)
     leg.set_position(pos_x, pos_y)
-    leg.set_velocity(rand(-20 .. 20), rand(-20 ..20))
+    leg.set_velocity(rand(-20..20), rand(-20 ..20))
     leg.set_fill_color(body_color)
     leg.set_no_stroke
     world.add(leg)    

data/samples/external_library/java_processing/generative_design/node_spring_attractor.rb

@@ -17,8 +17,8 @@ def setup
   lights
   smooth(8)
   fill(0)
-  @nodeA = GD::Node.new(rand * width, rand * height, rand(-200 .. 200))
-  @nodeB = GD::Node.new(rand * width, rand * height, rand(-200 .. 200))
+  @nodeA = GD::Node.new(rand * width, rand * height, rand(-200..200))
+  @nodeB = GD::Node.new(rand * width, rand * height, rand(-200..200))
   nodeA.setStrength(-2)
   nodeB.setStrength(-2)
   nodeA.setDamping(0.1)

data/samples/external_library/java_processing/geomerative/hello_world_rotate_firstletter.rb

@@ -20,8 +20,8 @@ def setup
 
   fill(255,102,0)
   stroke(0)
-  
-  #  Load the font file we want to use (the file must be in the data folder in the sketch floder), 
+
+  #  Load the font file we want to use (the file must be in the data folder in the sketch floder),
   #  with the size 72 and the alignment CENTER
   @grp = RG::get_text("Hola Mundo!", "FreeSans.ttf", 72, CENTER)
   smooth 4
@@ -30,14 +30,14 @@ end
 def draw
   # Clean frame
   background(255)
-  
+
   # Set the origin to draw in the middle of the sketch
   translate width / 2, height / 2
-  
-  # Transform at each frame the first letter with a PI/20 radians 
+
+  # Transform at each frame the first letter with a PI/20 radians
   # rotation around the center of the first letter's center
-  grp.children[0].rotate(PI/20, grp.children[0].get_center)
-  
+  grp.children[0].rotate(PI / 20, grp.children[0].get_center)
+
   # Draw the group of shapes representing "Hola Mundo!" on the PGraphics canvas g (which is the default canvas of the sketch)
   grp.draw
 end

data/samples/external_library/java_processing/hemesh/twin_iso.rb

@@ -11,11 +11,11 @@ def setup
   ArcBall.init(self)
   smooth(8)
   values = []               # build a multi-dimensional array in ruby
-  (0 .. RES).each do |i|    # the inclusive range is intentional here
+  (0..RES).each do |i|    # the inclusive range is intentional here
     valu = []
-    (0 .. RES).each do |j|
+    (0..RES).each do |j|
       val = []
-      (0 .. RES).each do |k|
+      (0..RES).each do |k|
         val << 2.1 * noise(0.35 * i, 0.35 * j, 0.35 * k)
       end
       valu << val

data/samples/external_library/java_processing/pbox2d/bumpy_surface_noise.rb

@@ -39,7 +39,7 @@ def draw
   # Draw the surface
   surface.display
   # NB question mark is reqd to call mouse_pressed value, else method gets called.
-  particles << Particle.new(box2d, mouse_x, mouse_y, rand(2.0 .. 6)) if mouse_pressed?    
+  particles << Particle.new(box2d, mouse_x, mouse_y, rand(2.0..6)) if mouse_pressed?    
   # Draw all particles
   particles.each do |p|
     p.display

data/samples/external_library/java_processing/pbox2d/library/custom_shape/custom_shape.rb

@@ -91,8 +91,8 @@ module B2D
       
       
       # Give it some initial random velocity
-      body.set_linear_velocity(Vec2.new(rand(-5 .. 5), rand(2 .. 5)))
-      body.set_angular_velocity(rand(-5 .. 5))
+      body.set_linear_velocity(Vec2.new(rand(-5..5), rand(2..5)))
+      body.set_angular_velocity(rand(-5..5))
     end
   end
   

data/samples/external_library/java_processing/pbox2d/library/particle_system/particle_system.rb

@@ -125,7 +125,7 @@ module PS
       @body = box2d.create_body(bd)
       
       # Give it some initial random velocity
-      body.set_linear_velocity(PS::Vec2.new(rand(-1 .. 1), rand(-1 .. 1)))
+      body.set_linear_velocity(PS::Vec2.new(rand(-1..1), rand(-1..1)))
       
       # Make the body's shape a circle
       cs = PS::CircleShape.new

data/samples/external_library/java_processing/pbox2d/library/surface/surface.rb

@@ -144,8 +144,8 @@ module SB
       # Attach fixture to body
       body.create_fixture(fd)      
       # Give it a random initial velocity (and angular velocity)
-      body.set_linear_velocity(SB::Vec2.new(rand(-10 .. 10), rand(5 .. 10)))
-      body.set_angular_velocity(rand(-10 .. 10))      
+      body.set_linear_velocity(SB::Vec2.new(rand(-10..10), rand(5..10)))
+      body.set_angular_velocity(rand(-10..10))      
     end      
   end    
 end  

data/samples/external_library/java_processing/pbox2d/liquidy.rb

@@ -37,7 +37,7 @@ def draw
   if systems.size > 0
     systems.each do |system|
       system.run 
-      system.add_particles(box2d, rand(0 .. 2)) 
+      system.add_particles(box2d, rand(0..2)) 
     end
   end  
   # Display all the boundaries

data/samples/external_library/java_processing/peasy_cam/library/hilbert/hilbert.rb

@@ -51,11 +51,11 @@ class Hilbert
     @rule = "^<XF^<XFX-F^>>XFX&F+>>XFX-F>X->"
     @distance = len
     @theta = Math::PI/180 * 90
-    @phi = Math::PI/180 * 90  
+    @phi = Math::PI/180 * 90
     grammar.add_rule(premis, rule)
   end
 
-  def render()    
+  def render()
     translate( -distance * ADJUSTMENT[gen], distance *  ADJUSTMENT[gen], -distance * ADJUSTMENT[gen])
     fill(0, 75, 152)
     light_specular(204, 204, 204)
@@ -92,9 +92,9 @@ class Hilbert
 
   def create_grammar(gen)
     @gen = gen    # required for depth adjustment
-    @distance *= 1/(pow(2, gen) - 1)
+    @distance *= 1/(2**gen) - 1)
     @production = @grammar.generate gen
   end
-  
+
 
 end