many fixes

Author: monkstone

processing_app/topics/advanced_data/load_save_XML.rb

@@ -45,7 +45,7 @@ def draw
 
 def load_data
   # Load XML file
-  @xml = loadXML('data.xml')
+  @xml = loadXML(data_path('data.xml'))
   # Get all the child nodes named 'bubble'
   children = xml.get_children('bubble')
   sketch_title 'Load & Save Xml'
@@ -90,7 +90,7 @@ def mouse_pressed
   # If the XML file has more than 10 bubble elements
   xml.remove_child(children[0]) if children.length > 10
   # Save a new XML file
-  saveXML(xml, 'data/data.xml')
+  saveXML(xml, data_path('data.xml'))
   # reload the new data
   load_data
 end

processing_app/topics/advanced_data/threads_two.rb

@@ -25,7 +25,7 @@ def setup
 def load_image_thread
   thread do     # supply a block in JRubyArt rather than use reflection
     FRAMES.times do |i|
-      frames << load_image(format(IMG_F, i.to_s.rjust(3, '0')))
+      frames << load_image(data_path(format(IMG_F, i.to_s.rjust(3, '0'))))
       @curr = i
       delay(75) # slows down this thread, the main draw cycle is unaffected
     end

processing_app/topics/create_shapes/group_pshape.rb

@@ -44,19 +44,18 @@ def setup
   # Make a primitive (Rectangle) PShape
   rectangle = create_shape(RECT,-10,-10,20,20)
   rectangle.set_fill(false)
-  rectangle.set_stroke(255)
+  rectangle.set_stroke(color(255))
 
   # Add them all to the group
   group.add_child(star)
   group.add_child(path)
-  group.add_child(rectangle) # Rectangle is missing???
-  
+  group.add_child(rectangle)   
 end
 
 def draw
 
   # We can access them individually via the group PShape
-  @rectangle = group.get_child(2)
+  rectangle = group.get_child(2)
   # Shapes can be rotated
   rectangle.rotate(0.1)
 

processing_app/topics/create_shapes/particle_system_pshape.rb

@@ -12,7 +12,7 @@
 def setup
   sketch_title 'Particle System Pshape'
   # Load the image
-  sprite = loadImage('sprite.png')
+  sprite = load_image(data_path('sprite.png'))
   # A new particle system with 10,000 particles
   @ps = ParticleSystem.new(width, height, sprite, 10_000)
   # Writing to the depth buffer is disabled to avoid rendering
@@ -27,13 +27,11 @@ def draw
   ps.update
   ps.display
   # Set the particle system's emitter location to the mouse
-  ps.set_emitter(mouse_x, mouse_y)
-  
+  ps.set_emitter(mouse_x, mouse_y)  
   # Display frame rate
   fill(255, 0, 255)
   text_size(16)
-  text("Frame rate: #{format('%0.2f', frame_rate)}", 10, 20)
-  
+  text("Frame rate: #{format('%0.2f', frame_rate)}", 10, 20)  
 end
 
 

processing_app/topics/create_shapes/primitive_pshape.rb

@@ -20,7 +20,7 @@ def draw
   # We can dynamically set the stroke and fill of the shape
   circle.set_stroke(color(255))  
   circle.set_stroke_weight(4)
-  circle.set_fill(color(map(mouseX, 0, width, 0, 255)))
+  circle.set_fill(color(map1d(mouseX, 0..width, 0..255)))
   # We can use translate to move the PShape
   translate(mouse_x, mouse_y)
   # Drawing the PShape