Merge pull request #2 from ruby-processing/master

monkstone · web-flow · commit 8cdf0cafe3e0 · 2017-08-25T19:07:30.000+01:00
replacing `$app`  with Processing.app
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# JRubyArt-examples for JRubyArt-1.3.4+
-Uses a simplified `control_panel` interface, ie use `c.title('PanelTitle')` instead of `c.title = 'PanelTitle'`, the old examples still work with the the latest version of JRubyArt, but these examples require the latest version.
+# JRubyArt-examples for JRubyArt-1.4.0+
+Replaces `$app` with `Processing.app`, new `library_loader` (_but latter change should be transparent_).
 
 Description
 ================
diff --git a/contributed/gravity.rb b/contributed/gravity.rb
@@ -48,7 +48,7 @@ def initialize(x, y, mass)
   def collect_force
     @x_accel, @y_accel = 0, 0
     @min_dist = 1000
-    $app.particles.each do |p|
+    Processing.app.particles.each do |p|
       next if p == self
       g_dist  = Math.hypot(x0 - p.x0, y0 - p.y0)
       g_theta = -angle_of(x0, y0, p.x0, p.y0)
@@ -69,7 +69,7 @@ def move
   end
 
   def grabbed?
-    $app.grabbed == self
+    Processing.app.grabbed == self
   end
 
   def run
diff --git a/external_library/gem/cf3/isosceles.rb b/external_library/gem/cf3/isosceles.rb
@@ -9,7 +9,7 @@ class << self
         size = options[:size]
         rot = options[:rotation]
         rotate(rot) if rot
-        $app.triangle(-0.5 * size, -0.5 * size, -0.5 * size, 0.5 * size, 0.5 * size, 0.5 * size)
+        self.app.triangle(-0.5 * size, -0.5 * size, -0.5 * size, 0.5 * size, 0.5 * size, 0.5 * size)
         rotate(-rot) if rot
       end
     end
diff --git a/external_library/gem/pbox2d/distance_joint/boundary.rb b/external_library/gem/pbox2d/distance_joint/boundary.rb
@@ -13,7 +13,7 @@ class Boundary
 
   def initialize(x, y, w, h)
     @x, @y, @w, @h = x, y, w, h
-    @app = $app
+    @app = Processing.app
     # Define the polygon
     sd = PolygonShape.new
     # Figure out the box2d coordinates
diff --git a/external_library/gem/pbox2d/distance_joint/pair.rb b/external_library/gem/pbox2d/distance_joint/pair.rb
@@ -9,7 +9,7 @@ class Pair
   attr_reader :p1, :p2, :len, :joint
   # Chain constructor
   def initialize(x, y)
-    @app = $app
+    @app = Processing.app
     @len = 32
     @p1 = Particle.new(x, y)
     @p2 = Particle.new(x + rand(-1..1.0), y + rand(-1..1.0))
diff --git a/external_library/gem/pbox2d/distance_joint/particle.rb b/external_library/gem/pbox2d/distance_joint/particle.rb
@@ -12,7 +12,7 @@ class Particle
 
   def initialize(x, y)
     @r = 8
-    @app = $app
+    @app = Processing.app
     # Define a body
     bd = BodyDef.new
     # Set its position
diff --git a/external_library/gem/pbox2d/mouse_joint/boundary.rb b/external_library/gem/pbox2d/mouse_joint/boundary.rb
@@ -12,7 +12,7 @@ class Boundary
 
   def initialize(x, y, w, h, a)
     @x, @y, @w, @h, @a = x, y, w, h, a
-    @app = $app
+    @app = Processing.app
     # Define the polygon
     sd = PolygonShape.new
     # Figure out the box2d coordinates
diff --git a/external_library/gem/pbox2d/mouse_joint/box.rb b/external_library/gem/pbox2d/mouse_joint/box.rb
@@ -11,7 +11,7 @@ class Box
   attr_accessor :body, :w, :h
   # Constructor
   def initialize(x, y)
-    @app = $app
+    @app = Processing.app
     @w, @h = 24, 24
     # Add the box to the box2d world
     make_body(Vec2.new(x, y), w, h)
diff --git a/external_library/gem/pbox2d/mouse_joint/spring.rb b/external_library/gem/pbox2d/mouse_joint/spring.rb
@@ -11,7 +11,7 @@ class Spring
   attr_reader :mouse_joint
 
   def initialize
-    @app = $app
+    @app = Processing.app
   end
 
   # If it exists we set its target to the mouse location
diff --git a/external_library/gem/pbox2d/revolute_joint/box.rb b/external_library/gem/pbox2d/revolute_joint/box.rb
@@ -16,7 +16,7 @@ class Box
   # Constructor
   def initialize(x, y, w, h, lock)
     @w, @h = w, h
-    @app = $app
+    @app = Processing.app
     # Define and create the body
     bd = BodyDef.new
     bd.position.set(box2d.processing_to_world(Vec2.new(x, y)))
diff --git a/external_library/gem/pbox2d/revolute_joint/particle.rb b/external_library/gem/pbox2d/revolute_joint/particle.rb
@@ -13,7 +13,7 @@ class Particle
   attr_reader :body, :r
 
   def initialize(x, y, r)
-    @app = $app
+    @app = Processing.app
     @r = r
     # This function puts the particle in the Box2d world
     makeBody(x, y, r)
diff --git a/external_library/gem/pbox2d/revolute_joint/windmill.rb b/external_library/gem/pbox2d/revolute_joint/windmill.rb
@@ -13,7 +13,7 @@ class Windmill
   attr_reader :joint, :box1, :box2
   
   def initialize(x, y)
-    @app = $app
+    @app = Processing.app
     # Initialize locations of two boxes
     @box1 = Box.new(x, y - 20, 120, 10, false)
     @box2 = Box.new(x, y, 10, 40, true)
diff --git a/external_library/gem/toxiclibs/physics/attract_repel/attractor.rb b/external_library/gem/toxiclibs/physics/attract_repel/attractor.rb
@@ -8,7 +8,7 @@ class Attractor < Physics::VerletParticle2D
 
   def initialize(loc)
     super(loc)
-    @app = $app
+    @app = Processing.app
     @r = 24
     physics.add_particle(self)
     physics.add_behavior(Physics::AttractionBehavior2D.new(self, width, 0.1))
diff --git a/external_library/gem/toxiclibs/physics/attract_repel/particle.rb b/external_library/gem/toxiclibs/physics/attract_repel/particle.rb
@@ -10,7 +10,7 @@ class Particle < Physics::VerletParticle2D
 
   def initialize(loc)
     super(loc)
-    @app = $app
+    @app = Processing.app
     @r = 8
     physics.add_particle(self)
     physics.add_behavior(Physics::AttractionBehavior2D.new(self, r * 4, -1))
diff --git a/external_library/gem/toxiclibs/physics/force_directed_graph/cluster.rb b/external_library/gem/toxiclibs/physics/force_directed_graph/cluster.rb
@@ -11,7 +11,7 @@ class Cluster
   # We initialize a Cluster with a number of nodes, a diameter, and centerpoint
   def initialize(n, d, center)
     @diameter = d
-    @app = $app
+    @app = Processing.app
     # Create the nodes
     @nodes = (0..n).map { Node.new(center.add(TVec2D.randomVector)) }
     # Connect all the nodes with a Spring
diff --git a/external_library/gem/toxiclibs/physics/force_directed_graph/node.rb b/external_library/gem/toxiclibs/physics/force_directed_graph/node.rb
@@ -12,7 +12,7 @@ class Node < Physics::VerletParticle2D
 
   def initialize(pos)
     super(pos)
-    @app = $app
+    @app = Processing.app
   end
 
   # All we're doing really is adding a display function to a VerletParticle
diff --git a/external_library/gem/toxiclibs/physics/simple_cluster/cluster.rb b/external_library/gem/toxiclibs/physics/simple_cluster/cluster.rb
@@ -15,7 +15,7 @@ class Cluster
   def initialize(n, d, center)
     # Set the diameter
     @diameter, = d
-    @app = $app
+    @app = Processing.app
     # Create the nodes
     @nodes = (0..n).map { Node.new(center.add(TVec2D.randomVector)) }
     # Connect all the nodes with a Spring
diff --git a/external_library/gem/toxiclibs/physics/simple_cluster/node.rb b/external_library/gem/toxiclibs/physics/simple_cluster/node.rb
@@ -15,7 +15,7 @@ class Node < Physics::VerletParticle2D
 
   def initialize(pos)
     super(pos)
-    @app = $app
+    @app = Processing.app
   end
 
   # All we're doing really is adding a :display function to a VerletParticle
diff --git a/external_library/gem/toxiclibs/physics/simple_spring/particle.rb b/external_library/gem/toxiclibs/physics/simple_spring/particle.rb
@@ -11,7 +11,7 @@ class Particle < Physics::VerletParticle2D
   def_delegators(:@app, :fill, :stroke, :stroke_weight, :ellipse)
   def initialize(loc)
     super(loc)
-    @app = $app
+    @app = Processing.app
   end
 
   # All we're doing really is adding a display function to a VerletParticle
diff --git a/external_library/gem/toxiclibs/physics/soft_body/connection.rb b/external_library/gem/toxiclibs/physics/soft_body/connection.rb
@@ -7,7 +7,7 @@ class Connection < Physics::VerletSpring2D
   
   def initialize(p1, p2, len, strength)
     super(p1, p2, len, strength)
-    @app = $app 
+    @app = Processing.app 
   end
 
   def display
diff --git a/external_library/gem/toxiclibs/physics/soft_body/particle.rb b/external_library/gem/toxiclibs/physics/soft_body/particle.rb
@@ -10,7 +10,7 @@ class Particle < Physics::VerletParticle2D
   def_delegators(:@app, :fill, :stroke, :stroke_weight, :ellipse)
   def initialize(loc)
     super(loc)
-    @app = $app
+    @app = Processing.app
   end
 
   # All we're doing really is adding a display function to a VerletParticle
diff --git a/external_library/gem/toxiclibs/physics/soft_string/chain.rb b/external_library/gem/toxiclibs/physics/soft_string/chain.rb
@@ -18,7 +18,7 @@ def initialize(p, l, n, r, s)
     # Here is the real work, go through and add particles to the chain itself
     num_points.times do |i|
       # Make a new particle with an initial starting location
-      particle = Particle.new($app.width / 2, i * len)
+      particle = Particle.new(Processing.app.width / 2, i * len)
       # Redundancy, we put the particles both in physics and in our own Array
       physics.addParticle(particle)
       particles << particle
diff --git a/external_library/gem/toxiclibs/verlet_physics/simple_cluster/cluster.rb b/external_library/gem/toxiclibs/verlet_physics/simple_cluster/cluster.rb
@@ -15,7 +15,7 @@ class Cluster
 
   # We initialize a Cluster with a number of nodes, a diameter, and centerpoint
   def initialize(n, d, center)
-    @app = $app
+    @app = Processing.app
     # Set the diameter
     @diameter = d
     # Create the nodes
diff --git a/external_library/gem/toxiclibs/verlet_physics/simple_cluster/node.rb b/external_library/gem/toxiclibs/verlet_physics/simple_cluster/node.rb
@@ -14,7 +14,7 @@ class Node < Physics::VerletParticle2D
   def_delegators(:@app, :fill, :stroke, :stroke_weight, :ellipse)
   def initialize(pos)
     super(pos)
-    @app = $app
+    @app = Processing.app
   end
 
   # All we're doing really is adding a :display function to a VerletParticle
diff --git a/external_library/gem/toxiclibs/verlet_physics/soft_body/blanket.rb b/external_library/gem/toxiclibs/verlet_physics/soft_body/blanket.rb
@@ -7,7 +7,7 @@ class Blanket
   attr_reader :particles, :springs, :physics
 
   def initialize(physics)
-    @app = $app
+    @app = Processing.app
     @particles = []
     @springs = []
     w = 20
diff --git a/external_library/gem/toxiclibs/verlet_physics/soft_body/connection.rb b/external_library/gem/toxiclibs/verlet_physics/soft_body/connection.rb
@@ -6,7 +6,7 @@ class Connection < Physics::VerletSpring2D
   def_delegators(:@app, :stroke, :line)
   def initialize(p1, p2, len, strength)
     super(p1, p2, len, strength)
-    @app = $app
+    @app = Processing.app
   end
 
   def display
diff --git a/external_library/gem/toxiclibs/verlet_physics/soft_body/particle.rb b/external_library/gem/toxiclibs/verlet_physics/soft_body/particle.rb
@@ -10,7 +10,7 @@ class Particle < Physics::VerletParticle2D
   def_delegators(:@app, :fill, :stroke, :ellipse)
   def initialize(loc)
     super(loc)
-    @app = $app
+    @app = Processing.app
   end
 
   # All we're doing really is adding a display function to a VerletParticle
diff --git a/processing_app/library/vecmath/vec2d/library/flock/flock.rb b/processing_app/library/vecmath/vec2d/library/flock/flock.rb
@@ -30,8 +30,8 @@ def initialize(loc)
     @r = 2.0
     @maxspeed = 2
     @maxforce = 0.03
-    @width = $app.width    
-    @height = $app.height
+    @width = Processing.app.width    
+    @height = Processing.app.height
   end
   
   def run(boids)
diff --git a/processing_app/topics/cellular_automata/library/ca/ca.rb b/processing_app/topics/cellular_automata/library/ca/ca.rb
@@ -5,8 +5,8 @@ class CA
   attr_reader :rules, :generation, :cells, :height, :width
   
   def initialize(rules = [])
-    @width = $app.width
-    @height = $app.height
+    @width = Processing.app.width
+    @height = Processing.app.height
     if !rules.empty?
       @rules = rules
     else
diff --git a/processing_app/topics/simulate/library/flock/flock.rb b/processing_app/topics/simulate/library/flock/flock.rb
@@ -30,7 +30,7 @@ class Boid
   attr_reader :location, :velocity, :acceleration, :sz
 
   def initialize(x, y)
-    @width, @height = $app.width, $app.height
+    @width, @height = Processing.app.width, Processing.app.height
     @acceleration = Vec2D.new(0, 0)
     @velocity = Vec2D.new(rand(-1.0..1), rand(-1.0..1))
     @location = Vec2D.new(x, y)
