ruby-processing 1.0.11 → 2.4.1

data/lib/ruby-processing/runners/run.rb

@@ -1,7 +1,8 @@
 # TODO: this is crud. Windows applets are having serious
 # trouble with absolute paths.
 
-root = defined?(JRUBY_APPLET) ? 'ruby-processing/runners' : File.dirname(__FILE__)
+# root = defined?(JRUBY_APPLET) ? 'ruby-processing/runners' : File.dirname(__FILE__)
+root = File.dirname(__FILE__)
 require "#{root}/base.rb"
 
 Processing.load_and_run_sketch

data/lib/ruby-processing/runners/watch.rb

@@ -23,7 +23,7 @@ module Processing
           puts "reloading sketch..."
           $app && $app.close
           @time = Time.now
-          GC.start
+          java.lang.System.gc
           start_runner
           reload_files_to_watch
         end

data/lib/ruby-processing/version.rb

@@ -0,0 +1,3 @@
+module RubyProcessing
+  VERSION="2.4.1"
+end

data/lib/templates/application/Contents/Info.plist.erb

@@ -25,7 +25,7 @@
 	<key>Java</key>
 	<dict>
 		<key>VMOptions</key>
-		<string>-Xms128M -Xmx256M</string>
+		<string>-Xms756M -Xmx756M</string>
 		<key>MainClass</key>
 		<string>org.jruby.Main</string>
 		<key>WorkingDirectory</key>
@@ -33,7 +33,7 @@
 		<key>Arguments</key>
 		<string>ruby-processing/runners/run.rb <%= @main_file %></string>
 		<key>JVMVersion</key>
-		<string>1.3+</string>
+		<string>1.6+</string>
 		<key>ClassPath</key>
 		<string><%= @class_path %></string>
 		<key>Properties</key>

data/lib/templates/application/lib/args.txt.erb

@@ -1,3 +1,3 @@
-
+set EXPORTED="true"
 org.jruby.Main lib/ruby-processing/runners/run.rb lib/<%= @main_file %>
 <%= @windows_class_path %>

data/lib/templates/application/run.erb

@@ -1,4 +1,5 @@
 #!/bin/sh
 APPDIR=$(dirname "$0")
+export EXPORTED="true"
 cd "$APPDIR/lib"
-java -cp "<%= @linux_class_path %>" org.jruby.Main ruby-processing/runners/run.rb <%= @main_file %>
+java -cp "<%= @linux_class_path %>" org.jruby.Main ../lib/ruby-processing/runners/run.rb <%= @main_file %>

data/lib/templates/create/blank_sketch.rb.erb

@@ -1,15 +1,7 @@
-# <%= @title %>
-
-class <%= @name %> < Processing::App
+def setup
+  <%= "size #{@width}, #{@height}" if @with_size %>
+end
 
-  def setup
-    
-  end
-  
-  def draw
-  
-  end
+def draw
   
 end
-
-<%= @name %>.new :title => "<%= @title %>"<%= ", :width => #{@width}" if @with_size %><%= ", :height => #{@height}" if @with_size %>

data/lib/templates/create/p3d_sketch.rb.erb

@@ -0,0 +1,7 @@
+def setup
+  <%= "size #{@width}, #{@height}, P3D" if @with_size %>
+end
+
+def draw
+  
+end

data/library/boids/boids.rb

@@ -14,43 +14,43 @@ class Boid
     @perch_time = 0.0
   end
   
-  def cohesion(d = 100.0)
+   def cohesion(d = 100.0)
     # Boids gravitate towards the center of the flock,
     # Which is the averaged position of the rest of the boids.
-    vx = vy = vz = 0.0
-    @boids.each do |boid|
-      vx, vy, vz = vx+boid.x, vy+boid.y, vz+boid.z unless boid == self
+    cvx, cvy, cvz = 0.0, 0.0, 0.0
+    boids.each do |boid|
+      cvx, cvy, cvz = cvx+boid.x, cvy+boid.y, cvz+boid.z unless boid.equal? self
     end
-    count = @boids.length - 1.0
-    vx, vy, vz = vx/count, vy/count, vz/count
-    return (vx - @x)/d, (vy - @y)/d, (vz - @z)/d
+    count = boids.length - 1.0
+    cvx, cvy, cvz = cvx/count, cvy/count, cvz/count
+    return (cvx - x) / d, (cvy - y) / d, (cvz - z) / d
   end
   
   def separation(radius = 10.0)
     # Boids don't like to cuddle.
-    vx = vy = vz = 0.0
-    @boids.each do |boid|
-      if boid != self
-        dvx, dvy, dvz = @x - boid.x, @y - boid.y, @z - boid.z
-        vx += dvx if dvx.abs < radius
-        vy += dvy if dvy.abs < radius
-        vz += dvz if dvz.abs < radius
+    svx, svy, svz = 0.0, 0.0, 0.0
+    boids.each do |boid|
+      unless boid.equal? self
+        dvx, dvy, dvz = x - boid.x, y - boid.y, z - boid.z
+        svx += dvx if dvx.abs < radius
+        svy += dvy if dvy.abs < radius
+        svz += dvz if dvz.abs < radius
       end
     end
-    return vx, vy, vz
+    return svx, svy, svz
   end
   
   def alignment(d = 5.0)
     # Boids like to fly at the speed of traffic.
-    vx = vy = vz = 0.0
-    @boids.each do |boid|
-      if boid != self
-        vx, vy, vz = vx+boid.vx, vy+boid.vy, vz+boid.vz
+    avx, avy, avz = 0.0, 0.0, 0.0
+    boids.each do |boid|
+      unless boid.equal? self
+        avx, avy, avz = avx+boid.vx, avy+boid.vy, avz+boid.vz
       end
     end
-    count = @boids.length - 1.0
-    vx, vy, vz = vx/count, vy/count, vz/count
-    return (vx - @vx)/d, (vy - @vy)/d, (vz - @vz)/d
+    count = boids.length - 1.0
+    avx, avy, avz = avx / count, avy / count, avz / count
+    return (avx - vx) / d, (avy - vy) / d, (avz - vz) / d
   end
   
   def limit(max=30.0)
@@ -69,21 +69,43 @@ class Boid
     return a
   end
   
-  def goal(x, y, z, d = 50.0)
+  def goal(gx, gy, gz, d = 50.0)
     # Them boids is hungry.
-    return (x - @x)/d, (y - @y)/d, (z - @z)/d
+    return (gx - x) / d, (gy - y) / d, (gz - z) / d
   end
 end
 
 
 
-class Boids < Array  
+class Boids 
+  extend Enumerable  
+  
   attr_accessor :boids, :x, :y, :w, :h, 
                 :scattered, :has_goal, :flee
                 
   attr_reader :scatter, :scatter_time, :scatter_i,
-              :perch, :perch_y, :perch_t,
+              :perch, :perch_y, :perch_t, :boids,
               :goal_x, :goal_y, :goal_z
+            
+  def initialize
+    @boids = []	  
+  end
+  
+  def each &block
+    boids.each &block	  
+  end
+
+  def shuffle!
+    boids.shuffle!	  
+  end
+
+  def << obj
+    boids << obj	  
+  end
+
+  def length
+    boids.length	  
+  end
               
   def self.flock(n, x, y, w, h)
     return Boids.new.setup(n, x, y, w, h)
@@ -101,8 +123,8 @@ class Boids < Array
     @scatter_time = 50.0
     @scatter_i = 0.0
     @perch = 1.0 # Lower this number to divebomb.
-    @perch_y = @h
-    @perch_time = lambda {25.0 + rand(50.0)}
+    @perch_y = h
+    @perch_t = -> {rand(25..75.0)}
     @has_goal = false
     @flee = false
     @goal_x = @goal_y = @goal_z = 0.0
@@ -119,19 +141,19 @@ class Boids < Array
   end
   
   def perch(ground = nil, chance = 1.0, frames = nil)
-    frames ||= lambda {25.0 + rand(50.0)}
-    ground ||= @h
-    @perch, @perch_y, @perch_time = chance, ground, frames
+    frames ||= -> {rand(25..75.0)}
+    ground ||= h
+    @perch, @perch_y, @perch_t = chance, ground, frames
   end
   
   def no_perch
     @perch = 0.0
   end
   
-  def goal(x, y, z, flee = false)
+  def goal(gx, gy, gz, flee = false)
     @has_goal = true
     @flee = flee
-    @goal_x, @goal_y, @goal_z = x, y, z
+    @goal_x, @goal_y, @goal_z = gx, gy, gz
   end
   
   def no_goal
@@ -140,12 +162,12 @@ class Boids < Array
   
   def constrain
     # Put them boids in a cage.
-    dx, dy = @w * 0.1, @h * 0.1
+    dx, dy = w * 0.1, h * 0.1
     self.each do |b|
-      b.vx += rand(dx) if b.x < @x - dx
-      b.vx += rand(dy) if b.y < @y - dy
-      b.vx -= rand(dx) if b.x > @x + @w + dx
-      b.vy -= rand(dy) if b.y > @y + @h + dy
+      b.vx += rand(dx) if b.x < x - dx
+      b.vx += rand(dy) if b.y < y - dy
+      b.vx -= rand(dx) if b.x > x + w + dx
+      b.vy -= rand(dy) if b.y > y + h + dy
       b.vz += 10.0 if b.z < 0.0
       b.vz -= 10.0 if b.z > 100.0
       
@@ -153,31 +175,27 @@ class Boids < Array
         b.y = @perch_y
         b.vy = -(b.vy.abs) * 0.2
         b.is_perching = true
-        @perch_time.respond_to?(:call) ? b.perch_time = @perch_time.call : b.perch_time = @perch_time
+        @perch_t.respond_to?(:call) ? b.perch_time = @perch_t.call : b.perch_time = @perch_t
       end
     end
   end
-  
-  def shuffle
-    self.sort! { rand }
-  end
-  
-  def update(opts={})
-    # Just flutter, little boids ... just flutter away.
-    # Shuffling keeps things flowing smooth.
-    options = {:shuffled => true, 
-               :cohesion => 100.0, 
-               :separation => 10.0, 
-               :alignment => 5.0, 
-               :goal => 20.0, 
-               :limit => 30.0}
+    
+  def update(opts={}) # Just flutter, little boids ... just flutter away.  	   
+    options = {
+        shuffled: true,     #  Shuffling keeps things flowing smooth.
+        cohesion: 100.0, 
+        separation: 10.0, 
+        alignment: 5.0, 
+        goal: 20.0, 
+        limit: 30.0
+    } 
     options.merge! opts
     
-    self.shuffle if options[:shuffled]
-    m1 = 1.0 # cohesion
-    m2 = 1.0 # separation
-    m3 = 1.0 # alignment
-    m4 = 1.0 # goal
+    self.shuffle! if options[:shuffled]
+    m1 = 1.0   # cohesion
+    m2 = 1.0   # separation
+    m3 = 1.0   # alignment
+    m4 = 1.0   # goal
     
     @scattered = true if !(@scattered) && rand < @scatter
     if @scattered

data/library/control_panel/control_panel.rb

@@ -33,7 +33,7 @@ module ControlPanel
     def update_label(label, name, value)
       value = value.to_s
       value << "0" if value.length < 4
-      label.set_text "<html><br>#{name.to_s}: #{value}</html>"
+      label.set_text "<html><br><b>#{name.to_s}: #{value}</b></html>"
     end
   end
 
@@ -89,34 +89,32 @@ module ControlPanel
 
 
   class Panel < javax.swing.JFrame
-    attr_accessor :elements
+    java_import javax.swing.UIManager
+    
+    attr_accessor :elements, :panel
 
-    def initialize
+    def initialize 
       super()
       @elements = []
       @panel = javax.swing.JPanel.new(java.awt.FlowLayout.new(1, 0, 0))
     end
 
     def display
-      add @panel
-      set_size 200, 30 + (64 * @elements.size)
-      set_default_close_operation javax.swing.JFrame::DISPOSE_ON_CLOSE
+      add panel
+      set_size 200, 30 + (64 * elements.size)
+      set_default_close_operation javax.swing.JFrame::HIDE_ON_CLOSE
       set_resizable false
-      # Need to wait for the sketch to finish sizing...
-      Thread.new do
-        sleep 0.2 while !$app.started?
-        set_location($app.width + 10, 0)
-        show
-      end
+      set_location($app.width + 10, 0) unless ($app.width + 10 > $app.displayWidth)
+      panel.visible = true
     end
 
     def add_element(element, name, has_label=true, button=false)
       if has_label
-        label = javax.swing.JLabel.new("<html><br>#{name}</html>")
-        @panel.add label
+        label = javax.swing.JLabel.new("<html><br><b>#{name}</b></html>")
+        panel.add label
       end
-      @elements << element
-      @panel.add element
+      elements << element
+      panel.add element
       return has_label ? label : nil
     end
 
@@ -141,12 +139,17 @@ module ControlPanel
     def button(name, &block)
       button = Button.new(self, name, block || nil)
     end
+
+    def look_feel lf = "Metal"
+      lafs = javax.swing.UIManager::getInstalledLookAndFeels.select{|info| info.getName.eql? lf}
+      javax.swing.UIManager::setLookAndFeel(lafs[0].getClassName) if lafs.size > 0
+    end
+
   end
 
 
   module InstanceMethods
-    def control_panel
-      return if Processing.online?
+    def control_panel 
       @control_panel = ControlPanel::Panel.new unless @control_panel
       return @control_panel unless block_given?
       yield(@control_panel)

data/library/file_chooser/file_chooser.rb

@@ -0,0 +1,90 @@
+# Here's a little library for using swing JFileChooser.
+# in ruby-processing, borrose heavily from control_panel
+
+module FileChooser
+  ##
+  # FileFilter is abstract, requires accept and getDescription
+  ##
+  
+  require 'pathname'
+  JXChooser = Java::javax::swing::JFileChooser
+  JFile = Java::java::io::File  
+  System = Java::JavaLang::System
+  
+  class Filter < Java::javax::swing::filechooser::FileFilter
+    attr_reader :description, :extensions   
+    def define(description, extensions)
+      @description = description
+      @extensions = extensions
+    end
+    
+    def accept fobj
+      return true if extensions.include?(File.extname(fobj.to_s).downcase)
+      return true if fobj.isDirectory
+    end
+
+    
+    def getDescription
+      description
+    end
+  end
+  
+  class RXChooser
+    java_import javax.swing.UIManager
+    require 'rbconfig'
+    HOST = 'host_os'
+    UHOME = 'user.home'
+    UDIR = 'user.dir'
+    OS = case RbConfig::CONFIG[HOST]
+    # Detect OS      
+    when /darwin/      then :mac
+    when /mswin|mingw/ then :windows
+    else
+      :unix
+    end
+    
+    def initialize
+      @chooser = JXChooser.new
+    end
+    
+    def look_feel lf = "Metal"
+      lafs = javax.swing.UIManager::getInstalledLookAndFeels.select{|info| info.getName.eql? lf}
+      javax.swing.UIManager::setLookAndFeel(lafs[0].getClassName) if lafs.size > 0
+    end
+    
+    def set_filter description, extensions
+      filter = FileChooser::Filter.new
+      filter.define(description, extensions)
+      @chooser.setFileFilter(filter)
+    end
+    
+    def display
+      if :windows == OS
+        @chooser.setCurrentDirectory(JFile.new(System.getProperty(UDIR)))
+      else
+        @chooser.setCurrentDirectory(JFile.new(System.getProperty(UHOME)))
+      end      
+      success = @chooser.show_open_dialog($app)
+      if success == JXChooser::APPROVE_OPTION
+        return Pathname.new(@chooser.get_selected_file.get_absolute_path).to_s
+      else
+        nil
+      end
+    end
+
+    def dispose
+      @chooser = nil
+    end
+
+  end
+  
+  module InstanceMethods
+    def file_chooser
+      @chooser = RXChooser.new
+      return @chooser unless block_given?
+      yield(@chooser)
+    end
+  end
+end
+
+Processing::App.send :include, FileChooser::InstanceMethods