ruby-processing 2.5.0 → 2.5.1

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

@@ -22,14 +22,14 @@ end
 def draw
   background(0)
 
-  ang1 = radians(angle1)
-  ang2 = radians(angle2)
+  ang1 = angle1.radians
+  ang2 = angle2.radians
 
-  x1 = width/2 + (SCALAR * cos(ang1))
-  x2 = width/2 + (SCALAR * cos(ang2))
+  x1 = width / 2 + (SCALAR * cos(ang1))
+  x2 = width / 2 + (SCALAR * cos(ang2))
   
-  y1 = height/2 + (SCALAR * sin(ang1))
-  y2 = height/2 + (SCALAR * sin(ang2))
+  y1 = height / 2 + (SCALAR * sin(ang1))
+  y2 = height / 2 + (SCALAR * sin(ang2))
   
   fill(255)
   rect(width * 0.5, height * 0.5, 140, 140)

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

@@ -21,33 +21,33 @@ def draw
   background 0
   lights
   
-  px = sin( ang3.radians ) * 170
-  py = cos( ang3.radians ) * 300
-  pz = sin( ang4.radians ) * 500
+  px = sin(ang3.radians) * 170
+  py = cos(ang3.radians) * 300
+  pz = sin(ang4.radians) * 500
   
   translate width/2 + px, height/2 + py, -700 + pz
   
-  rotate_x sin( ang2.radians ) * 120
-  rotate_y sin( ang2.radians ) * 50
-  rotate_z sin( ang2.radians ) * 65
+  rotate_x sin(ang2.radians) * 120
+  rotate_y sin(ang2.radians) * 50
+  rotate_z sin(ang2.radians) * 65
   
   fill 153
   box 20, 100, 20
   
   fill 204
   push_matrix
-  rotate_y sin( ang.radians ) * -20
+  rotate_y sin(ang.radians) * -20
   rect -75, -50, 75, 100
   pop_matrix
   
   push_matrix
-  rotate_y sin( ang.radians ) * 20
+  rotate_y sin(ang.radians) * 20
   rect 0, -50, 75, 100
   pop_matrix
   
   @ang += flap_speed
   
-  @flap_speed *= -1 if abs(ang) > PI
+  @flap_speed *= -1 if ang.abs > PI
   
   @ang2 += 0.01
   @ang3 += 2.0

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

@@ -24,6 +24,6 @@ end
 def draw  
   background 0  
   translate width/2, height/2, -700  
-  @birds.map {|b| b.fly} 
+  @birds.map { |b| b.fly } 
 end
 

data/samples/processing_app/basics/transform/library/bird/bird.rb

@@ -11,7 +11,7 @@ class Bird
 	attr_accessor :flap_speed
 	attr_accessor :rot_speed
 
-	def initialize ( offset_x, offset_y, offset_z, w, h )
+	def initialize(offset_x, offset_y, offset_z, w, h)
 
 		defaults
 		@offset_x, @offset_y, @offset_z = offset_x, offset_y, offset_z
@@ -27,18 +27,18 @@ class Bird
 		@radius_x, @radius_y, @radius_z = 120.0, 200.0, 700.0
 	end
 
-	def set_flight ( radius_x, radius_y, radius_z, rot_x, rot_y, rot_z )
+	def set_flight(radius_x, radius_y, radius_z, rot_x, rot_y, rot_z)
 		@radius_x, @radius_y, @radius_z = radius_x, radius_y, radius_z
 		@rot_x, @rot_y, @rot_z = rot_x, rot_y, rot_z
 		return self  # return self means we can chain methods
 	end
 
-	def set_wing_speed ( flap_speed )
+	def set_wing_speed(flap_speed)
 		@flap_speed = flap_speed
 		return self  # return self means we can chain methods
 	end
 
-	def set_rot_speed ( rot_speed )
+	def set_rot_speed(rot_speed)
 		@rot_speed = rot_speed
 		return self  # return self means we can chain methods
 	end
@@ -47,17 +47,17 @@ class Bird
 
 		push_matrix
 
-			px = sin( radians @ang3 ) * @radius_x
-			py = cos( radians @ang3 ) * @radius_y
-			pz = sin( radians @ang4 ) * @radius_z
+			px = sin(@ang3.radians) * @radius_x
+			py = cos(@ang3.radians) * @radius_y
+			pz = sin(@ang4.radians) * @radius_z
 
 			translate @offset_x + px,
 					  @offset_y + py,
 					  @offset_z + pz
 
-			rotate_x sin( radians @ang2 ) * @rot_x
-			rotate_y sin( radians @ang2 ) * @rot_y
-			rotate_z sin( radians @ang2 ) * @rot_z
+			rotate_x sin(@ang2.radians) * @rot_x
+			rotate_y sin(@ang2.radians) * @rot_y
+			rotate_z sin(@ang2.radians) * @rot_z
 
 			fill @body_fill
 			box @w/5, @h, @w/5
@@ -65,12 +65,12 @@ class Bird
 			fill @wing_fill
 
 			push_matrix
-				rotate_y sin( radians @ang ) * 20
+				rotate_y sin(@ang.radians) * 20
 				rect 0, -@h/2, @w, @h
 			pop_matrix
 
 			push_matrix
-				rotate_y sin( radians @ang ) * -20
+				rotate_y sin(@ang.radians) * -20
 				rect -@w, -@h/2, @w, @h
 			pop_matrix
 

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

@@ -3,9 +3,14 @@
 # Rotating a square around the Z axis. To get the results
 # you expect, send the rotate function angle parameters that are
 # values between 0 and PI*2 (TAU which is roughly 6.28). If you prefer to 
-# think about angles as degrees (0-360), you can use the radians() 
-# method to convert your values. For example: scale(radians(90))
-# is identical to the statement scale(PI/2). 
+# think about angles as degrees (0-360), you can use the radians 
+# method to convert your values. For example: scale(90.radians)
+# is identical to the statement scale(PI/2).
+
+
+# Notice in ruby everything is an object, so we can chain stuff
+# check it out using irb to see what you get with Time.now
+# Time.now.sec and finally Time.now.sec.even? isn't ruby just wonderful
 
 
 def setup    
@@ -21,9 +26,9 @@ end
 
 def draw    
   background 51  	
-  @jitter = rand(-0.1 .. 0.1) if second % 2 == 0  	
+  @jitter = rand(-0.1 .. 0.1) if Time.now.sec.even? 	
   @angle += @jitter
-  translate width/2, height/2
+  translate width / 2, height / 2
   rotate cos(@angle)   	
   rect 0, 0, 180, 180
 end

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

@@ -2,7 +2,7 @@
 # by Ira Greenberg. 
 # 
 # Using rotate() and triangle() functions generate a pretty 
-# flower. Uncomment the line "# rotate(rot+=radians(spin));"
+# flower. Uncomment the line "# rotate(rot+=spin.radians);"
 # in the triBlur() function for a nice variation.
 
 attr_reader :pt, :shift, :spin, :fade
@@ -31,8 +31,8 @@ def tri_blur
   @fill_color += fade  	
   rotate spin  	
   # try these lines also ..
-  #@rot += radians spin
-  #rotate @rot  	
+  # @rot += spin.radians
+  # rotate @rot  	
   pt[0].x += shift
   pt[0].y -= shift / 2
   pt[1].x -= shift

data/samples/processing_app/library/fastmath/clock.rb

@@ -1,4 +1,5 @@
-# The current time can be read with the second(), minute(), and hour()
+# The current local time can be read with the Time.now
+# the seconds Time.now.sec, minutes Time.now.min etc...
 # functions. In this example, DegLut.sin() and DegLut.cos() values are used to
 # set the position of the hands, perfect for degree precision Lookup Table.
 load_library :fastmath
@@ -13,7 +14,7 @@ def draw
   background 0
   fill 80
   no_stroke
-  # adj factor to map 0-60 to 0-360 (seconds/minutes) & 0-12 to 0-360 (hours)
+  # adj factor to map 0-60 to 0-360 (sec/min) & 0-12 to 0-360 (hours)
   # since angles for DegLut.sin() and DegLut.cos() start at 3 o'clock we
   # subtract 90 degrees to make them start at the top.
   clock_x = lambda do |val, adj, length|
@@ -25,14 +26,15 @@ def draw
   ellipse 100, 100, 160, 160
   stroke 220
   stroke_weight 6
-  line(100, 100, clock_x.call(hour % 12 + (minute / 60.0), 30, 50),
-                 clock_y.call(hour % 12 + (minute / 60.0), 30, 50))
+  t = Time.now
+  line(100, 100, clock_x.call(t.hour % 12 + (t.min / 60.0), 30, 50),
+                 clock_y.call(t.hour % 12 + (t.min / 60.0), 30, 50))
   stroke_weight 3
-  line(100, 100, clock_x.call(minute + (second / 60.0), 6, 60),
-                 clock_y.call(minute + (second / 60.0), 6, 60))
+  line(100, 100, clock_x.call(t.min + (t.sec / 60.0), 6, 60),
+                 clock_y.call(t.min + (t.sec / 60.0), 6, 60))
   stroke 255, 0, 0
   stroke_weight 1
-  line(100, 100, clock_x.call(second, 6, 72), clock_y.call(second, 6, 72))
+  line(100, 100, clock_x.call(t.sec, 6, 72), clock_y.call(t.sec, 6, 72))
   # Draw the minute ticks
   stroke_weight 2
   stroke 255

data/samples/processing_app/library/net/HTTPClient.rb

@@ -3,7 +3,7 @@
 # Starts a network client that connects to a server on port 80,
 # sends an HTTP 1.0 GET request, and prints the results. 
 # Note that this code is not necessary for simple HTTP GET request:
-# Simply calling loadStrings("http://www.processing.org") would do
+# Simply calling load_strings("http://www.processing.org") would do
 # the same thing as (and more efficiently than) this example.
 # This example is for people who might want to do something more 
 # complicated later.
@@ -25,7 +25,9 @@ end
 def draw
   if (client.available() > 0)   # If there's incoming data from the client...
     data = client.read_string()  # ...then grab it and print it
-    println(data)
+    puts data
   end
 end
 
+#@todo replace with a pure ruby alternative
+

data/samples/processing_app/library/vecmath/arcball/arcball_box.rb

@@ -9,7 +9,7 @@ load_library :vecmath
 
 def setup
   size(600, 600, P3D)
-  smooth(16)
+  smooth(8)
   ArcBall.init(self, 300, 300)
   fill 180
 end

data/samples/processing_app/library/vecmath/arcball/arcball_radius.rb

@@ -9,7 +9,7 @@ load_library :vecmath
 
 def setup
   size(600, 600, P3D)
-  smooth(16)
+  smooth(8)
   ArcBall.init(self, 300, 300, 250)
   fill 180
 end

data/samples/processing_app/library/vecmath/arcball/arcball_shape.rb

@@ -4,7 +4,7 @@ attr_reader :my_cube
 
 def setup
   size(600, 600, P3D)
-  smooth(16)
+  smooth(8)
   ArcBall.init(self)
   @my_cube = create_shape(BOX, 400, 400, 400)
   my_cube.set_fill(color(100, 10, 100))

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

@@ -41,7 +41,7 @@ def setup
   color_mode(RGB, 255, 255, 255, 100)
   ellipse_mode(CENTER)    
   origin = rand(5 .. 16)
-  start_pos = Vec2D.new(width / start2, height / 2)
+  start_pos = Vec2D.new(width / 2, height / 2)
   @particle_systems = ParticleSystem.new(origin, start_pos)
 end
 

data/samples/processing_app/library/vecmath/vec3d/retained_menger.rb

@@ -4,7 +4,7 @@
 # author Martin Prout
 ##########################
 
-load_library 'vecmath'
+load_library :vecmath
 
 PTS = [-1, 0, 1]
 MIN_SIZE = 20
@@ -23,7 +23,7 @@ def draw
   background(20, 20, 200)
   no_stroke
   lights
-  define_light
+  define_lights
   render
 end
 

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

@@ -32,7 +32,7 @@ def draw
   # Display frame rate
   fill(255, 0, 255)
   text_size(16)
-  text('Frame rate: #{format('%.2f', frame_rate)}', 10, 20)
+  text("Frame rate: #{format('%0.2f', frame_rate)}", 10, 20)
   
 end
 

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

@@ -20,10 +20,10 @@ def draw
   # Draw only when mouse is pressed
   if mouse_pressed?
     @angle += 5
-    val = cos(radians(angle)) * 12.0
+    val = cos(angle.radians) * 12.0
     (0 ... 360).step(75) do |a|
-      xoff = cos(radians(a)) * val
-      yoff = sin(radians(a)) * val
+      xoff = cos(a.radians) * val
+      yoff = sin(a.radians) * val
       fill(0)
       ellipse(mouse_x + xoff, mouse_y + yoff, val, val)
     end

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

@@ -26,7 +26,7 @@ def draw
     @direction = direction * -1
   end
   if mouse_pressed? 
-    @signal = abs(mouse_y % img.height)
+    @signal = (mouse_y % img.height).abs
   else 
     @signal += (0.3*direction)
   end

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

@@ -6,7 +6,7 @@
 # Hold down 'y' key and drag mouse to rotate about y axis
 ########################################################
 
-load_libraries :cs_grammar, :vecmath
+load_libraries :cs_grammar, :vecmath, :fastmath
 attr_reader :csplant
 
 def setup
@@ -47,8 +47,8 @@ class CSPlant
     )
     @production = axiom
     @len = len
-    @theta = radians 25
-    @phi = radians 25
+    @theta = 25.radians
+    @phi = 25.radians
     no_stroke
   end
 

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

@@ -39,11 +39,11 @@ def draw
   # Follow the leader
   (0 ... CELLS).each do |i|
     if (i == 0)
-      px[i] = head_x + sin(radians(angle[i]))*radii_x[i]
-      py[i] = head_y + cos(radians(angle[i]))*radii_y[i]
+      px[i] = head_x + sin(angle[i].radians)*radii_x[i]
+      py[i] = head_y + cos(angle[i].radians)*radii_y[i]
     else
-      px[i] = px[i-1] + cos(radians(angle[i]))*radii_x[i]
-      py[i] = py[i-1] + sin(radians(angle[i]))*radii_y[i]
+      px[i] = px[i-1] + cos(angle[i].radians)*radii_x[i]
+      py[i] = py[i-1] + sin(angle[i].radians)*radii_y[i]
       
       # Check collision of body
       if ((px[i] >= width-cell_radius[i] / 2) || (px[i] <= cell_radius[i] / 2))

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

@@ -49,7 +49,7 @@ def draw
   # required for texLight shader
   pointLight(255, 255, 255, 2 * (mouse_x - width / 2), 2 * (mouse_y - height / 2), 500)
   translate(width / 2, height / 2)   # translate to center of the screen
-  rotate_x(radians(60))          # fixed rotation of 60 degrees over the X axis
+  rotate_x(60.radians)           # fixed rotation of 60 degrees over the X axis
   rotate_z(frame_count * 0.005)  # dynamic frameCount-based rotation over the Z axis
 
   background(0) # black background

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

@@ -27,6 +27,6 @@ def draw
   shader(landscape) 
   rect(0, 0, width, height)
 
-  frame.set_title 'frame: #{frame_count} - fps: #{format('%.2f', frame_rate)}'     
+  frame.set_title "frame: #{frame_count} - fps: #{format('%0.2f', frame_rate)}"     
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,13 +170,13 @@ files:
 - samples/external_library/java_processing/box2d_processing/polygons.rb
 - samples/external_library/java_processing/custom/README.md
 - samples/external_library/java_processing/custom/Rakefile
+- samples/external_library/java_processing/custom/ext/nn/Connection.java
+- samples/external_library/java_processing/custom/ext/nn/HiddenNeuron.java
+- samples/external_library/java_processing/custom/ext/nn/InputNeuron.java
+- samples/external_library/java_processing/custom/ext/nn/Network.java
+- samples/external_library/java_processing/custom/ext/nn/Neuron.java
+- samples/external_library/java_processing/custom/ext/nn/OutputNeuron.java
 - samples/external_library/java_processing/custom/landscape.rb
-- samples/external_library/java_processing/custom/src/nn/Connection.java
-- samples/external_library/java_processing/custom/src/nn/HiddenNeuron.java
-- samples/external_library/java_processing/custom/src/nn/InputNeuron.java
-- samples/external_library/java_processing/custom/src/nn/Network.java
-- samples/external_library/java_processing/custom/src/nn/Neuron.java
-- samples/external_library/java_processing/custom/src/nn/OutputNeuron.java
 - samples/external_library/java_processing/custom/xor.rb
 - samples/external_library/java_processing/fisica/README
 - samples/external_library/java_processing/fisica/bubbles.rb
@@ -232,6 +232,7 @@ files:
 - samples/processing_app/basics/arrays/array_objects.rb
 - samples/processing_app/basics/camera/move_eye.rb
 - samples/processing_app/basics/camera/perspective.rb
+- samples/processing_app/basics/color/blend_color.rb
 - samples/processing_app/basics/color/brightness.rb
 - samples/processing_app/basics/color/color_wheel.rb
 - samples/processing_app/basics/color/creating.rb
@@ -890,7 +891,7 @@ requirements:
 - java runtime >= 1.7+
 - processing = 2.2.1+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.