ruby-processing 2.4.4 → 2.5.0

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

@@ -24,7 +24,7 @@ def setup
   shape = create_shape  
   shape.begin_shape                             # star
   shape.fill(0, 127)
-  shape.no_stroke()
+  shape.no_stroke
   shape.vertex(0, -50)
   shape.vertex(14, -20)
   shape.vertex(47, -15)

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

@@ -10,10 +10,10 @@ attr_reader :star
 
 def setup
   size(640, 360, P2D)
-  smooth()
+  smooth
   # First create the shape
-  @star = create_shape()
-  star.begin_shape()
+  @star = create_shape
+  star.begin_shape
   # You can set fill and stroke
   star.fill(102)
   star.stroke(255)

data/samples/processing_app/topics/file_io/load_file1.rb

@@ -19,7 +19,7 @@ def setup
   # The use of vanilla processing load_strings convenience method is
   # of dubious value in ruby processing when you can do this
   
-  File.open("data/positions.txt").each_line do |line|
+  File.open('data/positions.txt').each_line do |line|
     points << line.split(/\t/).map! { |i| i.to_i * 2 }
   end    
 end

data/samples/processing_app/topics/file_io/save_frames.rb

@@ -14,7 +14,7 @@ def setup
   size(640, 360)
   smooth
   @recording = false
-  directory = "output"
+  directory = 'output'
   Dir::mkdir(directory) unless File.exist?(directory) 
 end
 
@@ -23,7 +23,7 @@ def draw
   
   # An arbitrary oscillating rotating animation 
   # so that we have something to render
-  (0 ... TWO_PI).step(0.2) do |a|
+  (0 ... TAU).step(0.2) do |a|
     push_matrix
     translate(width/2, height/2)
     rotate(a+sin(frame_count*0.004*a))
@@ -36,7 +36,7 @@ def draw
   # The number signs (#) indicate to Processing to 
   # number the files automatically
   if (recording)
-    save_frame("output/frames####.png".to_java)
+    save_frame('output/frames####.png'.to_java)
   end
   
   # Let's draw some stuff to tell us what is happening
@@ -45,9 +45,9 @@ def draw
   textAlign(CENTER)
   fill(255)
   if (!recording)
-    text("Press r to start recording.", width/2, height-24)
+    text('Press r to start recording.', width/2, height-24)
   else
-    text("Press r to stop recording.", width/2, height-24)
+    text('Press r to stop recording.', width/2, height-24)
   end
   
   # A red dot for when we are recording

data/samples/processing_app/topics/file_io/save_one_image.rb

@@ -3,7 +3,7 @@
 # 
 # The save function allows you to save an image from the 
 # display window. In this example, save is run when a mouse
-# button is pressed. The image "line.tif" is saved to the 
+# button is pressed. The image 'line.tif' is saved to the 
 # same folder as the sketch's program file.
 #
 
@@ -18,5 +18,5 @@ def draw
 end
 
 def mouse_pressed
-  save("line.tif")
+  save('line.tif')
 end

data/samples/processing_app/topics/file_io/tile_images.rb

@@ -24,7 +24,7 @@ def draw
 end
 
 def setOffset
-  save("lines-#{x_offset}#{y_offset}.png")
+  save('lines-#{x_offset}#{y_offset}.png')
   @x_offset += 1
   if (x_offset == scaleValue)
     @x_offset = 0

data/samples/processing_app/topics/gui/scrollbar.rb

@@ -15,8 +15,8 @@ def setup
   @hs2 = HScrollbar.new(0, height/2+8, width, 16, 16)
   
   # Load images
-  @img1 = loadImage("seedTop.jpg")
-  @img2 = loadImage("seedBottom.jpg")
+  @img1 = loadImage('seedTop.jpg')
+  @img2 = loadImage('seedBottom.jpg')
 end
 
 def draw
@@ -47,7 +47,7 @@ class HScrollbar
   attr_reader :swidth, :sheight, :xpos, :ypos, :spos, :newspos
   attr_reader :spos_max, :spos_min, :loose, :over, :locked, :ratio 
   def initialize(xp, yp, sw, sh, l)
-    super()
+    super
     @swidth = sw
     @sheight = sh
     widthtoheight = sw - sh

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

@@ -14,9 +14,9 @@ attr_reader  :img1, :img2, :pic_alpha, :name, :sel_mode
 
 def setup
   size(640, 360, P3D)
-  @img1 = loadImage("layer1.jpg")
-  @img2 = loadImage("layer2.jpg") 
-  @name = "REPLACE"
+  @img1 = loadImage('layer1.jpg')
+  @img2 = loadImage('layer2.jpg') 
+  @name = 'REPLACE'
   noStroke
   @sel_mode = REPLACE
 end
@@ -44,34 +44,34 @@ end
 def mouse_pressed
   if (sel_mode == REPLACE) 
     @sel_mode = BLEND
-    @name = "BLEND"
+    @name = 'BLEND'
   elsif (sel_mode == BLEND) 
     @sel_mode = ADD
-    @name = "ADD"
+    @name = 'ADD'
   elsif (sel_mode == ADD) 
     @sel_mode = SUBTRACT
-    @name = "SUBTRACT"
+    @name = 'SUBTRACT'
   elsif (sel_mode == SUBTRACT) 
     @sel_mode = LIGHTEST
-    @name = "LIGHTEST"
+    @name = 'LIGHTEST'
   elsif (sel_mode == LIGHTEST) 
     @sel_mode = DARKEST
-    @name = "DARKEST"
+    @name = 'DARKEST'
   elsif (sel_mode == DARKEST) 
     @sel_mode = DIFFERENCE
-    @name = "DIFFERENCE"
+    @name = 'DIFFERENCE'
   elsif (sel_mode == DIFFERENCE) 
     @sel_mode = EXCLUSION  
-    @name = "EXCLUSION"
+    @name = 'EXCLUSION'
   elsif (sel_mode == EXCLUSION) 
     @sel_mode = MULTIPLY  
-    @name = "MULTIPLY"
+    @name = 'MULTIPLY'
   elsif (sel_mode == MULTIPLY) 
     @sel_mode = SCREEN
-    @name = "SCREEN"
+    @name = 'SCREEN'
   elsif (sel_mode == SCREEN) 
     @sel_mode = REPLACE
-    @name = "REPLACE"
+    @name = 'REPLACE'
   end
 end
 

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

@@ -13,7 +13,7 @@ attr_reader :img
 
 def setup
   size(640, 360)
-  @img = loadImage("moon.jpg") # Load the original image
+  @img = loadImage('moon.jpg') # Load the original image
   noLoop
 end 
 

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

@@ -13,7 +13,7 @@ attr_reader :img
 def setup
   size(640, 360)
   frame_rate(30)
-  @img = load_image("moon-wide.jpg")
+  @img = load_image('moon-wide.jpg')
   img.load_pixels
   # Only need to load the pixels[] array once, because we're only
   # manipulating pixels[] inside draw, not drawing shapes.

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

@@ -17,7 +17,7 @@ W = 120
 
 def setup
   size(640, 360)
-  @img = load_image("moon-wide.jpg") 
+  @img = load_image('moon-wide.jpg') 
 end
 
 def draw

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

@@ -12,13 +12,13 @@ attr_reader :img
 
 def setup 
   size(640, 360)
-  @img = load_image("moon.jpg") # Load the original image
-  noLoop()
+  @img = load_image('moon.jpg') # Load the original image
+  noLoop
 end
 
 def draw
   image(img, 0, 0) # Displays the image from point (0,0) 
-  img.load_pixels()
+  img.load_pixels
   # Create an opaque image of the same size as the original
   edge_img = create_image(img.width, img.height, RGB)
   # Loop through every pixel in the image
@@ -41,7 +41,7 @@ def draw
     end
   end
   # State that there are changes to edge_img.pixels[]
-  edge_img.update_pixels()
+  edge_img.update_pixels
   image(edge_img, width/2, 0) # Draw the new image
 end
 

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

@@ -8,7 +8,7 @@ CELL_SIZE = 2
 
 def setup    
   size 640, 360, P3D    
-  @img = load_image "eames.jpg"
+  @img = load_image 'eames.jpg'
   @columns = @img.width / CELL_SIZE
   @rows = @img.height / CELL_SIZE    
 end

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

@@ -16,7 +16,7 @@ def setup
   
   # Load the image into a new array
   # Extract the values and store in an array
-  @a = load_image("ystone08.jpg")
+  @a = load_image('ystone08.jpg')
   a.load_pixels
   (0 ... a.height).each do |j|
     a_inner = []

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

@@ -14,7 +14,7 @@ def setup
   
   # Load an image from the data directory
   # Load a different image by modifying the comments
-  img = loadImage("frontier.jpg")
+  img = loadImage('frontier.jpg')
   image(img, 0, 0)
   @hist = Array.new(256, 0)
   

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

@@ -14,7 +14,7 @@ attr_reader :signal, :img, :direction
 def setup
   size(640, 360)
   stroke(255)
-  @img = loadImage("sea.jpg")
+  @img = loadImage('sea.jpg')
   @direction = 1
   @signal = 0
   img.load_pixels

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

@@ -16,7 +16,7 @@ def setup
   no_fill
   stroke(255)
   frame_rate(30)
-  @img = load_image("sea.jpg")
+  @img = load_image('sea.jpg')
   @direction = 1
   @signal = 0
 end

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

@@ -11,9 +11,9 @@ attr_reader :img, :img_pixels, :sval, :nmx, :nmy, :res
 
 def setup
   size(640, 360, P3D)
-  noFill()
+  noFill
   stroke(255)
-  @img = load_image("ystone08.jpg")
+  @img = load_image('ystone08.jpg')
   @img_pixels = []
   @sval = 1.0
   @res = 5

data/samples/processing_app/topics/lsystems/Rakefile

@@ -1,20 +1,20 @@
 # Simple demo Rakefile to autorun samples in current directory
 # adjust path to rp5 executable, and or opts as required
 
-SAMPLES_DIR="./"
+SAMPLES_DIR = './'
 
 desc 'run demo'
-task :default => [:demo]
+task default: [:demo]
 
 desc 'demo'
 task :demo do
-  samples_list.shuffle.each{|sample| run_sample sample}
+  samples_list.shuffle.each{ |sample| run_sample sample }
 end
 
 def samples_list
   files = []
   Dir.chdir(SAMPLES_DIR)
-  Dir.glob("*.rb").each do |file|
+  Dir.glob('*.rb').each do |file|
     files << File.join(SAMPLES_DIR, file)
   end
   return files
@@ -22,9 +22,9 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|rp5 run #{sample_name}", "r") do |io|
+  open("|rp5 run #{sample_name}", 'r') do |io|
     while l = io.gets
-      puts(l.chop) 
+      puts(l.chop)
     end      
   end
 end

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

@@ -3,8 +3,7 @@
 # Lindenmayer System in ruby-processing by Martin Prout
 ########################################################
 
-
-load_libraries 'grammar'
+load_library :grammar
 
 attr_reader :chequer
 
@@ -22,22 +21,17 @@ end
 
 class Chequer
   include Processing::Proxy
-  import 'grammar'
   attr_accessor :axiom, :grammar, :production, :draw_length, :theta, :xpos, :ypos
   DELTA = HALF_PI
   
-  def initialize xpos, ypos
+  def initialize(xpos, ypos)
     @xpos = xpos 
     @ypos = ypos 
-    @axiom = "F-F-F-F"        # Axiom
-    @grammar = Grammar.new(
-      axiom,
-      {"F" => "FF-F-F-F-FF"}  # Rules
-   )
+    @axiom = 'F-F-F-F'        # Axiom
+    @grammar = Grammar.new(axiom, 'F' => 'FF-F-F-F-FF')
     @draw_length = 500
     stroke 0, 255, 0
     stroke_weight 2  
-
     @theta = 0
   end
   

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

@@ -3,12 +3,15 @@
 # A 3D Plant implemented using a Context Sensitive
 # Lindenmayer System in ruby-processing 
 # by Martin Prout (30 January 2013)
+# Hold down 'y' key and drag mouse to rotate about y axis
 ########################################################
 
+load_libraries :cs_grammar, :vecmath
 attr_reader :csplant
 
 def setup
   size 800, 800, P3D
+  ArcBall.init(self)
   @csplant = CSPlant.new(height)
   csplant.create_grammar 5
   no_stroke
@@ -17,8 +20,7 @@ end
 def draw
   background 0
   lights
-  translate(width/2, height*0.8)
-  rotate_y QUARTER_PI
+  translate(0, height*0.3)
   csplant.render
 end
 
@@ -26,63 +28,61 @@ end
 # CSPlant 
 ############
 
-load_libraries 'cs_grammar'
-
 class CSPlant
   include Processing::Proxy
-  import 'cs_grammar'
-  IGNORE = "[]+-^&3"
+
+  IGNORE = '[]+-^&3'
   attr_reader :grammar, :axiom, :production, :premis, :rule,
   :theta, :scale_factor, :len, :phi, :len
 
   def initialize(len)
-    @axiom = "F"
+    @axiom = 'F'
     @grammar = Grammar.new(
       axiom,
       {
-        "F" => "F[-EF[3&A]]E[+F[3^A]]",        
-        "F<E" => "F[&F[3+A]][^F[3-A]]"      
+        'F' => 'F[-EF[3&A]]E[+F[3^A]]',        
+        'F<E' => 'F[&F[3+A]][^F[3-A]]'
       },
-      IGNORE      
+      IGNORE
     )
     @production = axiom
     @len = len
     @theta = radians 25
     @phi = radians 25
-    no_stroke()
+    no_stroke
   end
 
-  def render()
+  def render
     fill(0, 75, 152)
     light_specular(204, 204, 204)
     specular(255, 255, 255)
     shininess(1.0)
     repeat = 1
     production.each_char do |ch|
-      case(ch)
-      when "F"
-        translate(0, len/-2, 0)
-        box(len/9, len, len/9)
-        translate(0, len/-2, 0)
-      when "+"
+      case ch
+      when 'F'
+        translate(0, len / -2, 0)
+        box(len / 9, len, len / 9)
+        translate(0, len / -2, 0)
+      when '+'
         rotateX(-theta * repeat)
         repeat = 1
-      when "-"
+      when '-'
         rotateX(theta * repeat)
         repeat = 1
-      when "&"
+      when '&'
         rotateZ(-phi * repeat)
         repeat = 1
-      when "^"
+      when '^'
         rotateZ(phi * repeat)
         repeat = 1
-      when "3"
+      when '3'
         repeat = 3
-      when "["
+      when '['
         push_matrix
-      when "]"
+      when ']'
         pop_matrix
-      when "E", "A"
+      when 'E', 'A'
       else
         puts("character '#{ch}' not in grammar")
       end