update chapter 18

Author: monkstone

chapter_18/03_creating_object_from_a_text_file.rb

@@ -32,25 +32,29 @@ def draw
 # A Class to describe a "Bubble"
 #
 class Bubble
+  include Processing::Proxy
+  
+  attr_reader :width, :height
   # The constructor initializes color and size
   # Location is filled randomly
   def initialize(r, g, diameter)
-    @x, @y    = $app.random($app.width), $app.height
+    @width, @height = $app.width, $app.height
+    @x, @y    = rand(width), height
     @r, @g    = r, g
     @diameter = diameter
   end
 
   # Display the Bubble
   def display
-    $app.stroke 0
-    $app.fill @r, @g, 255, 150
-    $app.ellipse @x, @y, @diameter, @diameter
+    stroke 0
+    fill @r, @g, 255, 150
+    ellipse @x, @y, @diameter, @diameter
   end
 
   # Move the bubble
   def drift
-    @y += $app.random(-3, -0.1)
-    @x += $app.random(-1, 1)
-    @y = $app.height + @diameter * 2 if @y < -@diameter * 2
+    @y += rand(-3 .. -0.1)
+    @x += rand(-1 .. 1.0)
+    @y = height + @diameter * 2 if @y < -@diameter * 2
   end
 end

chapter_18/04_loading_and_saving_data_to_text_file.rb

@@ -56,43 +56,46 @@ def save_data
 # A Class to describe a "Bubble"
 #
 class Bubble
-  attr_reader :r, :g, :diameter
+  include Processing::Proxy
+  
+  attr_reader :width, :height, :r, :g, :diameter
 
   # The constructor initializes color and size
   # Location is filled randomly
   def initialize(r, g, diameter)
-    @x        = $app.random($app.width)
-    @y        = $app.height
+    @width, @height = $app.width, $app.height
+    @x        = random(width)
+    @y        = height
     @r        = r
     @g        = g
     @diameter = diameter
   end
 
   # True or False if point is inside circle
   def rollover(mx, my)
-    $app.dist(mx, my, @x, @y) < diameter / 2
+    dist(mx, my, @x, @y) < diameter / 2
   end
 
   # Change Bubble variables
   def change
-    @r        = $app.constrain(@r + $app.random(-10, 10), 0, 255)
-    @g        = $app.constrain(@g + $app.random(-10, 10), 0, 255)
-    @diameter = $app.constrain(@diameter + $app.random(-2, 4), 4, 72)
+    @r        = constrain(@r + rand(-10 .. 10), 0, 255)
+    @g        = constrain(@g + rand(-10 .. 10), 0, 255)
+    @diameter = constrain(@diameter + rand(-2 .. 4), 4, 72)
   end
 
   # Display the Bubble
   def display
-    $app.stroke 0
-    $app.fill @r, @g, 255, 150
-    $app.ellipse @x, @y, @diameter, @diameter
+    stroke 0
+    fill @r, @g, 255, 150
+    ellipse @x, @y, @diameter, @diameter
   end
 
   # Move the bubble
   def drift
-    @y += $app.random(-3, -0.1)
-    @x += $app.random(-1, 1)
+    @y += rand(-3 .. -0.1)
+    @x += rand(-1 .. 1.0)
     if @y < -@diameter * 2
-      @y = $app.height + @diameter * 2 
+      @y = height + @diameter * 2 
     end
   end
 end

chapter_18/05_parsing_yahoos_xml_weather_feed_manually.rb

@@ -47,6 +47,7 @@ def mouse_pressed
 # A WeatherGrabber class
 #
 class WeatherGrabber
+  include Processing::Proxy
   attr_reader :temperature, :weather, :zip
   attr_writer :zip
 
@@ -61,7 +62,7 @@ def request_weather
     # Get all the HTML/XML source code into an array of strings
     # (each line is one element in the array)
     url   = "http://xml.weather.yahoo.com/forecastrss?p=" + @zip
-    lines = $app.load_strings(url)
+    lines = load_strings(url)
 
     # Turn array into one long String
     xml = lines.join # join(lines, ""); 

chapter_18/07_loading_a_url_with_simpleml.rb

@@ -1,32 +1,27 @@
 #
 # Example 18-9: Using Processing's XML library
 #
-import "processing.xml"
+
 
 def setup
   size 200, 200
   smooth
   # Load an XML document
-  xml = XMLElement.new(self, "bubbles.xml")
+  xml = loadXML("bubbles.xml")
 
   # Getting the total number of Bubble objects with getChildCount().  
   totalBubbles = xml.get_child_count
   @bubbles = []
 
   # Get all the child elements
-  children = xml.get_children
+  children = xml.get_children("bubble")
 
   children.each do |child|
-    # The diameter is child 0
-    diameterElement = child.get_child(0)
-
-    # The diameter is the content of the first element while red and green are attributes of the second.
+    diameterElement = child.get_child("diameter")
     diameter = diameterElement.get_content.to_i
-
-    # Color is child 1
-    colorElement = child.get_child(1)
-    r = colorElement.get_int_attribute("red")
-    g = colorElement.get_int_attribute("green")
+    colorElement = child.get_child("color")
+    r = colorElement.get_int("red")
+    g = colorElement.get_int("green")
 
     # Make a new Bubble object with values from XML document
     @bubbles << Bubble.new(r, g, diameter)
@@ -47,27 +42,31 @@ def draw
 # A Bubble class
 #
 class Bubble
+  include Processing::Proxy
+  attr_reader :width, :height
+  
   def initialize(r, g, diameter)
-    @x = $app.random($app.width)
-    @y = $app.height
+    @width, @height = $app.width, $app.height
+    @x = random(width)
+    @y = height
     @r = r
     @g = g
     @diameter = diameter
   end
 
   # Display Bubble
   def display
-    $app.stroke 0
-    $app.fill @r, @g, 255, 150
-    $app.ellipse @x, @y, @diameter, @diameter
+    stroke 0
+    fill @r, @g, 255, 150
+    ellipse @x, @y, @diameter, @diameter
   end
 
   # Bubble drifts upwards
   def drift
-    @y += $app.random(-3, -0.1)
-    @x += $app.random(-1, 1)
+    @y += rand(-3 .. -0.1)
+    @x += rand(-1 .. 1.0)
     if @y < -@diameter * 2
-      @y = $app.height + @diameter * 2 
+      @y = height + @diameter * 2 
     end
   end
 end

chapter_18/08_loading_xml_with_simpleml.rb

@@ -1,8 +1,8 @@
 #
 # Example 18-11: Yahoo search visualization
 #
-load_library "pyahoo"
-import "pyahoo"
+load_library :pyahoo
+java_import "pyahoo"
 
 # The names to search
 NAMES = %w{ Aliki Cleopatra Penelope Daniel Peter }