ruby-processing 2.4.4 → 2.5.0

data/samples/processing_app/topics/advanced_data/regex.rb

@@ -1,7 +1,7 @@
 #
 # Regular Expression example
-# by Martin Prout.  
-# 
+# by Martin Prout.
+#
 # This uses ruby scan
 #
 # Here we'll load the raw HTML from a URL and search for web-links
@@ -11,11 +11,11 @@ attr_reader :links, :url
 
 def setup
   size(360, 480)
-  @url = "http://processing.org"
+  @url = 'http://processing.org'
   # Load the links
   @links = load_links(url)
   links.uniq! # get rid of the duplicates
-  text_font(create_font("Georgia", 16))
+  text_font(create_font('Georgia', 16))
 end
 
 def draw
@@ -43,5 +43,4 @@ def load_links(s)
             [\w=]*
         )?
     /ix)
-end
-
+end

data/samples/processing_app/topics/advanced_data/threads.rb

@@ -1,11 +1,11 @@
-# 
+#
 # Thread function example
-# by Martin Prout (after a Dan Schiffman vanilla processing version).  
-# 
+# by Martin Prout (after a Dan Schiffman vanilla processing version).
+#
 # This example demonstrates how to use Thread.new to spawn
 # a process that happens outside of the main animation thread.
 #
-# When Thread.new is called, the draw() loop will continue while
+# When Thread.new is called, the draw loop will continue while
 # the code inside the block passed to the thread will operate
 # in the background.
 #
@@ -15,19 +15,19 @@
 # This sketch will load data from all of these URLs in a separate thread
 
 URLS = [
-"http://processing.org", 
-"http://www.processing.org/exhibition/", 
-"http://www.processing.org/reference/", 
-"http://www.processing.org/reference/libraries", 
-"http://www.processing.org/reference/tools",   
-"http://www.processing.org/reference/environment",   
-"http://www.processing.org/learning/", 
-"http://www.processing.org/learning/basics/", 
-"http://www.processing.org/learning/topics/", 
-"http://www.processing.org/learning/gettingstarted/",
-"http://www.processing.org/download/", 
-"http://www.processing.org/shop/", 
-"http://www.processing.org/about/"
+'http://processing.org',
+'http://www.processing.org/exhibition/',
+'http://www.processing.org/reference/',
+'http://www.processing.org/reference/libraries',
+'http://www.processing.org/reference/tools',
+'http://www.processing.org/reference/environment',
+'http://www.processing.org/learning/',
+'http://www.processing.org/learning/basics/',
+'http://www.processing.org/learning/topics/',
+'http://www.processing.org/learning/gettingstarted/',
+'http://www.processing.org/download/',
+'http://www.processing.org/shop/',
+'http://www.processing.org/about/'
 ]
 
 
@@ -42,14 +42,14 @@ end
 
 def draw
   background(0)
-  
-  # If we're not finished draw a "loading bar"
+
+  # If we're not finished draw a 'loading bar'
   # This is so that we can see the progress of the thread
   # This would not be necessary in a sketch where you wanted to load data in the background
-  # and hide this from the user, allowing the draw() loop to simply continue
+  # and hide this from the user, allowing the draw loop to simply continue
   if (!finished)
     stroke(255)
-    no_fill()
+    no_fill
     rect(width/2-150, height/2, 300, 10)
     fill(255)
     # The size of the rectangle is mapped to the percentage completed
@@ -58,29 +58,29 @@ def draw
     text_size(16)
     text_align(CENTER)
     fill(255)
-    text("Loading", width/2, height/2+30)
+    text('Loading', width/2, height/2+30)
   else
     # The thread is complete!
     text_align(CENTER)
     text_size(24)
     fill(255)
-    text("Finished loading. Click the mouse to load again.", width/2, height/2)
+    text('Finished loading. Click the mouse to load again.', width/2, height/2)
   end
 end
 
 def load_data
-  Thread.new { 
+  Thread.new {
     # The thread is not completed
     @finished = false
     @percent = 0
     # Reset the data to empty
-    @all_data = ""
+    @all_data = ''
     URLS.each_with_index do |url, i|
       lines = load_strings(url)
       all_txt = lines.join(' ')
       words = all_txt.scan(/\w+/)
       words.each do |word|
-        word.strip! 
+        word.strip!
         word.downcase!
       end
       words.sort!
@@ -92,5 +92,5 @@ def load_data
 end
 
 def mouse_pressed   # guard against calling load_data when running
-  load_data unless !finished 
+  load_data unless !finished
 end

data/samples/processing_app/topics/advanced_data/threads_two.rb

@@ -16,7 +16,8 @@ def setup
   @curr = 0
   thread do    # supply a block in ruby-processing rather than use reflection
     FRAMES.times do |i|
-      frames << load_image("a#{nf(i, 3)} copy.jpg")
+      frames << load_image("a#{i.to_s.rjust(3, "0")} copy.jpg") # ruby syntax
+      #frames << load_image("a#{nf(i, 3)} copy.jpg") # processing function nf           
       @curr = i
       delay(75) #just slows down this thread - the main draw cycle is unaffected...
     end
@@ -30,7 +31,7 @@ end
 
 def draw
   if (done_loading)
-    background(0)    
+    background(0)
     image(frames[curr], 0, 0)
     @curr += 1
     if (curr > 115)

data/samples/processing_app/topics/advanced_data/word_frequency.rb

@@ -1,24 +1,26 @@
 #
 # After a HashMap example
-# by Daniel Shiffman.  
-# 
-# This example demonstrates how to use a Hash to store 
-# a collection of objects referenced by a key. This is much like an array, 
+# by Daniel Shiffman.
+#
+# This example demonstrates how to use a Hash to store
+# a collection of objects referenced by a key. This is much like an array,
 # only instead of accessing elements with a numeric index, we use a String.
 # If you are familiar with associative arrays from other languages,
 # this is the same idea.
 #
 # The Processing classes IntHash, FloatHash, and StringHash offer a simple
-# way of pairing Strings with numbers or other Strings. But are probably of 
+# way of pairing Strings with numbers or other Strings. But are probably of
 # less interest to rubyists.
 #
-# In this example, words that appear in one book (Dracula) are colored white 
+# In this example, words that appear in one book (Dracula) are colored white
 # whilst words in the other book (Frankenstein) are colored black.
 #
 load_library 'word'
 
-DRACULA = "dracula.txt"
-FRANKENSTEIN = "frankenstein.txt"
+DRACULA = 'dracula.txt'
+FRANKENSTEIN = 'frankenstein.txt'
+DRAC = /#{DRACULA}/
+FRANK = /#{FRANKENSTEIN}/
 
 attr_accessor :words
 
@@ -31,7 +33,7 @@ def setup
   load_file(DRACULA)
   load_file(FRANKENSTEIN)
   # Create the font
-  text_font(create_font("Georgia", 24))
+  text_font(create_font('Georgia', 24))
 end
 
 def draw
@@ -47,29 +49,29 @@ end
 
 # Load a file
 def load_file(filename)
-  tokens = File.open(data_path(filename), "r"){|file| file.read.scan(/[\w'-]+/)}
+  tokens = File.open(data_path(filename), 'r'){ |file| file.read.scan(/[\w'-]+/)}
   tokens.each do |s|
     s = s.downcase
     # Is the word in the HashMap
-    if (words.has_key?(s))
+    if (words.key?(s))
       # Get the word object and increase the count
       # We access objects from a Hash via its key, the String
       w = words[s]
       # Which book am I loading?
-      if (filename == DRACULA)
+      if DRAC =~ filename
         w.increment_dracula
-      elsif (filename == FRANKENSTEIN)
+      elsif FRANK =~ filename
         w.increment_franken
       end
     else
       # Otherwise make a new word
       w = Word.new(s)
-      # And add entry to the Hash 
+      # And add entry to the Hash
       # The key for us is the String and the value is the Word object
       words[s] = w
-      if (filename == DRACULA)
+      if DRAC =~ filename
         w.increment_dracula
-      elsif (filename == FRANKENSTEIN)
+      elsif FRANK =~ filename
         w.increment_franken
       end
     end

data/samples/processing_app/topics/advanced_data/yahoo_weather.rb

@@ -2,7 +2,7 @@
 # Loading XML Data
 # by Daniel Shiffman.  
 #
-# This example demonstrates how to use loadXML()
+# This example demonstrates how to use loadXML
 # to retrieve data from an XML document via a URL
 #
 
@@ -11,7 +11,8 @@ attr_reader :zip, :weather, :temperature
 def setup
   size(600, 360)
   @zip = 10003
-  font = create_font("Merriweather-Light.ttf", 28)
+  font = create_font('Times Roman', 28)
+  # font = create_font('Merriweather-Light.ttf', 28)
   text_font(font)
 
   # The URL for the XML document
@@ -21,11 +22,11 @@ def setup
   xml = loadXML(url)
 
   # Grab the element we want
-  forecast = xml.get_child("channel").get_child("item").get_child("yweather:forecast")
+  forecast = xml.get_child('channel').get_child('item').get_child('yweather:forecast')
   
   # Get the attributes we want
-  @temperature = forecast.get_int("high")
-  @weather = forecast.get_string("text")
+  @temperature = forecast.get_int('high')
+  @weather = forecast.get_string('text')
 end
 
 def draw

data/samples/processing_app/topics/animation/animated_sprite.rb

@@ -16,22 +16,22 @@ def setup
   size(640, 360)
   background(255, 204, 0)
   frame_rate(24)
-  @animation1 = Animation.new("PT_Shifty_", 38)
-  @animation2 = Animation.new("PT_Teddy_", 60)
+  @animation1 = Animation.new('PT_Shifty_', 38)
+  @animation2 = Animation.new('PT_Teddy_', 60)
   @ypos = height * 0.25
   @xpos = 0
 end
 
 def draw 
   dx = mouse_x - xpos
-  @xpos = xpos + dx/DRAG
+  @xpos = xpos + dx / DRAG
   # Display the sprite at the position xpos, ypos
-  if (mouse_pressed?)
+  if mouse_pressed?
     background(153, 153, 0)
-    animation1.display(xpos-animation1.get_width/2, ypos)
+    animation1.display(xpos - animation1.get_width / 2, ypos)
   else
     background(255, 204, 0)
-    animation2.display(xpos-animation2.get_width/2, ypos)
+    animation2.display(xpos - animation2.get_width / 2, ypos)
   end
 end
 
@@ -41,7 +41,9 @@ class Animation
   def initialize(image_prefix, count)
     @image_count = count
     @frame = 0
-    @images = (0 ... image_count).map{|i| load_image("%s%04d%s" %  [image_prefix, i, ".gif"])}
+    @images = (0 ... image_count).map { 
+    |i| load_image(format('%s%04d%s', image_prefix, i, '.gif')) 
+    }
   end
 
   def display(xpos, ypos)

data/samples/processing_app/topics/animation/sequential.rb

@@ -8,34 +8,34 @@
 
 NUM_FRAMES = 12  # The number of frames in the animation
 attr_reader :frame, :images
-    
+
 def setup
   size(640, 360)
   frame_rate(24)
   @frame = 0
   @images = []
-  images << loadImage("PT_anim0000.gif")
-  images << loadImage("PT_anim0001.gif") 
-  images << loadImage("PT_anim0002.gif")
-  images << loadImage("PT_anim0003.gif") 
-  images << loadImage("PT_anim0004.gif")
-  images << loadImage("PT_anim0005.gif") 
-  images << loadImage("PT_anim0006.gif")
-  images << loadImage("PT_anim0007.gif") 
-  images << loadImage("PT_anim0008.gif")
-  images << loadImage("PT_anim0009.gif") 
-  images << loadImage("PT_anim0010.gif")
-  images << loadImage("PT_anim0011.gif")
-end 
- 
-def draw 
+  images << load_image('PT_anim0000.gif')
+  images << load_image('PT_anim0001.gif')
+  images << load_image('PT_anim0002.gif')
+  images << load_image('PT_anim0003.gif')
+  images << load_image('PT_anim0004.gif')
+  images << load_image('PT_anim0005.gif')
+  images << load_image('PT_anim0006.gif')
+  images << load_image('PT_anim0007.gif')
+  images << load_image('PT_anim0008.gif')
+  images << load_image('PT_anim0009.gif')
+  images << load_image('PT_anim0010.gif')
+  images << load_image('PT_anim0011.gif')
+end
+
+def draw
   background(0)
   @frame = (frame + 1) % NUM_FRAMES  # Use % to cycle through frames
   offset = 0
-  (-100 ... width).step(images[0].width) do |i|  
-    image(images[(frame+offset) % NUM_FRAMES], i, -20)
+  (-100 ... width).step(images[0].width) do |i|
+    image(images[(frame + offset) % NUM_FRAMES], i, -20)
     offset += 2
-    image(images[(frame+offset) % NUM_FRAMES], i, height/2)
+    image(images[(frame + offset) % NUM_FRAMES], i, height / 2)
     offset += 2
   end
 end

data/samples/processing_app/topics/cellular_automata/library/ca/ca.rb

@@ -29,7 +29,7 @@ class CA
   # Reset to generation 0
   def restart
     @cells = Array.new(width / SCL, 0)
-    cells[cells.length/2] = 1    # We arbitrarily start with just the middle cell having a state of "1"
+    cells[cells.length/2] = 1    # We arbitrarily start with just the middle cell having a state of '1'
     @generation = 0
   end
   

data/samples/processing_app/topics/cellular_automata/wolfram.rb

@@ -8,7 +8,7 @@
 # When the system reaches bottom of the window, it restarts with a new ruleset
 # Mouse click restarts as well. 
 #
-load_library 'ca'
+load_library :ca
  
 attr_reader :ca   # An instance object to describe the Wolfram basic Cellular Automata
 

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

@@ -1,7 +1,7 @@
 #
 # BeginEnd_contour
 # 
-# How to cut a shape out of another using begin_contour() and end_contour()
+# How to cut a shape out of another using begin_contour and end_contour
 #
  
 attr_reader :s

data/samples/processing_app/topics/create_shapes/library/wiggler/wiggler.rb

@@ -8,9 +8,9 @@ class Wiggler
     @x = width/2
     @y = height/2 
     @yoff = 0
-    # The "original" locations of the vertices make up a circle
+    # The 'original' locations of the vertices make up a circle
     @original = []
-    (0 ... TWO_PI).step(0.2) do |a|
+    (0 ... TAU).step(0.2) do |a|
       v = PVector.from_angle(a)
       v.mult(100)
       original << v
@@ -32,9 +32,9 @@ class Wiggler
     @xoff = 0
     # Apply an offset to each vertex
     (0 ... s.get_vertex_count).each do |i|
-      # Calculate a new vertex location based on noise around "original" location
+      # Calculate a new vertex location based on noise around 'original' location
       pos = original[i]
-      a = TWO_PI*noise(xoff,yoff)
+      a = TAU*noise(xoff,yoff)
       r = PVector.from_angle(a)
       r.mult(4)
       r.add(pos)

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

@@ -12,7 +12,7 @@ attr_reader :ps
 def setup
   size(640, 360, P2D)
   # Load the image
-  sprite = loadImage("sprite.png")
+  sprite = loadImage('sprite.png')
   # A new particle system with 10,000 particles
   @ps = ParticleSystem.new(width, height, sprite, 10000)
   # Writing to the depth buffer is disabled to avoid rendering
@@ -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('%.2f', frame_rate)}', 10, 20)
   
 end
 

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

@@ -20,7 +20,7 @@ def setup
   
   x = 0
   # Calculate the path as a sine wave
-  (0 .. TWO_PI).step(0.1) do |theta|
+  (0 .. TAU).step(0.1) do |theta|
     path.vertex(x,sin(theta)*100)
     x += 5
   end