ruby-processing 2.5.0 → 2.5.1

data/samples/external_library/java_processing/custom/Rakefile

@@ -1,28 +1,22 @@
-require 'ant'
-
-PROJECT_NAME ='nn'
-MAIN_SRC_DIR = 'src'
-BUILD_DIR = 'build'
-DIST_DIR = 'library/nn'
-
-task :default => [:clean, :make_jars]
-
-task :clean do
-  ant.delete :dir => BUILD_DIR
-  puts
+if RUBY_PLATFORM =~ /java/
+  # -*- ruby -*-
+  require 'rake/javaextensiontask'
+  
+  Rake::JavaExtensionTask.new('nn') do |ext|
+    ext.name = 'nn'
+    ext.debug = true
+    ext.lib_dir = 'library/nn'
+    ext.source_version='1.7'
+    ext.target_version='1.7'
+  end
 end
 
-task :make_jars => :clean do
-  make_jar MAIN_SRC_DIR, "#{PROJECT_NAME}.jar"
+desc 'clean'
+task :clean do
+  FileUtils.rm_rf(FileList['tmp', 'library'])
 end
 
-def make_jar(source_folder, jar_file_name) 
-    ant.mkdir :dir => BUILD_DIR
-    ant.mkdir :dir => DIST_DIR
-    ant.javac :srcdir => source_folder, :destdir => BUILD_DIR, 
-              :source => "1.7", :target => "1.7", :debug => "yes", :includeantruntime => "no"
-    ant.jar :jarfile => "#{DIST_DIR}/#{jar_file_name}", :basedir => BUILD_DIR
-    ant.delete :dir => BUILD_DIR
-    puts
+desc 'run'
+task :run do
+  sh `rp5 run xor.rb`
 end
-

data/samples/external_library/java_processing/custom/xor.rb

@@ -78,7 +78,7 @@ def network_status
   text("Total iterations: #{count}", 10, 40)
   mse += (result - known) * (result - known)    
   rmse = Math::sqrt(mse / 4.0)
-  out = "Root mean squared error: #{format("%.5f", rmse)}"
+  out = "Root mean squared error: #{format('%0.5f', rmse)}"
   hint DISABLE_DEPTH_SORT
   text(out, 10, 60) 
   hint ENABLE_DEPTH_SORT

data/samples/external_library/ruby_gem/draw_test.rb

@@ -103,7 +103,7 @@ def train
     error = net.train(sq_input, [0, 1.0, 0])
     error = net.train(cr_input, [0, 0, 1.0])
     error = net.train(ci_input, [0, 1.0, 1.0])
-    puts "Error after iteration #{i}:\t#{format("%.5f", error)}" if i%20 == 0
+    puts "Error after iteration #{i}:\t#{format('%0.5f', error)}" if i%20 == 0
   end
 end
 

data/samples/processing_app/basics/arrays/array.rb

@@ -12,24 +12,24 @@ def setup
   size 640, 360
   coswave = []
   
-  0.upto( width ) do |i|
+  0.upto(width) do |i|
     amount = map i, 0, width, 0, PI
-    coswave[i] = cos( amount ).abs
+    coswave[i] = cos(amount).abs
   end
   
-  0.upto( width ) do |i|
-    stroke( coswave[i] * 255 )
-    line i, 0, i, height/3
+  0.upto(width) do |i|
+    stroke(coswave[i] * 255)
+    line(i, 0, i, height / 3)
   end
   
-  0.upto( width ) do |i|
-    stroke( coswave[i] * 255 / 4 )
-    line i, height/3, i, height/3*2
+  0.upto(width) do |i|
+    stroke(coswave[i] * 255 / 4)
+    line(i, height / 3, i, height / 3 * 2)
   end
   
-  0.upto( width ) do |i|
-    stroke( 255 - coswave[i] * 255 )
-    line i, height/3*2, i, height
+  0.upto(width) do |i|
+    stroke(255 - coswave[i] * 255)
+    line(i, height / 3 * 2, i, height)
   end
   
 end

data/samples/processing_app/basics/color/blend_color.rb

@@ -0,0 +1,17 @@
+# example of processing blend_color (uses PImage blend_color under the hood)
+# blend_color(c1, c2, MODE) returns a color int
+
+def setup
+  size 100, 100
+  orange = color(204, 102, 0)
+  blue = color(0, 102, 153)
+  orangeblueadd = blend_color(orange, blue, ADD)
+  background(51)
+  noStroke()
+  fill(orange)
+  rect(14, 20, 20, 60)
+  fill(orangeblueadd)
+  rect(40, 20, 20, 60)
+  fill(blue)
+  rect(66, 20, 20, 60)
+end

data/samples/processing_app/basics/color/reading/reading.rb

@@ -4,35 +4,26 @@
 
 
 def setup
-    size 200, 200  
-    no_stroke
-    background 0
-    
-    c = load_image "cait.jpg"
-    
-    xoff, yoff = 0, 0
-    p = 2
-    pix = p * 3
-    
-    (c.width * c.height).times do |i|
-    	
-    	pixel = c.pixels[i]
-    	
-    	fill red( pixel ), 0, 0
-    	rect xoff, yoff, p, pix
-    	
-    	fill 0, green( pixel ), 0
-    	rect xoff+p, yoff, p, pix
-    	
-    	fill 0, 0, blue( pixel )
-    	rect xoff+p*2, yoff, p, pix
-    	
-    	xoff += pix
-    	if xoff >= (width-pix)
-    		xoff = 0
-    		yoff += pix
-    	end
+  size 200, 200  
+  no_stroke
+  background 0  
+  c = load_image "cait.jpg"  
+  xoff, yoff = 0, 0
+  p = 2
+  pix = p * 3  
+  (c.width * c.height).times do |i|    
+    pixel = c.pixels[i]    
+    fill red( pixel ), 0, 0
+    rect xoff, yoff, p, pix    
+    fill 0, green( pixel ), 0
+    rect xoff+p, yoff, p, pix    
+    fill 0, 0, blue( pixel )
+    rect xoff+p*2, yoff, p, pix    
+    xoff += pix
+    if xoff >= (width-pix)
+      xoff = 0
+      yoff += pix
     end
-    
+  end  
 end
 

data/samples/processing_app/basics/form/brick_tower.rb

@@ -2,6 +2,7 @@
 
 # 3D castle tower constructed out of individual bricks.
 # Uses the Vect struct and Cube class.
+
 attr_reader :angle, :brick, :bricks_per_layer, :brick_layers
 attr_reader :radius, :layer_num, :temp_y
 
@@ -21,25 +22,25 @@ def draw
   fill 182, 62, 29
   no_stroke
   lights
-  translate(width/2.0, height * 1.2, -380)               # move viewpoint into position
-  rotate_x(radians(-45))                                 # tip tower to see inside
+  translate(width / 2.0, height * 1.2, -380)             # move viewpoint into position
+  rotate_x(-45.radians)                                  # tip tower to see inside
   rotate_y(frame_count * PI/600)                         # slowly rotate tower
-  brick_layers.times {|i| draw_layer(i) }
+  brick_layers.times { |i| draw_layer(i) }
 end
 
 def draw_layer(layer_num)
   @layer_num = layer_num
   @temp_y -= @brick_height                               # increment rows
   @angle = 360.0 / bricks_per_layer * layer_num / 2.0    # alternate brick seams
-  bricks_per_layer.times {|i| draw_bricks(i) }
+  bricks_per_layer.times { |i| draw_bricks(i) }
 end
 
 def draw_bricks(brick_num)
-  temp_z = cos(radians(angle)) * radius
-  temp_x = sin(radians(angle)) * radius
+  temp_z = cos(angle.radians) * radius
+  temp_x = sin(angle.radians) * radius
   push_matrix
   translate temp_x, temp_y, temp_z
-  rotate_y(radians(angle))
+  rotate_y(angle.radians)
   top_layer = layer_num == brick_layers - 1
   even_brick = brick_num % 2 == 0
   brick.create unless top_layer                          # main tower
@@ -73,8 +74,8 @@ class Cubeish
 
     SIDES.each do |side, signs|
       vertices[side] = signs.map do |s|
-        s = s.split('').map {|el| SIGNS[el] }
-        Vect.new(s[0] * w/2, s[1] * h/2, s[2] * d/2)
+        s = s.split('').map { |el| SIGNS[el] }
+        Vect.new(s[0] * w / 2, s[1] * h / 2, s[2] * d/2)
       end
     end
   end
@@ -82,7 +83,7 @@ class Cubeish
   def create
     vertices.each do |name, vectors|
       begin_shape QUADS
-      vectors.each {|v| vertex(v.x, v.y, v.z) }
+      vectors.each { |v| vertex(v.x, v.y, v.z) }
       end_shape
     end
   end

data/samples/processing_app/basics/form/pie_chart.rb

@@ -10,7 +10,7 @@
 def setup
   size 640, 360
   background 100
-  smooth
+  smooth(4)
   no_stroke
   
   diameter = min(width, height) * 0.75
@@ -20,8 +20,8 @@ def setup
   angles.each do |angle|
     fill angle * 3.0
     arc width/2, height/2, 	 						    # center x, y
-    diameter, diameter,  						      # width, height
-    last_angle, last_angle + radians(angle)	# angles from, to
-    last_angle += radians(angle)
+    diameter, diameter,  						        # width, height
+    last_angle, last_angle + angle.radians	# angles from, to
+    last_angle += angle.radians
   end
 end

data/samples/processing_app/basics/form/shape_transform.rb

@@ -10,32 +10,27 @@
 # Down Arrow - decreases points
 # 'p' key toggles between cube/pyramid
 
+load_library :vecmath
+attr_reader :renderer
 
 
-def setup
-  
+def setup  
   size 640, 360, P3D
-  
-  no_stroke
-  
-  @angle_inc = PI/300
-  
+  @renderer = AppRender.new(self)  
+  no_stroke  
+  @angle_inc = PI / 300  
   @pts = 4
   @angle = 0
   @radius = 99
-  @cylinder_length = 95
-  
-  @is_pyramid = false
-  
+  @cylinder_length = 95  
+  @is_pyramid = false  
 end
 
-def draw
-  
+def draw  
   background 170, 95, 95
   lights
-  fill 255, 200, 200
-  
-  translate width/2, height/2
+  fill 255, 200, 200  
+  translate width / 2, height / 2
   rotate_x frame_count * @angle_inc
   rotate_y frame_count * @angle_inc
   rotate_z frame_count * @angle_inc
@@ -46,10 +41,10 @@ def draw
     @angle = 0
     vertices[i] = []
     0.upto(@pts) { |j|
-      pvec = PVector.new 0, 0
+      pvec = Vec3D.new 0, 0
       (
-        pvec.x = cos(radians( @angle )) * @radius
-        pvec.y = sin(radians( @angle )) * @radius
+        pvec.x = cos(@angle.radians) * @radius
+        pvec.y = sin(@angle.radians) * @radius
         
         ) unless ( @is_pyramid && i == 1 )
         
@@ -63,15 +58,15 @@ def draw
   
   begin_shape QUAD_STRIP
     0.upto(@pts) { |j|
-      vertex vertices[0][j].x, vertices[0][j].y, vertices[0][j].z
-      vertex vertices[1][j].x, vertices[1][j].y, vertices[1][j].z
+      vertices[0][j].to_vertex(renderer)
+      vertices[1][j].to_vertex(renderer)
     }
     end_shape
     
     [0,1].each { |i|
       begin_shape
         0.upto(@pts) { |j|
-          vertex vertices[i][j].x, vertices[i][j].y, vertices[i][j].z
+          vertices[i][j].to_vertex(renderer)
         }
         end_shape CLOSE
     }

data/samples/processing_app/basics/form/toroid.rb

@@ -17,9 +17,11 @@
 # 	'h' key _________ toggle sphere/helix 
 
 load_library :vecmath
+attr_reader :renderer
 
 def setup  
-  size 640, 360, P3D  
+  size 640, 360, P3D
+  @renderer = AppRender.new(self)  
   @pts = 40
   @angle = 0.0
   @radius = 60.0
@@ -42,7 +44,7 @@ def draw
     fill 150, 195, 125
   end
   
-  translate width/2, height/2, -100
+  translate width / 2, height / 2, -100
   
   rotate_x frame_count * PI / 150
   rotate_y frame_count * PI / 170
@@ -51,32 +53,25 @@ def draw
   vertices = []
   vertices2 = []
   
-  0.upto(@pts) do |i|
-    
+  0.upto(@pts) do |i|    
     vertices2[i] = Vec3D.new
-    vertices[i] = Vec3D.new
-    
-    vertices[i].x = @lathe_radius + sin( radians( @angle ) ) * @radius
-    
+    vertices[i] = Vec3D.new    
+    vertices[i].x = @lathe_radius + sin(@angle.radians) * @radius    
     if @is_helix
-      vertices[i].z = cos( radians( @angle ) ) * @radius - (@helix_offset * @segments) / 2
+      vertices[i].z = cos(@angle.radians) * @radius - (@helix_offset * @segments) / 2
     else
-      vertices[i].z = cos( radians( @angle ) ) * @radius
-    end
-    
+      vertices[i].z = cos(@angle.radians) * @radius
+    end    
     @angle += 360.0 / @pts
-  end
-  
-  @lathe_angle = 0
-  
+  end  
+  @lathe_angle = 0  
   0.upto(@segments) do |i|
     begin_shape QUAD_STRIP
       (0..@pts).each do |j|
         vertex_for_vector vertices2[j] if i > 0
         
-        vertices2[j].x = cos( radians( @lathe_angle ) ) * vertices[j].x
-        vertices2[j].y = sin( radians( @lathe_angle )
-          ) * vertices[j].x
+        vertices2[j].x = cos(@lathe_angle.radians) * vertices[j].x
+        vertices2[j].y = sin(@lathe_angle.radians) * vertices[j].x
         vertices2[j].z = vertices[j].z
         
         vertices[j].z += @helix_offset if @is_helix
@@ -90,8 +85,8 @@ def draw
   
 end
 
-def vertex_for_vector ( pvec )
-  vertex( pvec.x, pvec.y, pvec.z )
+def vertex_for_vector (pvec)
+  pvec.to_vertex(renderer)
 end
 
 def key_pressed 

data/samples/processing_app/basics/input/clock.rb

@@ -1,6 +1,8 @@
-# The current time can be read with the second(), minute(), 
-# and hour() functions. In this example, sin() and cos() values
-# are used to set the position of the hands.
+# Current time can be read with the t = Time.now. Get hour, minute and second 
+# using t.hour, t.min, t.sec functions. The processing hour(), minute() and 
+# second are deprecated since ruby-processing-2.5.1. In this example, sine and 
+# cosine values are used to set the position of the hands.
+
 load_library :fastmath
 
 def setup
@@ -12,17 +14,16 @@ end
 def draw
   background 0
   fill 80
-  no_stroke 
-
+  no_stroke
   ellipse 100, 100, 160, 160 
-  
+  t = Time.now  # access time from ruby
   stroke 255
   stroke_weight 1
-  line( 100, 100, calc_hand_x(second, 0, 72, 100), calc_hand_y(second, 0, 72, 100) )
+  line( 100, 100, calc_hand_x(t.sec, 0, 72, 100), calc_hand_y(t.sec, 0, 72, 100) )
   stroke_weight 2
-  line( 100, 100, calc_hand_x(minute, second, 60, 100), calc_hand_y(minute, second, 60, 100) )
+  line( 100, 100, calc_hand_x(t.min, t.sec, 60, 100), calc_hand_y(t.min, t.sec, 60, 100) )
   stroke_weight 4
-  line( 100, 100, calc_hand_x(hour, minute, 50, 100), calc_hand_y(hour, minute, 50, 100) )
+  line( 100, 100, calc_hand_x(t.hour, t.min, 50, 100), calc_hand_y(t.hour, t.min, 50, 100) )
   
   # Draw the minute ticks
   stroke_weight 2
@@ -33,7 +34,7 @@ def draw
   end
 end
 
-# Angles for sin() and cos() start at 3 o'clock;
+# Angles for sin and cos start at 3 o'clock
 # subtract 90 degrees to make them start at the top
 
 def calc_hand_x(time, time_bit, length, origin)