ruby-processing 1.0.6 → 1.0.7

data/CHANGELOG

@@ -1,3 +1,15 @@
+v1.0.7 Stability...
+  * Added preliminary support for embedding Ruby-Processing in the Processing
+    IDE (see the ruby-processing-plugin project).
+  * Added 'width' and 'height' as methods that should get proxied down
+    to inner classes and classes that include the Processing::Proxy.
+  * Fixed a padding bug that put tiny gray margins on Windows and Linux.
+  * Updated JRuby to 1.2.0 final as well as the Processing libraries. 
+  * Got a little bit better at detecting full-screen support on Linux.
+  * Fixed some applet and app exporting problems on Windows.
+  * The Boids library had a speed limit fix that should make 'em less flighty.
+  * Peter Krenn contributed a simple Pong example.
+  
 v1.0.6 Inner Classes...
   * Java-style inner classes. Any inner class of a sketch will now have the 
     Processing methods and constants proxied down for convenience.

data/lib/ruby-processing.rb

@@ -14,13 +14,24 @@ require 'ruby-processing/helpers/numeric'
 
 # The top-level namespace, a home for all Ruby-Processing classes.
 module Processing
-  VERSION = [1,0,6] unless defined? Processing::VERSION
+  VERSION = [1,0,7] unless defined? Processing::VERSION
   
   # Returns the current version of Ruby-Processing.
   def self.version
     VERSION.join('.')
   end
   
+  # Are we online -- inside an applet?
+  def self.online?
+    @online ||= defined?(JRUBY_APPLET)
+  end
+  
+  # Are we embedded -- inside the Processing IDE?
+  def self.embedded?
+    @embedded ||= defined?(RP5_EMBEDDED)
+  end 
+  
+  # Autoload a number of constants that we may end up using.
   autoload :App,                  'ruby-processing/app'
   autoload :Runner,               'ruby-processing/runner'
   autoload :Watcher,              'ruby-processing/runners/watch'

data/lib/ruby-processing/app.rb

@@ -4,10 +4,10 @@
 
 require 'java'
 
-module Processing   
+module Processing
 
   # Conditionally load core.jar
-  require "#{RP5_ROOT}/lib/core/core.jar" unless Object.const_defined?(:JRUBY_APPLET)  
+  require "#{RP5_ROOT}/lib/core/core.jar" unless Processing.online? || Processing.embedded? 
   import "processing.core"
 
   # This is the main Ruby-Processing class, and is what you'll
@@ -79,13 +79,6 @@ module Processing
       super(subclass)
       @sketch_class = subclass
     end
-    
-
-    # Are we running inside an applet?
-    def self.online?
-      @online ||= Object.const_defined?(:JRUBY_APPLET)
-    end
-    def online?; self.class.online?; end
 
 
     # Detect if a library has been loaded (for conditional loading)
@@ -113,7 +106,7 @@ module Processing
     def self.load_ruby_library(dir)
       dir = dir.to_sym
       return true if @@loaded_libraries[dir]
-      if online?
+      if Processing.online?
         begin
           return @@loaded_libraries[dir] = (require "library/#{dir}/#{dir}")
         rescue LoadError => e
@@ -137,7 +130,7 @@ module Processing
     def self.load_java_library(dir)
       dir = dir.to_sym
       return true if @@loaded_libraries[dir]
-      return @@loaded_libraries[dir] = !!(JRUBY_APPLET.get_parameter("archive").match(%r(#{dir}))) if online?
+      return @@loaded_libraries[dir] = !!(JRUBY_APPLET.get_parameter("archive").match(%r(#{dir}))) if Processing.online?
       local_path = "#{SKETCH_ROOT}/library/#{dir}"
       gem_path = "#{RP5_ROOT}/library/#{dir}"
       path = File.exists?(local_path) ? local_path : gem_path
@@ -172,8 +165,8 @@ module Processing
       super()
       $app = self
       proxy_java_fields
-      set_sketch_path unless online?
-      make_accessible_to_the_browser if online?
+      set_sketch_path unless Processing.online?
+      # make_accessible_to_the_browser if Processing.online?
       default_title = File.basename(Processing::SKETCH_PATH).sub(/(\.rb|\.pde)$/, '').titleize
       @width  = options[:width]   ||  DEFAULT_WIDTH
       @height = options[:height]  ||  DEFAULT_HEIGHT
@@ -203,9 +196,7 @@ module Processing
     # If you'd like to do something fancy, feel free.
     def set_sketch_path(path=nil)
       field = @declared_fields['sketchPath']
-      local = SKETCH_ROOT
-      default = $__windows_app_mode__ ? "#{local}/lib" : local
-      field.set_value(java_self, path || default)
+      field.set_value(java_self, path || SKETCH_ROOT)
     end
     
     
@@ -337,8 +328,8 @@ module Processing
     # Cleanly close and shutter a running sketch.
     def close
       $app = nil
-      control_panel.remove if respond_to?(:control_panel) && !online?
-      container = online? ? JRUBY_APPLET : @frame
+      control_panel.remove if respond_to?(:control_panel) && !Processing.online?
+      container = Processing.online? ? JRUBY_APPLET : @frame
       container.remove(self)
       self.destroy
       container.dispose
@@ -374,14 +365,13 @@ module Processing
       # Wait for init to get its grey tracksuit on and run a few laps.
       sleep 0.02 while default_size? && !finished? && !@@full_screen
       
-      if online?
+      if Processing.online?
         display_in_an_applet
       elsif full_screen?
-        # linux doesn't support full screen exclusive mode, but don't worry, it works very well
-        display   = java.awt.GraphicsEnvironment.get_local_graphics_environment.get_default_screen_device
+        display   = java.awt.GraphicsEnvironment.local_graphics_environment.default_screen_device
         linux     = java.lang.System.get_property("os.name") == "Linux"
-        supported = display.full_screen_supported?
-        supported || linux ? display_full_screen(display) : display_in_a_window
+        supported = display.full_screen_supported? || linux
+        supported ? display_full_screen(display) : display_in_a_window
       else
         display_in_a_window
       end
@@ -391,8 +381,8 @@ module Processing
     
     def display_full_screen(display)
       @frame = java.awt.Frame.new(display.default_configuration)
-      mode = display.display_mode
-      @width, @height = mode.get_width, mode.get_height
+      dimension = java.awt.Toolkit.default_toolkit.screen_size
+      @width, @height = dimension.width, dimension.height
       @frame.set_undecorated true
       @frame.set_ignore_repaint true
       @frame.set_background java.awt.Color.black
@@ -411,14 +401,15 @@ module Processing
       @frame.set_layout nil
       @frame.add self
       @frame.pack
-      @frame.set_default_close_operation(javax.swing.JFrame::EXIT_ON_CLOSE)
-      @frame.set_resizable(false)
-      ins           = @frame.get_insets
-      hpad, vpad    = ins.left + ins.right, ins.top + ins.bottom
-      frame_width   = [width, MIN_WINDOW_WIDTH].max + hpad
-      frame_height  = [height, MIN_WINDOW_HEIGHT].max + vpad
+      @frame.set_resizable false
+      @frame.set_default_close_operation Processing.embedded? ? 
+        javax.swing.JFrame::DISPOSE_ON_CLOSE : javax.swing.JFrame::EXIT_ON_CLOSE
+      ins          = @frame.get_insets
+      hpad, vpad   = ins.left + ins.right, ins.top + ins.bottom
+      frame_width  = [width, MIN_WINDOW_WIDTH].max + hpad
+      frame_height = [height, MIN_WINDOW_HEIGHT].max + vpad
       @frame.set_size(frame_width, frame_height)
-      set_bounds((frame_width - width) / 2.0, (frame_height - vpad - height) / 2.0, width, height)
+      set_bounds((frame_width - hpad - width) / 2.0, (frame_height - vpad - height) / 2.0, width, height)
       @frame.show
     end
 
@@ -437,14 +428,15 @@ module Processing
     # When the net library is included, we make the Ruby interpreter
     # accessible to javascript as the 'ruby' variable. From javascript,
     # you can call evalScriptlet() to run code against the sketch.
-    def make_accessible_to_the_browser
-      return unless library_loaded?('net')
-      field = java.lang.Class.for_name("org.jruby.JRubyApplet").get_declared_field("runtime")
-      field.set_accessible true
-      ruby = field.get(JRUBY_APPLET)
-      window = Java::netscape.javascript.JSObject.get_window(JRUBY_APPLET)
-      window.set_member('ruby', ruby)
-    end
+    #
+    # def make_accessible_to_the_browser
+    #   return unless library_loaded?('net')
+    #   field = java.lang.Class.for_name("org.jruby.JRubyApplet").get_declared_field("runtime")
+    #   field.set_accessible true
+    #   ruby = field.get(JRUBY_APPLET)
+    #   window = Java::netscape.javascript.JSObject.get_window(JRUBY_APPLET)
+    #   window.set_member('ruby', ruby)
+    # end
 
   end # Processing::App
   
@@ -459,6 +451,7 @@ module Processing
     def self.desired_method_names
       bad_method = /__/    # Internal JRuby methods.
       unwanted = PApplet.superclass.instance_methods + Object.instance_methods
+      unwanted -= ['width', 'height']
       methods = Processing::App.public_instance_methods
       methods.reject {|m| unwanted.include?(m) || bad_method.match(m) }
     end

data/lib/ruby-processing/runner.rb

@@ -122,7 +122,7 @@ module Processing
     def spin_up(starter_script, sketch)
       runner = "#{RP5_ROOT}/lib/ruby-processing/runners/#{starter_script}"
       java_args = discover_java_args(sketch)
-      command = "java #{java_args} -cp #{jruby_complete} #{dock_icon} org.jruby.Main #{runner} #{sketch}"
+      command = "java #{java_args} -cp \"#{jruby_complete}\" #{dock_icon} org.jruby.Main \"#{runner}\" #{sketch}"
       exec(command)
       # exec replaces the Ruby process with the JRuby one.
     end

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

@@ -45,7 +45,7 @@ module Processing
   
   # Read in the sketch source code. Needs to work both online and offline.
   def self.read_sketch_source
-    if Processing::App.online?
+    if Processing.online?
       # Fuck the following lines. Fucking Java can go sit on broken glass.
       source = ''
       url = java.net.URL.new(JRUBY_APPLET.get_code_base, Processing::SKETCH_PATH)

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

@@ -1,11 +1,7 @@
-# Windows apps start life in the wrong folder.
-# TODO: Fix this crud as soon as possible.
-if ARGV[1] == '--windows-app'
-  ARGV[1] = nil
-  Dir.chdir('lib')
-  $__windows_app_mode__ = true
-end
+# TODO: this is crud. Windows applets are having serious
+# trouble with absolute paths.
 
-require "#{File.dirname(__FILE__)}/base.rb"
+root = defined?(JRUBY_APPLET) ? 'ruby-processing/runners' : File.dirname(__FILE__)
+require "#{root}/base.rb"
 
 Processing.load_and_run_sketch

data/lib/templates/applet/index.html.erb

@@ -77,7 +77,6 @@
       <param name="archive" value="<%= @file_list %>" />
       <param name="jruby.eval" value="ARGV[0] = '<%= @main_file %>'; require 'ruby-processing/runners/run.rb'" />
       <param name="image" value="images/ruby.jpg" />
-      <param name="centerimage" value="true" /> 
       <param name="boxmessage" value="Loading <%= @title %>..." />
       <param name="lang" value="en" />
       <param name="mayscript" value="true" />

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

@@ -1,3 +1,3 @@
 
-org.jruby.Main lib/ruby-processing/runners/run.rb <%= @main_file %> --windows-app
+org.jruby.Main lib/ruby-processing/runners/run.rb lib/<%= @main_file %>
 <%= @windows_class_path %>

data/library/boids/boids.rb

@@ -55,9 +55,12 @@ class Boid
   
   def limit(max=30.0)
     # Tweet, Tweet! The boid police will bust you for breaking the speed limit.
-    @vx = (@vx/@vx.abs) * max if @vx.abs > max
-    @vy = (@vy/@vy.abs) * max if @vy.abs > max
-    @vz = (@vz/@vz.abs) * max if @vz.abs > max
+    most = [@vx.abs, @vy.abs, @vz.abs].max
+    return if most < max
+    scale = max / most.to_f
+    @vx *= scale
+    @vy *= scale
+    @vz *= scale
   end
   
   def angle

data/library/control_panel/control_panel.rb

@@ -145,7 +145,7 @@ module ControlPanel
 
   module InstanceMethods
     def control_panel
-      return if Processing::App.online?
+      return if Processing.online?
       @control_panel = ControlPanel::Panel.new unless @control_panel
       return @control_panel unless block_given?
       yield(@control_panel)

data/samples/jwishy.rb

@@ -12,7 +12,7 @@
 # -- omygawshkenas
 
 class Sketch < Processing::App
-  load_libraries :control_panel, :net
+  load_library :control_panel
   
   attr_accessor :x_wiggle, :y_wiggle, :magnitude, :bluish
   

data/samples/pong.rb

@@ -0,0 +1,175 @@
+# Simple pong clone to demonstrate keyboard input and basic collision detection
+# Left paddle is controlled with 'a' and 'z', right with ''' and '/'
+
+class Sketch < Processing::App
+  def setup
+    smooth
+    ellipse_mode(CENTER)
+    no_fill
+    stroke(255)
+    frame_rate(60)
+
+    @left_paddle = Paddle.new(width / 4, height / 2)
+    @right_paddle = Paddle.new(width / 4 * 3, height / 2)
+    @ball = Ball.new(width / 2, height / 2)
+  end
+
+  def draw
+    background(0)
+
+    paddles.each { |paddle| paddle.update }
+
+    @ball.collide_with_boundaries
+    paddles.each { |paddle| @ball.collide_with_paddle(paddle) }
+    @ball.move
+
+    paddles.each { |paddle| paddle.draw }
+    @ball.draw
+  end
+  
+  def paddles
+    return @left_paddle, @right_paddle
+  end
+
+  def key_pressed
+    case key
+      when 'a'  then  @left_paddle.direction = -1
+      when 'z'  then  @left_paddle.direction = 1
+      when '\'' then  @right_paddle.direction = -1
+      when '/'  then  @right_paddle.direction = 1
+    end
+  end
+
+  def key_released
+    case key
+      when 'a',  'z' then @left_paddle.direction = 0
+      when '\'', '/' then @right_paddle.direction = 0
+    end
+  end
+
+  class Paddle
+    attr_accessor :position, :radius, :direction
+
+    def initialize(x, y)
+      @position = Vector.new(x, y)
+      @radius = 20
+      @direction = 0
+      @speed = 2
+    end
+
+    def draw
+      stroke_weight(2)
+      ellipse(@position.x, @position.y, @radius * 2, @radius * 2)
+    end
+
+    def update
+      move
+      collide_with_boundaries
+    end
+
+    def move
+      @position.y += @direction * @speed
+    end
+
+    def collide_with_boundaries
+      @position.y = @position.y < @radius ? @radius : @position.y > height - @radius ? height - @radius : @position.y
+    end
+  end
+
+  class Ball
+    attr_accessor :position, :velocity, :radius
+
+    def initialize(x, y)
+      @position = Vector.new(x, y)
+      @velocity = Vector.new(2, 0)
+      @radius = 5
+    end
+
+    def draw
+      stroke_weight(1)
+      ellipse(@position.x, @position.y, @radius * 2, @radius * 2)
+    end
+
+    def move
+      @position += @velocity
+    end
+
+    def collide_with_boundaries
+      if position.x <= radius || position.x >= width - radius
+        velocity.x *= -1
+      elsif position.y <= radius || position.y >= height - radius
+        velocity.y *= -1
+      end
+    end
+
+    def collide_with_paddle(paddle)
+      # Check for collision
+      distance_vector = position - paddle.position
+      return unless distance_vector.squared_length <= (radius + paddle.radius) ** 2
+
+      # Calculate new velocity
+      normal = distance_vector.normal.normalized
+      @velocity = normal * (velocity * normal) * 2 - velocity
+
+      # Move ball to correct position
+      @position = paddle.position + distance_vector.normalized * (2 * (radius + paddle.radius) - distance_vector.length)
+    end
+  end
+
+  class Vector
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x, @y = x, y
+    end
+
+    def +(other)
+      if other.is_a?(Numeric)
+        Vector.new(@x + other, @y + other)
+      elsif other.is_a?(Vector)
+        Vector.new(@x + other.x, @y + other.y)
+      else
+        self
+      end
+    end
+
+    def -(other)
+      if other.is_a?(Numeric)
+        Vector.new(@x - other, @y - other)
+      elsif other.is_a?(Vector)
+        Vector.new(@x - other.x, @y - other.y)
+      else
+        self
+      end
+    end
+
+    def *(other)
+      if other.is_a?(Numeric)
+        Vector.new(@x * other, @y * other)
+      elsif other.is_a?(Vector)
+        @x * other.x + @y * other.y
+      else
+        self
+      end
+    end
+
+    def length
+      Math::sqrt(@x * @x + @y * @y)
+    end
+
+    def squared_length
+      @x * @x + @y * @y
+    end
+
+    def normal
+      Vector.new(-@y, @x)
+    end
+
+    def normalized
+      length = self.length
+      Vector.new(@x / length, @y / length)
+    end
+  end
+end
+
+Sketch.new :width => 800, :height => 400

data/samples/processing_app/topics/simulate/simple_particle_system.rb

@@ -4,9 +4,40 @@
 # time. A ParticleSystem (Array) object manages a variable size list of
 # particles.
 
-require 'ruby-processing'
+module Runnable
+  def run
+    self.reject! { |particle| particle.dead? }
+    self.each    { |particle| particle.run   }
+  end
+end
+
+class Vector
+  attr_accessor :x, :y
+
+  def initialize(x, y)
+    @x, @y = x, y
+  end
+
+  def +(other)
+    if other.is_a?(Numeric)
+      Vector.new(@x + other, @y + other)
+    elsif other.is_a?(Vector)
+      Vector.new(@x + other.x, @y + other.y)
+    else
+      self
+    end
+  end
+
+  def heading
+    -1 * Math::atan2(-@y, @x)
+  end
 
-class SimpleParticleSystem < Processing::App
+  def magnitude
+    @x * @x + @y * @y
+  end
+end
+
+class Sketch < Processing::App
   def setup
     smooth
     color_mode(RGB, 255, 255, 255, 100)
@@ -22,13 +53,6 @@ class SimpleParticleSystem < Processing::App
     @particles << Particle.new(Vector.new(mouse_x, mouse_y))
   end
 
-  module Runnable
-    def run
-      self.reject! { |particle| particle.dead? }
-      self.each    { |particle| particle.run   }
-    end
-  end
-
   class Particle
     def initialize(origin)
       @origin = origin
@@ -59,55 +83,29 @@ class SimpleParticleSystem < Processing::App
     end
 
     def render
-      $app.stroke(255, @lifespan)
-      $app.fill(100, @lifespan)
-      $app.ellipse(@origin.x, @origin.y, @radius, @radius)
+      stroke(255, @lifespan)
+      fill(100, @lifespan)
+      ellipse(@origin.x, @origin.y, @radius, @radius)
     end
 
     def render_velocity_vector
       scale = 10
       arrow_size = 4
 
-      $app.push_matrix
+      push_matrix
 
-      $app.translate(@origin.x, @origin.y)
-      $app.rotate(@velocity.heading)
+      translate(@origin.x, @origin.y)
+      rotate(@velocity.heading)
 
       length = @velocity.magnitude * scale
 
-      $app.line 0,      0, length,              0
-      $app.line length, 0, length - arrow_size, arrow_size / 2
-      $app.line length, 0, length - arrow_size, -arrow_size / 2
-
-      $app.pop_matrix
-    end
-  end
-
-  class Vector
-    attr_accessor :x, :y
-
-    def initialize(x, y)
-      @x, @y = x, y
-    end
-
-    def +(other)
-      if other.is_a?(Numeric)
-        Vector.new(@x + other, @y + other)
-      elsif other.is_a?(Vector)
-        Vector.new(@x + other.x, @y + other.y)
-      else
-        self
-      end
-    end
-
-    def heading
-      -1 * Math::atan2(-@y, @x)
-    end
+      line 0,      0, length,              0
+      line length, 0, length - arrow_size, arrow_size / 2
+      line length, 0, length - arrow_size, -arrow_size / 2
 
-    def magnitude
-      @x * @x + @y * @y
+      pop_matrix
     end
   end
 end
 
-$app = SimpleParticleSystem.new :width => 640, :height => 340, :title => 'SimpleParticleSystem'
+Sketch.new :width => 640, :height => 340

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-processing
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -04:00
+date: 2009-04-22 00:00:00 -04:00
 default_executable: rp5
 dependencies: []
 
@@ -89,11 +89,6 @@ files:
 - library/control_panel
 - library/control_panel/control_panel.rb
 - library/dxf
-- library/dxf/bin
-- library/dxf/bin/processing
-- library/dxf/bin/processing/dxf
-- library/dxf/bin/processing/dxf/RawDXF.class
-- library/dxf/dxfviewer.jar
 - library/dxf/library
 - library/dxf/library/dxf.jar
 - library/javascript
@@ -112,11 +107,6 @@ files:
 - library/minim/license.txt
 - library/minim/version.txt
 - library/net
-- library/net/bin
-- library/net/bin/processing
-- library/net/bin/processing/net
-- library/net/bin/processing/net/Client.class
-- library/net/bin/processing/net/Server.class
 - library/net/library
 - library/net/library/net.jar
 - library/opengl
@@ -157,10 +147,6 @@ files:
 - library/pdf/library/pdf.jar
 - library/pdf/notes.txt
 - library/serial
-- library/serial/bin
-- library/serial/bin/processing
-- library/serial/bin/processing/serial
-- library/serial/bin/processing/serial/Serial.class
 - library/serial/library
 - library/serial/library/export.txt
 - library/serial/library/librxtxSerial.jnilib
@@ -169,12 +155,6 @@ files:
 - library/serial/library/rxtxSerial.dll
 - library/serial/library/serial.jar
 - library/video
-- library/video/bin
-- library/video/bin/processing
-- library/video/bin/processing/video
-- library/video/bin/processing/video/Capture.class
-- library/video/bin/processing/video/Movie.class
-- library/video/bin/processing/video/MovieMaker.class
 - library/video/library
 - library/video/library/video.jar
 - samples/animator.rb
@@ -186,6 +166,7 @@ files:
 - samples/getting_started.rb
 - samples/jwishy.rb
 - samples/orbit.rb
+- samples/pong.rb
 - samples/processing_app
 - samples/processing_app/3D
 - samples/processing_app/3D/camera