chipmunk-ffi 1.0.0 → 1.1.0

data/README.markdown

@@ -14,9 +14,9 @@ Install
 
 You will need:
 
-* Ruby 1.8.6+ or JRuby 1.4+
-* Chipmunk > 5.0 (svn right now... http://code.google.com/p/chipmunk-physics/ )
-* FFI > 0.6.0 (git right now... http://github.com/ffi/ffi/ )
+* Ruby 1.8.6+ or JRuby 1.5+
+* Chipmunk > 5.2 
+* FFI > 0.6.0 
 
 Then...
 
@@ -34,3 +34,4 @@ Author
 ------
 
 Shawn Anderson <shawn42+chipmunk@gmail.com>
+Philomory http://github.com/philomory 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/chipmunk-ffi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chipmunk-ffi}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shawn Anderson"]
-  s.date = %q{2010-01-04}
+  s.date = %q{2010-04-10}
   s.description = %q{FFI bindings for chipmunk physics lib.}
   s.email = %q{shawn42@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "lib/chipmunk-ffi/bb.rb",
      "lib/chipmunk-ffi/body.rb",
      "lib/chipmunk-ffi/constraint.rb",
+     "lib/chipmunk-ffi/constraints/damped_rotary_spring.rb",
      "lib/chipmunk-ffi/constraints/damped_spring.rb",
      "lib/chipmunk-ffi/constraints/gear_joint.rb",
      "lib/chipmunk-ffi/constraints/groove_joint.rb",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/chipmunk-ffi/shape.rb",
      "lib/chipmunk-ffi/space.rb",
      "lib/chipmunk-ffi/space_hash.rb",
+     "lib/chipmunk-ffi/struct_accessor.rb",
      "lib/chipmunk-ffi/unsafe.rb",
      "lib/chipmunk-ffi/vec2.rb",
      "spec/bb_spec.rb",
@@ -56,7 +58,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{chipmunk-ffi}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{FFI bindings for chipmunk physics lib.}
   s.test_files = [
     "spec/bb_spec.rb",

data/lib/chipmunk-ffi.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'nice-ffi'
 
 module CP
@@ -14,13 +15,17 @@ module CP
                      end
 
   end
-  load_library "chipmunk", CP::LOAD_PATHS
+
+  defined?(::CP_EXACT_PATH) ?
+          load_library(::CP_EXACT_PATH) :
+          load_library("chipmunk", CP::LOAD_PATHS)
+
   def self.cp_static_inline(func_sym, args, ret)
     func_name = "_#{func_sym}"
     attach_variable func_name, :pointer
     const_func_name = func_sym.to_s.upcase
 
-    func = FFI::Function.new(ret, args, FFI::Pointer.new(self.send(func_name)), :convention => :default )
+    func = FFI::Function.new(ret, args, FFI::Pointer.new(self.send(func_name).to_i), :convention => :default )
     const_set const_func_name, func
 
     instance_eval <<-METHOD

data/lib/chipmunk-ffi/body.rb

@@ -5,8 +5,8 @@ module CP
 
   class BodyStruct < NiceFFI::Struct
     layout(
-      :bodyVelocityFunc, :cpBodyVelocityFunc,
-      :bodyPositionFunc, :cpBodyPositionFunc,
+      :velocity_func, :cpBodyVelocityFunc,
+      :position_func, :cpBodyPositionFunc,
       :m, CP_FLOAT,
       :m_inv, CP_FLOAT,
       :i, CP_FLOAT,
@@ -54,9 +54,12 @@ module CP
       when 2
         ptr = CP.cpBodyNew(*args)
         @struct = BodyStruct.new ptr
+        set_data_pointer
       else
         raise "wrong number of args for Body, got #{args.size}, but expected 2"
       end
+      set_default_velocity_lambda
+      set_default_position_lambda
     end
 
     def m
@@ -194,5 +197,60 @@ module CP
       CP.cpBodyUpdatePosition(@struct.pointer,dt)
     end
 
+    def velocity_func
+      @user_level_velocity_lambda
+    end
+    
+    def velocity_func=(l)
+      @user_level_velocity_lambda = l
+      
+      # We keep the lambda in an ivar to keep it from being GCed
+      @body_velocity_lambda = Proc.new do |body_ptr,g,dmp,dt|
+        body_struct = BodyStruct.new(body_ptr)
+        obj_id = body_struct.data.get_long(0)
+        body = ObjectSpace._id2ref(obj_id)
+        l.call(body,g,dmp,dt)
+      end
+      @struct.velocity_func = @body_velocity_lambda
+    end
+
+    def position_func
+      @user_level_position_lambda
+    end
+    
+    def position_func=(l)
+      @user_level_position_lambda = l
+      
+      # We keep the lambda in an ivar to keep it from being GCed
+      @body_position_lambda = Proc.new do |body_ptr,dt|
+        body_struct = BodyStruct.new(body_ptr)
+        obj_id = body_struct.data.get_long(0)
+        body = ObjectSpace._id2ref(obj_id)
+        l.call(body,dt)
+      end
+      @struct.position_func = @body_position_lambda
+    end
+
+    private
+    def set_data_pointer
+      mem = FFI::MemoryPointer.new(:long)
+      mem.put_long 0, object_id
+      # this is needed to prevent data corruption by GC
+      @body_pointer = mem
+      @struct.data = mem
+    end
+
+    def set_default_velocity_lambda
+      @user_level_velocity_lambda = Proc.new do |body,g,dmp,dt|
+        body.update_velocity(g,dmp,dt)
+      end
+    end
+    
+    def set_default_position_lambda
+      @user_level_position_lambda = Proc.new do |body,dt|
+        body.update_position(dt)
+      end
+    end
+
   end
 end

data/lib/chipmunk-ffi/constraint.rb

@@ -1,3 +1,5 @@
+require 'chipmunk-ffi/struct_accessor'
+
 module CP
   callback :cpConstraintPreStepFunction, [:pointer, CP_FLOAT, CP_FLOAT], :void
   callback :cpConstraintApplyImpulseFunction, [:pointer], :void
@@ -14,9 +16,32 @@ module CP
            :a, :pointer,
            :b, :pointer,
            :max_force, CP_FLOAT,
+           :bias_coef, CP_FLOAT,
            :max_bias, CP_FLOAT,
            :data, :pointer)
   end
+  
+  module Constraint
+    attr_reader :body_a, :body_b, :struct
+    [:max_force,:bias_coef,:max_bias].each do |sym|
+      define_method(sym) { struct.constraint[sym] }
+      define_method("#{sym}=") {|val| struct.constraint[sym] = val.to_f }
+    end
+    
+    def self.included(other)
+      super
+      other.class_eval { extend StructAccessor }
+    end
+    
+    def set_data_pointer
+      mem = FFI::MemoryPointer.new(:long)
+      mem.put_long 0, object_id
+      # this is needed to prevent data corruption by GC
+      @constraint_pointer = mem
+      @struct.constraint.data = mem
+    end
+    
+  end
 
   require 'chipmunk-ffi/constraints/pin_joint'
   require 'chipmunk-ffi/constraints/slide_joint'
@@ -27,4 +52,5 @@ module CP
   require 'chipmunk-ffi/constraints/ratchet_joint'
   require 'chipmunk-ffi/constraints/gear_joint'
   require 'chipmunk-ffi/constraints/simple_motor'
+  require 'chipmunk-ffi/constraints/damped_rotary_spring'
 end

data/lib/chipmunk-ffi/constraints/damped_rotary_spring.rb

@@ -0,0 +1,58 @@
+module CP
+
+  callback :cpDampedRotarySpringTorqueFunc, [:pointer, CP_FLOAT], CP_FLOAT
+
+  class DampedRotarySpringStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :rest_angle, CP_FLOAT,
+             :stiffness, CP_FLOAT,
+             :damping, CP_FLOAT,
+             :spring_torque_func, :cpDampedRotarySpringTorqueFunc,
+             :dt, CP_FLOAT,
+             :target_wrn, CP_FLOAT,
+             :i_sum, CP_FLOAT)
+  end
+
+  func :cpDampedRotarySpringNew, [:pointer, :pointer, CP_FLOAT, CP_FLOAT, CP_FLOAT], :pointer
+
+  class DampedRotarySpring
+    include Constraint
+    struct_accessor DampedRotarySpringStruct, :rest_angle, :damping, :stiffness
+    def initialize(a_body, b_body,rest_angle, stiffness, damping)
+      @body_a, @body_b = a_body, b_body
+      @struct = DampedRotarySpringStruct.new(CP.cpDampedRotarySpringNew(
+        a_body.struct.pointer,b_body.struct.pointer, rest_angle, stiffness, damping))
+      set_data_pointer
+      set_initial_torque_proc        
+    end
+    
+    def spring_torque_func
+      @user_level_torque_lambda
+    end
+    
+    def spring_torque_func=(l)
+      @user_level_torque_lambda = l
+      
+      # We keep the lambda in an ivar to keep it from being GCed
+      @spring_torque_lambda = Proc.new do |spring_ptr,angle|
+        spring_struct = DampedRotarySpringStruct.new(spring_ptr)
+        obj_id = spring_struct.constraint.data.get_long(0)
+        spring = ObjectSpace._id2ref(obj_id)
+        l.call(spring,angle)
+      end
+      @struct.spring_torque_func = @spring_torque_lambda
+    end
+    
+    private
+    def set_initial_torque_proc
+      ffi_func = @struct.spring_torque_func
+      @user_level_torque_lambda ||= Proc.new do |spring, angle|
+        ffi_func.call(spring.struct,angle)
+      end
+    end
+    
+  end
+end
+
+# Alias for compatibility with chipmunk C-Ruby bindings.
+CP::Constraint::DampedRotarySpring = CP::DampedRotarySpring

data/lib/chipmunk-ffi/constraints/damped_spring.rb

@@ -1,5 +1,7 @@
 module CP
 
+  callback :cpDampedSpringForceFunc, [:pointer, CP_FLOAT], CP_FLOAT
+
   class DampedSpringStruct < NiceFFI::Struct
     layout(:constraint, ConstraintStruct,
              :anchr1, Vect,
@@ -7,7 +9,7 @@ module CP
              :rest_length, CP_FLOAT,
              :stiffness, CP_FLOAT,
              :damping, CP_FLOAT,
-             :damped_spring_force_fun, :pointer,
+             :spring_force_func, :cpDampedSpringForceFunc,
              :dt, CP_FLOAT,
              :target_vrn, CP_FLOAT,
              :r1, Vect,
@@ -19,12 +21,44 @@ module CP
   func :cpDampedSpringNew, [:pointer, :pointer, Vect.by_value, Vect.by_value, CP_FLOAT, CP_FLOAT, CP_FLOAT], :pointer
 
   class DampedSpring
-    attr_reader :struct
+    include Constraint
+    struct_accessor DampedSpringStruct, :anchr1, :anchr2, :rest_length, :damping, :stiffness
     def initialize(a_body, b_body, anchr_one, anchr_two, 
                    rest_length, stiffness, damping)
+      @body_a, @body_b = a_body, b_body
       @struct = DampedSpringStruct.new(CP.cpDampedSpringNew(
         a_body.struct.pointer,b_body.struct.pointer,anchr_one.struct,anchr_two.struct,
         rest_length, stiffness, damping))
+      set_data_pointer
+      set_initial_force_proc
+    end
+    
+    def spring_force_func
+      @user_level_force_lambda
+    end
+    
+    def spring_force_func=(l)
+      @user_level_force_lambda = l
+      
+      # We keep the lambda in an ivar to keep it from being GCed
+      @spring_force_lambda = Proc.new do |spring_ptr,dist|
+        spring_struct = DampedSpringStruct.new(spring_ptr)
+        obj_id = spring_struct.constraint.data.get_long(0)
+        spring = ObjectSpace._id2ref(obj_id)
+        l.call(spring,dist)
+      end
+      @struct.spring_force_func = @spring_force_lambda
+    end
+    
+    private
+    def set_initial_force_proc
+      ffi_func = @struct.spring_force_func
+      @user_level_force_lambda ||= Proc.new do |spring, dist|
+        ffi_func.call(spring.struct,dist)
+      end
     end
   end
 end
+
+# Alias for compatibility with chipmunk C-Ruby bindings.
+CP::Constraint::DampedSpring = CP::DampedSpring

data/lib/chipmunk-ffi/constraints/gear_joint.rb

@@ -11,12 +11,24 @@ module CP
              :j_max, CP_FLOAT)
   end
   func :cpGearJointNew, [:pointer, :pointer, CP_FLOAT, CP_FLOAT], :pointer
+  func :cpGearJointSetRatio, [:pointer, CP_FLOAT], :void
 
   class GearJoint
-    attr_reader :struct
+    include Constraint
+    struct_accessor GearJointStruct, :phase
+    struct_reader GearJointStruct, :ratio
     def initialize(a_body, b_body, phase, ratio)
+      @body_a, @body_b = a_body, b_body
       @struct = GearJointStruct.new(CP.cpGearJointNew(
         a_body.struct.pointer,b_body.struct.pointer,phase, ratio))
     end
+    
+    def ratio=(val)
+      CP.cpGearJointSetRatio(@struct.pointer,val)
+    end
+    
   end
 end
+
+# Alias for compatibility with chipmunk C-Ruby bindings.
+CP::Constraint::GearJoint = CP::GearJoint

data/lib/chipmunk-ffi/constraints/groove_joint.rb

@@ -20,10 +20,15 @@ module CP
   func :cpGrooveJointNew, [:pointer, :pointer, Vect.by_value, Vect.by_value, Vect.by_value], :pointer
 
   class GrooveJoint
-    attr_reader :struct
+    include Constraint
+    struct_accessor GrooveJointStruct, :anchr2
     def initialize(a_body, b_body, groove_a, groove_b, anchr2)
+      @body_a, @body_b = a_body, b_body
       @struct = GrooveJointStruct.new(CP.cpGrooveJointNew(
         a_body.struct.pointer,b_body.struct.pointer,groove_a.struct,groove_b.struct,anchr2.struct))
     end
   end
 end
+
+# Alias for compatibility with chipmunk C-Ruby bindings.
+CP::Constraint::GrooveJoint = CP::GrooveJoint

data/lib/chipmunk-ffi/constraints/pin_joint.rb

@@ -16,10 +16,15 @@ module CP
   func :cpPinJointNew, [:pointer, :pointer, Vect.by_value, Vect.by_value], :pointer
 
   class PinJoint
-    attr_reader :struct
+    include Constraint
+    struct_accessor PinJointStruct, :anchr1, :anchr2, :dist
     def initialize(a_body, b_body, anchr_one, anchr_two)
+      @body_a, @body_b = a_body, b_body
       @struct = PinJointStruct.new(CP.cpPinJointNew(
         a_body.struct.pointer,b_body.struct.pointer,anchr_one.struct,anchr_two.struct))
     end
   end
 end
+
+# Alias for compatibility with chipmunk C-Ruby bindings.
+CP::Constraint::PinJoint = CP::PinJoint

data/lib/chipmunk-ffi/constraints/pivot_joint.rb

@@ -16,8 +16,10 @@ module CP
   func :cpPivotJointNew2, [:pointer, :pointer, Vect.by_value, Vect.by_value], :pointer
 
   class PivotJoint
-    attr_reader :struct
+    include Constraint
+    struct_accessor PivotJointStruct, :anchr1, :anchr2
     def initialize(a_body, b_body, anchr_one, anchr_two=nil)
+      @body_a, @body_b = a_body, b_body
       @struct = if anchr_two.nil?
         PivotJointStruct.new(CP.cpPivotJointNew(
           a_body.struct.pointer,b_body.struct.pointer,anchr_one.struct))
@@ -28,3 +30,6 @@ module CP
     end
   end
 end
+
+# Alias for compatibility with chipmunk C-Ruby bindings.
+CP::Constraint::PivotJoint = CP::PivotJoint

data/lib/chipmunk-ffi/constraints/ratchet_joint.rb

@@ -13,10 +13,15 @@ module CP
   func :cpRatchetJointNew, [:pointer, :pointer, CP_FLOAT, CP_FLOAT], :pointer
 
   class RatchetJoint
-    attr_reader :struct
+    include Constraint
+    struct_accessor RatchetJointStruct, :angle, :phase, :ratchet
     def initialize(a_body, b_body, phase, ratchet)
+      @body_a, @body_b = a_body, b_body
       @struct = RatchetJointStruct.new(CP.cpRatchetJointNew(
         a_body.struct.pointer,b_body.struct.pointer,phase,ratchet))
     end
   end
 end
+
+# Alias for compatibility with chipmunk C-Ruby bindings.
+CP::Constraint::RatchetJoint = CP::RatchetJoint

data/lib/chipmunk-ffi/constraints/rotary_limit_joint.rb

@@ -12,10 +12,15 @@ module CP
   func :cpRotaryLimitJointNew, [:pointer, :pointer, CP_FLOAT, CP_FLOAT], :pointer
 
   class RotaryLimitJoint
-    attr_reader :struct
+    include Constraint
+    struct_accessor RotaryLimitJointStruct, :min, :max
     def initialize(a_body, b_body, min, max)
+      @body_a, @body_b = a_body, b_body
       @struct = RotaryLimitJointStruct.new(CP.cpRotaryLimitJointNew(
         a_body.struct.pointer,b_body.struct.pointer,min,max))
     end
   end
 end
+
+# Alias for compatibility with chipmunk C-Ruby bindings.
+CP::Constraint::RotaryLimitJoint = CP::RotaryLimitJoint