Update samples for propane-2.0 (ie processing 3)

Author: monkstone

README.md

@@ -1,9 +1,9 @@
 # propane-examples
-Example Sketches for propane see also [Example-Sketches][examples] for ruby-processing (many of with only need to be class wrapped to run with propane).
+Example Sketches for propane-2.0+ see also [Example-Sketches][examples] for ruby-processing (many of with only need to be class wrapped to run with propane).
 
-1. Sketches using the [data_path wrapper][path] (yields absolute path to `data` folder). NB without wrapper these sketches would need to be run using jruby-complete (`propane --run sketch.rb` rather than `jruby sketch.rb`
+1. Sketches using the [data_path wrapper][path] (yields absolute path to `data` folder).
 
-2. Other [sketches][regular], can be run with `propane --run sketch.rb` or `jruby sketch.rb`
+2. Other [sketches][regular]
 
 [path]:https://github.com/ruby-processing/propane-examples/tree/master/data_path
 [regular]:https://github.com/ruby-processing/propane-examples/tree/master/data_path

data_path/bw_shader.rb

@@ -7,8 +7,12 @@ class BwShader < Propane::App
 
   attr_reader :label, :can, :angle, :bw_shader
 
-  def setup
+  def settings
     size(640, 360, P3D)
+  end
+
+  def setup
+    sketch_title 'Black and White Shader'
     @label = load_image(data_path('lachoy.jpg'))
     @can = create_can(100, 200, 32, label)
     @bw_shader = load_shader(data_path('bwfrag.glsl'))
@@ -44,4 +48,4 @@ def create_can(r, h, detail, tex)
   end
 end
 
-BwShader.new title: 'Black & White Shader'
+BwShader.new

data_path/edge_detection.rb

@@ -10,8 +10,12 @@ class EdgeDetection < Propane::App
   KERNEL = [[-1, -1, -1], [-1, 9, -1], [-1, -1, -1]].freeze
   attr_reader :img
 
-  def setup
+  def settings
     size(640, 360)
+  end
+
+  def setup
+    sketch_title 'Edge Detection'
     @img = load_image(data_path('moon.jpg')) # Load the original image
     no_loop
   end
@@ -46,4 +50,4 @@ def draw
   end
 end
 
-EdgeDetection.new title: 'Edge Detection'
+EdgeDetection.new

data_path/glsl_heightmap_noise.rb

@@ -29,8 +29,12 @@ class HeightMap < Propane::App
   attr_reader :images # array to hold 2 input images
   attr_reader :color_map # variable to keep track of the current colorMap
 
-  def setup
+  def settings
     size(1280, 720, P3D) # use the P3D OpenGL renderer
+  end
+
+  def setup
+    sketch_title 'Height Map'
     @blur_factor = 3
     @resize_factor = 0.25
     displace_strength = 0.25 # the displace strength of the GLSL shader displacement effect
@@ -122,4 +126,4 @@ def key_released
   end
 end
 
-HeightMap.new title: 'Height Map'
+HeightMap.new

data_path/kinetic_type.rb

@@ -13,8 +13,12 @@
 # dispay them 'words'
 class KineticType < Propane::App
 
-  def setup
+  def settings
     size(200, 200, P3D)
+  end
+
+  def setup
+    sketch_title 'Kinetic Type'
     frame_rate 30
     # Load the font from the sketch's data directory.
     text_font loadFont(data_path('Univers45.vlw')), 1.0
@@ -76,4 +80,4 @@ def initialize(c, x, y)
   end
 end
 
-KineticType.new title: 'Kinetic Type'
+KineticType.new

data_path/landscape.rb

@@ -13,8 +13,12 @@ class Landscape < Propane::App
   attr_reader :landscape
   java_alias :background_int, :background, [Java::int]
 
-  def setup
+  def settings
     size(640, 360, P2D)
+  end
+
+  def setup
+    sketch_title 'Landscape'
     no_stroke
     # The code of this shader shows how to integrate shaders from shadertoy
     # into Processing with minimal changes.
@@ -31,4 +35,4 @@ def draw
   end
 end
 
-Landscape.new title: 'Landscape'
+Landscape.new

data_path/linear_image.rb

@@ -12,8 +12,12 @@
 class LinearImage < Propane::App
   attr_reader :signal, :img, :direction
 
-  def setup
+  def settings
     size(640, 360)
+  end
+
+  def setup
+    sketch_title 'Linear Image'
     stroke(255)
     @img = load_image(data_path('sea.jpg'))
     @direction = 1
@@ -48,4 +52,4 @@ def draw
   end
 end
 
-LinearImage.new title: 'Linear Image'
+LinearImage.new

data_path/monjori.rb

@@ -13,9 +13,13 @@ class Monjori < Propane::App
   # (Look for Monjori under the Plane Deformations Presets)
 
   attr_reader :monjori
-
-  def setup
+  
+  def settings
     size(640, 360, P2D)
+  end
+  
+  def setup
+    sketch_title 'Monjori'
     no_stroke
     @monjori = load_shader(data_path('monjori.glsl'))
     monjori.set('resolution', width.to_f, height.to_f)
@@ -32,4 +36,4 @@ def draw
   end
 end
 
-Monjori.new title: 'Monjori'
+Monjori.new

regular/arcball_box.rb

@@ -11,18 +11,21 @@
 
 class ArcballBox < Propane::App
 
-def setup
-  size(600, 600, P3D)
-  smooth(8)
-  Processing::ArcBall.init(self, 300, 300)
-  fill 180
-end
+  def setup
+    size(600, 600, P3D)
+    smooth(8)
+  end
 
-def draw
-  background(50)
-  box(300, 300, 300)
-end
+  def setup
+    sketch_title 'ArcBall Box'
+    ArcBall.init(self, 300, 300)
+    fill 180
+  end
 
+  def draw
+    background(50)
+    box(300, 300, 300)
+  end
 end
 
-ArcballBox.new title: 'ArcBall Box'
+ArcballBox.new

regular/arcball_constrain.rb

@@ -12,9 +12,13 @@
 
 class ArcballBox < Propane::App
 
-  def setup
+  def settings
     size(600, 600, P3D)
     smooth(8)
+  end
+
+  def setup
+    sketch_title 'ArcBall Box'
     Processing::ArcBall.constrain(self, :xaxis)
     fill 180
   end
@@ -23,7 +27,6 @@ def draw
     background(50)
     box(300, 300, 300)
   end
-
 end
 
-ArcballBox.new title: 'ArcBall Box'
+ArcballBox.new

regular/bezier_playground.rb

@@ -65,9 +65,13 @@ class BezierPlayground < Propane::App
 
   load_library :control_panel
   include Olap
+  
+  def settings
+    size 300, 300
+  end
 
   def setup
-    size 300, 300
+    sketch_title 'Bezier Playground'
     @curves = []
     @hide = false
     control_panel do |c|
@@ -203,4 +207,4 @@ def draw_control_tangent_lines
   end
 end
 
-BezierPlayground.new title: 'Bezier Playground'
+BezierPlayground.new

regular/circle_collision.rb

@@ -4,9 +4,13 @@
 # Based on http://processing.org/learning/topics/circlecollision.html
 class CircleCollision < Propane::App
   attr_reader :balls
+  
+  def settings
+    size 640, 360
+  end
 
   def setup
-    size 640, 360
+    sketch_title 'Circle Collision'
     @balls = [Ball.new(100, 40, 20), Ball.new(200, 100, 80)]
   end
 
@@ -113,6 +117,4 @@ def display
   end
 end
 
-
-
-CircleCollision.new title: 'Circle Collision'
+CircleCollision.new

regular/colors_two.rb

@@ -7,8 +7,12 @@
 # in the program by their name, rather than a number.
 class CreatingColors < Propane::App
   attr_reader :redder, :yellower, :orangish
-  def setup
+  def settings
     size 640, 360
+  end
+  
+  def setup
+    sketch_title 'Homage to Albers'
     # palette = web_to_color_array(['#CC6600', '#CC9900', '#993300'].to_java(:string))
     palette = web_to_color_array(['#CC6600', '#CC9900', '#993300'])
     # @redder = color 204, 102, 0
@@ -57,4 +61,4 @@ def draw
   end
 end
 
-CreatingColors.new title: 'Homage to Albers'
+CreatingColors.new

regular/creating_colors.rb

@@ -8,11 +8,14 @@
 # in the program by their name, rather than a number.
 class CreatingColors < Propane::App
   attr_reader :redder, :yellower, :orangish
-
   WEB = %w(#CC6600 #CC9900 #993300)
+  
+  def settings
+    size 640, 360
+  end  
 
   def setup
-    size 640, 360
+    sketch_title 'Homage to Albers'
     palette = web_to_color_array(WEB)
     @redder = palette[0]
     @yellower = palette[1]
@@ -61,4 +64,4 @@ def draw
   end
 end
 
-CreatingColors.new title: 'Homage to Albers'
+CreatingColors.new

regular/drawolver.rb

@@ -12,8 +12,12 @@
 class Drawolver < Propane::App
   attr_reader :drawing_mode, :points, :rot_x, :rot_y, :vertices
 
-  def setup
+  def settings
     size 1024, 768, P3D
+  end
+  
+  def setup
+    sketch_title 'Drawolver'
     frame_rate 30
     reset_scene
   end
@@ -90,4 +94,4 @@ def recalculate_shape
   end
 end
 
-Drawolver.new title: 'Drawolver'
+Drawolver.new

regular/elegant_ball.rb

@@ -9,9 +9,12 @@
 class ElegantBall < Propane::App
 
   attr_reader :start_t
-
   def setup
     size(800, 800, P3D)
+  end
+
+  def setup
+    sketch_title 'Elegant Ball'
     color_mode(RGB, 1)
   end
 
@@ -156,4 +159,4 @@ def draw_triangle(depth, r, p1, p2, p3)
   end
 end
 
-ElegantBall.new title: 'Elegant Ball'
+ElegantBall.new

regular/empathy.rb

@@ -15,9 +15,13 @@
 class Empathy < Propane::App
 
   attr_reader :cells
-
-  def setup
+  
+  def settings
     size(500, 500)
+  end
+  
+  def setup
+    sketch_title 'Empathy'
     stroke(0, 0, 0, 25)
     @cells = create_cells(CELL_COUNT)
     start_cell_updates
@@ -77,4 +81,4 @@ def draw_line
   end
 end
 
-Empathy.new(title: 'Empathy')
+Empathy.new

regular/fern.rb

@@ -7,8 +7,12 @@ class Fern < Propane::App
 
 attr_reader :bnds
 
-def setup
+def settings
   size 500, 500
+end
+
+def setup
+  sketch_title 'Fern'
   @bnds = Boundary.new(0, width)
   no_loop
   puts 'Be patient. This takes about 10 seconds to render.'
@@ -54,4 +58,4 @@ def include?(x)
   end
 end
 
-Fern.new title: 'Fern'
+Fern.new