chipmunk-ffi 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/chipmunk-ffi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chipmunk-ffi}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shawn Anderson"]
-  s.date = %q{2009-12-04}
+  s.date = %q{2009-12-16}
   s.description = %q{FFI bindings for chipmunk physics lib.}
   s.email = %q{shawn42@gmail.com}
   s.files = [
@@ -19,12 +19,23 @@ Gem::Specification.new do |s|
      "lib/chipmunk-ffi.rb",
      "lib/chipmunk-ffi/bb.rb",
      "lib/chipmunk-ffi/body.rb",
+     "lib/chipmunk-ffi/constraint.rb",
+     "lib/chipmunk-ffi/constraints/damped_spring.rb",
+     "lib/chipmunk-ffi/constraints/gear_joint.rb",
+     "lib/chipmunk-ffi/constraints/groove_joint.rb",
+     "lib/chipmunk-ffi/constraints/pin_joint.rb",
+     "lib/chipmunk-ffi/constraints/pivot_joint.rb",
+     "lib/chipmunk-ffi/constraints/ratchet_joint.rb",
+     "lib/chipmunk-ffi/constraints/rotary_limit_joint.rb",
+     "lib/chipmunk-ffi/constraints/simple_motor.rb",
+     "lib/chipmunk-ffi/constraints/slide_joint.rb",
      "lib/chipmunk-ffi/core.rb",
      "lib/chipmunk-ffi/shape.rb",
      "lib/chipmunk-ffi/space.rb",
      "lib/chipmunk-ffi/vec2.rb",
      "spec/bb_spec.rb",
      "spec/body_spec.rb",
+     "spec/constraint_spec.rb",
      "spec/core_spec.rb",
      "spec/shape_spec.rb",
      "spec/space_spec.rb",
@@ -40,6 +51,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/bb_spec.rb",
      "spec/body_spec.rb",
+     "spec/constraint_spec.rb",
      "spec/core_spec.rb",
      "spec/shape_spec.rb",
      "spec/space_spec.rb",

data/lib/chipmunk-ffi.rb

@@ -33,8 +33,7 @@ module CP
   CP_FLOAT = :double
 
 end
-libs = %w{vec2 core bb body shape space}
-#	Init_cpConstraint();
+libs = %w{vec2 core bb body shape space constraint}
 $: << File.dirname(__FILE__)
 libs.each do |lib|
   require "chipmunk-ffi/#{lib}"

data/lib/chipmunk-ffi/body.rb

@@ -1,15 +1,12 @@
 module CP
 
   callback :cpBodyVelocityFunc, [:pointer, Vect.by_value, CP_FLOAT, CP_FLOAT], :void
-  callback :cpBodyPostitionFunc, [:pointer, CP_FLOAT], :void
+  callback :cpBodyPositionFunc, [:pointer, CP_FLOAT], :void
 
   class BodyStruct < NiceFFI::Struct
     layout(
-      #      :bodyVelocityFunc, :cpBodyVelocityFunc,
-      #      :bodyPositionFunc, :cpBodyPositionFunc,
-      # TODO not sure if :pointer is right here...
-      :bodyVelocityFunc, :pointer,
-      :bodyPositionFunc, :pointer,
+      :bodyVelocityFunc, :cpBodyVelocityFunc,
+      :bodyPositionFunc, :cpBodyPositionFunc,
       :m, CP_FLOAT,
       :m_inv, CP_FLOAT,
       :i, CP_FLOAT,
@@ -22,6 +19,8 @@ module CP
       :t, CP_FLOAT,
       :rot, Vect,
       :data, :pointer,
+      :v_limit, CP_FLOAT,
+      :w_limit, CP_FLOAT,
       :v_bias, Vect,
       :w_bias, CP_FLOAT
     )
@@ -79,8 +78,6 @@ module CP
     end
     def p=(new_p)
       @struct.p.pointer.put_bytes 0, new_p.struct.to_bytes, 0,Vect.size
-      # TODO XXX this probably leaks?
-#      @struct.p.send :pointer=, new_p.struct.pointer
       self
     end
     alias :pos :p

data/lib/chipmunk-ffi/constraint.rb

@@ -0,0 +1,30 @@
+module CP
+  callback :cpConstraintPreStepFunction, [:pointer, CP_FLOAT, CP_FLOAT], :void
+  callback :cpConstraintApplyImpulseFunction, [:pointer], :void
+  callback :cpConstraintGetImpulseFunction, [:pointer], CP_FLOAT
+
+  class ConstraintClassStruct < NiceFFI::Struct
+    layout(:pre_step, :cpConstraintPreStepFunction,
+      :apply_impluse, :cpConstraintApplyImpulseFunction,
+      :getImpulse, :cpConstraintGetImpulseFunction)
+  end
+
+  class ConstraintStruct < NiceFFI::Struct
+    layout(:klass, :pointer,
+           :a, :pointer,
+           :b, :pointer,
+           :max_force, CP_FLOAT,
+           :max_bias, CP_FLOAT,
+           :data, :pointer)
+  end
+
+  require 'chipmunk-ffi/constraints/pin_joint'
+  require 'chipmunk-ffi/constraints/slide_joint'
+  require 'chipmunk-ffi/constraints/pivot_joint'
+  require 'chipmunk-ffi/constraints/groove_joint'
+  require 'chipmunk-ffi/constraints/damped_spring'
+  require 'chipmunk-ffi/constraints/rotary_limit_joint'
+  require 'chipmunk-ffi/constraints/ratchet_joint'
+  require 'chipmunk-ffi/constraints/gear_joint'
+  require 'chipmunk-ffi/constraints/simple_motor'
+end

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

@@ -0,0 +1,30 @@
+module CP
+
+  class DampedSpringStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :anchr1, Vect,
+             :anchr2, Vect,
+             :rest_length, CP_FLOAT,
+             :stiffness, CP_FLOAT,
+             :damping, CP_FLOAT,
+             :damped_spring_force_fun, :pointer,
+             :dt, CP_FLOAT,
+             :target_vrn, CP_FLOAT,
+             :r1, Vect,
+             :r2, Vect,
+             :n_mass, CP_FLOAT,
+             :n, Vect)
+  end
+
+  func :cpDampedSpringNew, [:pointer, :pointer, Vect.by_value, Vect.by_value, CP_FLOAT, CP_FLOAT, CP_FLOAT], :pointer
+
+  class DampedSpring
+    attr_reader :struct
+    def initialize(a_body, b_body, anchr_one, anchr_two, 
+                   rest_length, stiffness, damping)
+      @struct = DampedSpringStruct.new(CP.cpDampedSpringNew(
+        a_body.struct.pointer,b_body.struct.pointer,anchr_one.struct,anchr_two.struct,
+        rest_length, stiffness, damping))
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module CP
+
+  class GearJointStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :phase, CP_FLOAT,
+             :ratio, CP_FLOAT,
+             :ratio_inv, CP_FLOAT,
+             :i_sum, CP_FLOAT,
+             :bias, CP_FLOAT,
+             :j_acc, CP_FLOAT,
+             :j_max, CP_FLOAT)
+  end
+  func :cpGearJointNew, [:pointer, :pointer, CP_FLOAT, CP_FLOAT], :pointer
+
+  class GearJoint
+    attr_reader :struct
+    def initialize(a_body, b_body, phase, ratio)
+      @struct = GearJointStruct.new(CP.cpGearJointNew(
+        a_body.struct.pointer,b_body.struct.pointer,phase, ratio))
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module CP
+
+  class GrooveJointStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :grv_n, Vect,
+             :grv_a, Vect,
+             :grv_b, Vect,
+             :anchr2, Vect,
+             :grv_tn, Vect,
+             :clamp, CP_FLOAT,
+             :r1, Vect,
+             :r2, Vect,
+             :k1, Vect,
+             :k2, Vect,
+             :j_acc, Vect,
+             :j_max_length, CP_FLOAT,
+             :bias, Vect)
+  end
+
+  func :cpGrooveJointNew, [:pointer, :pointer, Vect.by_value, Vect.by_value, Vect.by_value], :pointer
+
+  class GrooveJoint
+    attr_reader :struct
+    def initialize(a_body, b_body, groove_a, groove_b, anchr2)
+      @struct = GrooveJointStruct.new(CP.cpGrooveJointNew(
+        a_body.struct.pointer,b_body.struct.pointer,groove_a.struct,groove_b.struct,anchr2.struct))
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module CP
+
+  class PinJointStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :anchr1, Vect,
+             :anchr2, Vect,
+             :dist, CP_FLOAT,
+             :r1, Vect,
+             :r2, Vect,
+             :n, Vect,
+             :n_mass, CP_FLOAT,
+             :jn_acc, CP_FLOAT,
+             :jn_max, CP_FLOAT,
+             :bias, CP_FLOAT)
+  end
+  func :cpPinJointNew, [:pointer, :pointer, Vect.by_value, Vect.by_value], :pointer
+
+  class PinJoint
+    attr_reader :struct
+    def initialize(a_body, b_body, anchr_one, anchr_two)
+      @struct = PinJointStruct.new(CP.cpPinJointNew(
+        a_body.struct.pointer,b_body.struct.pointer,anchr_one.struct,anchr_two.struct))
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module CP
+
+  class PivotJointStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :anchr1, Vect,
+             :anchr2, Vect,
+             :r1, Vect,
+             :r2, Vect,
+             :k1, Vect,
+             :k2, Vect,
+             :j_acc, Vect,
+             :j_max, CP_FLOAT,
+             :bias, CP_FLOAT)
+  end
+  func :cpPivotJointNew, [:pointer, :pointer, Vect.by_value], :pointer
+  func :cpPivotJointNew2, [:pointer, :pointer, Vect.by_value, Vect.by_value], :pointer
+
+  class PivotJoint
+    attr_reader :struct
+    def initialize(a_body, b_body, anchr_one, anchr_two=nil)
+      @struct = if anchr_two.nil?
+        PivotJointStruct.new(CP.cpPivotJointNew(
+          a_body.struct.pointer,b_body.struct.pointer,anchr_one.struct))
+      else
+        PivotJointStruct.new(CP.cpPivotJointNew2(
+          a_body.struct.pointer,b_body.struct.pointer,anchr_one.struct,anchr_two.struct))
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module CP
+
+  class RatchetJointStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :angle, CP_FLOAT,
+             :phase, CP_FLOAT,
+             :ratchet, CP_FLOAT,
+             :i_sum, CP_FLOAT,
+             :bias, CP_FLOAT,
+             :j_acc, CP_FLOAT,
+             :j_max, CP_FLOAT)
+  end
+  func :cpRatchetJointNew, [:pointer, :pointer, CP_FLOAT, CP_FLOAT], :pointer
+
+  class RatchetJoint
+    attr_reader :struct
+    def initialize(a_body, b_body, phase, ratchet)
+      @struct = RatchetJointStruct.new(CP.cpRatchetJointNew(
+        a_body.struct.pointer,b_body.struct.pointer,phase,ratchet))
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module CP
+
+  class RotaryLimitJointStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :min, CP_FLOAT,
+             :max, CP_FLOAT,
+             :i_sum, CP_FLOAT,
+             :bias, CP_FLOAT,
+             :j_acc, CP_FLOAT,
+             :j_max, CP_FLOAT)
+  end
+  func :cpRotaryLimitJointNew, [:pointer, :pointer, CP_FLOAT, CP_FLOAT], :pointer
+
+  class RotaryLimitJoint
+    attr_reader :struct
+    def initialize(a_body, b_body, min, max)
+      @struct = RotaryLimitJointStruct.new(CP.cpRotaryLimitJointNew(
+        a_body.struct.pointer,b_body.struct.pointer,min,max))
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module CP
+
+  class SimpleMotorStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :rate, CP_FLOAT,
+             :i_sum, CP_FLOAT,
+             :j_acc, CP_FLOAT,
+             :j_max, CP_FLOAT)
+  end
+  func :cpSimpleMotorNew, [:pointer, :pointer, CP_FLOAT], :pointer
+
+  class SimpleMotor
+    attr_reader :struct
+    def initialize(a_body, b_body, rate)
+      @struct = SimpleMotorStruct.new(CP.cpSimpleMotorNew(
+        a_body.struct.pointer,b_body.struct.pointer,rate))
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module CP
+
+  class SlideJointStruct < NiceFFI::Struct
+    layout(:constraint, ConstraintStruct,
+             :anchr1, Vect,
+             :anchr2, Vect,
+             :min, CP_FLOAT,
+             :max, CP_FLOAT,
+             :r1, Vect,
+             :r2, Vect,
+             :n, Vect,
+             :n_mass, CP_FLOAT,
+             :jn_acc, CP_FLOAT,
+             :jn_max, CP_FLOAT,
+             :bias, CP_FLOAT)
+  end
+
+  func :cpSlideJointNew, [:pointer, :pointer, Vect.by_value, Vect.by_value, CP_FLOAT, CP_FLOAT], :pointer
+
+  class SlideJoint
+    attr_reader :struct
+    def initialize(a_body, b_body, anchr_one, anchr_two, min, max)
+      @struct = SlideJointStruct.new(CP.cpSlideJointNew(
+        a_body.struct.pointer,b_body.struct.pointer,anchr_one.struct,anchr_two.struct,min,max))
+    end
+  end
+end

data/lib/chipmunk-ffi/core.rb

@@ -46,4 +46,8 @@ module CP
     }
     cpMomentForPoly(m, verts.size, mem_pointer, offset.struct)
   end
+
+  func :cpInitChipmunk, [], :void
+  cpInitChipmunk
+
 end

data/lib/chipmunk-ffi/shape.rb

@@ -32,7 +32,8 @@ module CP
            :data, :pointer,
            :collision_type, :uint,
            :group, :uint,
-           :layers, :int
+           :layers, :uint,
+           :hash_value, :size_t
           )
   end
   class SegmentQueryInfoStruct < NiceFFI::Struct
@@ -52,7 +53,6 @@ module CP
     attr_reader :struct
 
     def body
-#      Body.new BodyStruct.new(@struct.body)
       @body
     end
     def body=(new_body)
@@ -110,11 +110,26 @@ module CP
       @struct.u = new_u
     end
 
+    def data
+      @struct.data
+    end
+    def data=(new_data)
+      @struct.data = new_data
+    end
+
     def surface_v
       Vec2.new @struct.surface_v
     end
     def surface_v=(new_sv)
-      @struct.surface_v = new_sv.struct
+      @struct.surface_v.pointer.put_bytes 0, new_sv.struct.to_bytes, 0,Vect.size
+    end
+
+    def set_data_pointer
+      mem = FFI::MemoryPointer.new(:ulong)
+      mem.put_ulong 0, object_id
+      # this is needed to prevent data corruption by GC
+      @shape_pointer = mem
+      @struct.data = mem
     end
 
     def self.reset_id_counter
@@ -127,6 +142,7 @@ module CP
         @body = body
         ptr = CP.cpCircleShapeNew body.struct.pointer, rad, offset_vec.struct
         @struct = ShapeStruct.new ptr
+        set_data_pointer
       end
     end
     class Segment
@@ -135,6 +151,7 @@ module CP
         @body = body
         ptr = CP.cpSegmentShapeNew body.struct.pointer, v1.struct, v2.struct, r
         @struct = ShapeStruct.new ptr
+        set_data_pointer
       end
     end
     class Poly
@@ -152,6 +169,7 @@ module CP
         }
         ptr = CP.cpPolyShapeNew body.struct.pointer, verts.size, mem_pointer, offset_vec.struct
         @struct = ShapeStruct.new ptr
+        set_data_pointer
       end
     end
   end

data/lib/chipmunk-ffi/space.rb

@@ -1,16 +1,37 @@
 module CP
+  callback :cpCollisionBeginFunc, [:pointer,:pointer,:pointer], :int
+  callback :cpCollisionPreSolveFunc, [:pointer,:pointer,:pointer], :int
+  callback :cpCollisionPostSolveFunc, [:pointer,:pointer,:pointer], :int
+  callback :cpCollisionSeparateFunc, [:pointer,:pointer,:pointer], :int
+
   class CollisionHandlerStruct < NiceFFI::Struct
     layout(
       :a, :uint,
       :b, :uint,
-      :begin, :pointer,
-      :pre_solve, :pointer,
-      :post_solve, :pointer,
-      :separate, :pointer,
+      :begin, :cpCollisionBeginFunc,
+      :pre_solve, :cpCollisionPreSolveFunc,
+      :post_solve, :cpCollisionPostSolveFunc,
+      :separate, :cpCollisionSeparateFunc,
       :data, :pointer
     )
   end
 
+  class ArbiterStruct < NiceFFI::Struct
+    layout(
+      :num_contacts, :int,
+      :contacts, :pointer,
+      :a, :pointer,
+      :b, :pointer,
+      :e, CP_FLOAT,
+      :u, CP_FLOAT,
+      :surf_vr, Vect.by_value,
+      :stamp, :int,
+      :handler, :pointer,
+      :swapped_col, :char,
+      :first_col, :char
+    )
+  end
+
   class SpaceStruct < NiceFFI::Struct
     layout( :iterations, :int,
       :elastic_iterations, :int,
@@ -24,7 +45,7 @@ module CP
       :contact_set, :pointer,
       :constraints, :pointer,
       :coll_func_set, :pointer,
-      :default_handler, :pointer,
+      :default_handler, CollisionHandlerStruct.by_value,
       :post_step_callbacks, :pointer
     )
     def self.release(ptr)
@@ -32,11 +53,6 @@ module CP
     end
   end
 
-  callback :cpCollisionBeginFunc, [:pointer,:pointer,:pointer], :int
-  callback :cpCollisionPreSolveFunc, [:pointer,:pointer,:pointer], :int
-  callback :cpCollisionPostSolveFunc, [:pointer,:pointer,:pointer], :int
-  callback :cpCollisionSeparateFunc, [:pointer,:pointer,:pointer], :int
-
 
   func :cpSpaceNew, [], :pointer
   func :cpSpaceFreeChildren, [:pointer], :void
@@ -57,12 +73,13 @@ module CP
   func :cpSpaceResizeStaticHash, [:pointer,CP_FLOAT,:int], :void
 
 
-  # TODO seems like a broken name here 
-  func :cpSpaceSetDefaultCollisionPairFunc, [:pointer, :uint, :uint,
+  func :cpSpaceSetDefaultCollisionHandler, [:pointer, :uint, :uint,
    :pointer, :pointer, :pointer, :pointer, :pointer], :void
   func :cpSpaceAddCollisionHandler, [:pointer, :uint, :uint,
-   :pointer, :pointer, :pointer, :pointer, :pointer], :void
+   :cpCollisionBeginFunc, :cpCollisionPreSolveFunc, :cpCollisionPostSolveFunc, :cpCollisionSeparateFunc, :pointer], :void
   func :cpSpaceRemoveCollisionHandler, [:pointer, :uint, :uint], :void
+
+
   class Space
     attr_reader :struct
     def initialize
@@ -72,6 +89,7 @@ module CP
       @bodies = []
       @constraints = []
       @blocks = {}
+      @callbacks = {}
     end
     
     def iterations
@@ -99,36 +117,101 @@ module CP
       Vec2.new @struct.gravity
     end
     def gravity=(v)
-      @struct.gravity = v.struct
+      @struct.gravity.pointer.put_bytes 0, v.struct.to_bytes, 0,Vect.size
     end
 
     def add_collision_func(a,b,&block)
-      # TODO huh?
       beg = nil
-      pre = nil
+      pre = Proc.new do |arb_ptr,space_ptr,data_ptr|
+        begin
+          arb = ArbiterStruct.new(arb_ptr)
+
+          swapped = arb.swapped_col == 0 ? false : true
+          arba = swapped ? arb.b : arb.a
+          arbb = swapped ? arb.a : arb.b
+
+          as = ShapeStruct.new(arba)
+          a_obj_id = as.data.get_ulong 0
+          rb_a = ObjectSpace._id2ref a_obj_id
+
+          bs = ShapeStruct.new(arbb)
+          b_obj_id = bs.data.get_ulong 0
+          rb_b = ObjectSpace._id2ref b_obj_id
+
+          block.call rb_a, rb_b
+          1
+        rescue Exception => ex
+          puts ex.message
+          puts ex.backtrace
+          0
+        end
+      end
       post = nil
       sep = nil
-      data = block
+      data = nil
       a_id = a.object_id
       b_id = b.object_id
-#      CP.cpSpaceAddCollisionHandler(@struct.pointer, a_id, b_id,
-#                                    beg,pre,post,sep,data)
-      @blocks[[a_id,b_id]] = block
+      CP.cpSpaceAddCollisionHandler(@struct.pointer, a_id, b_id,
+          beg,pre,post,sep,data)
+      @blocks[[a_id,b_id]] = pre
       nil
     end
 
     def remove_collision_func(a,b)
       a_id = a.object_id
       b_id = b.object_id
-#      CP.cpSpaceRemoveCollisionHandler(@struct.pointer, a_id, b_id)
+      CP.cpSpaceRemoveCollisionHandler(@struct.pointer, a_id, b_id)
       @blocks.delete [a_id,b_id]
       nil
     end
 
     def set_default_collision_func(&block)
+      raise "Not Implmented yet"
       @blocks[:default] = block 
     end
 
+    def wrap_collision_callback(a,b,type,handler)
+      callback = Proc.new do |arb_ptr,space_ptr,data_ptr|
+        arb = ArbiterStruct.new(arb_ptr)
+
+        swapped = arb.swapped_col == 0 ? false : true
+        arba = swapped ? arb.b : arb.a
+        arbb = swapped ? arb.a : arb.b
+
+        as = ShapeStruct.new(arba)
+        a_obj_id = as.data.get_ulong 0
+        rb_a = ObjectSpace._id2ref a_obj_id
+
+        bs = ShapeStruct.new(arbb)
+        b_obj_id = bs.data.get_ulong 0
+        rb_b = ObjectSpace._id2ref b_obj_id
+
+        ret = handler.send type, rb_a, rb_b
+        if ret
+          1
+        else
+          0
+        end
+      end
+      @callbacks[[a,b,type]] = [handler,callback]
+      callback
+    end
+
+    # handler should have methods [beg,pre,post,sep] defined
+    def add_collision_handler(a,b,handler)
+      a_id = a.object_id
+      b_id = b.object_id
+
+      beg = handler.respond_to?(:begin) ? wrap_collision_callback(a, b, :begin, handler) : nil
+      pre = handler.respond_to?(:pre) ? wrap_collision_callback(a, b, :pre, handler) : nil
+      post = handler.respond_to?(:post) ? wrap_collision_callback(a, b, :post, handler) : nil
+      sep = handler.respond_to?(:sep) ? wrap_collision_callback(a, b, :sep, handler) : nil
+      data = nil
+
+      CP.cpSpaceAddCollisionHandler(@struct.pointer, 
+        a_id, b_id, beg,pre,post,sep,data)
+    end
+
     def add_shape(shape)
       CP.cpSpaceAddShape(@struct.pointer, shape.struct.pointer)
       @active_shapes << shape
@@ -190,7 +273,7 @@ module CP
     end
 
     def step(dt)
-#      CP.cpSpaceStep @struct.pointer, dt
+      CP.cpSpaceStep @struct.pointer, dt
     end
 
     def shape_point_query(*args)

data/spec/constraint_spec.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__)+'/spec_helper'
+describe 'Constraints in chipmunk' do
+  describe 'PinJoint class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::PinJoint.new(boda,bodb,ZERO_VEC_2,ZERO_VEC_2)
+    end
+  end
+
+  describe 'SlideJoint class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::SlideJoint.new(boda,bodb,ZERO_VEC_2,ZERO_VEC_2,4,6)
+    end
+  end
+
+  describe 'PivotJoint class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::PivotJoint.new(boda,bodb,ZERO_VEC_2,ZERO_VEC_2)
+    end
+  end
+
+  describe 'GrooveJoint class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::GrooveJoint.new(boda,bodb,ZERO_VEC_2,ZERO_VEC_2,ZERO_VEC_2)
+    end
+  end
+
+  describe 'DampedSpring class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::DampedSpring.new(boda,bodb,ZERO_VEC_2,ZERO_VEC_2,3,4,5)
+    end
+  end
+
+  describe 'RotaryLimitJoint class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::RotaryLimitJoint.new(boda,bodb,Math::PI,Math::PI/2)
+    end
+  end
+
+  describe 'RatchetJoint class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::RatchetJoint.new(boda,bodb,3,4)
+    end
+  end
+  
+  describe 'GearJoint class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::GearJoint.new(boda,bodb,1,2)
+    end
+  end
+
+  describe 'SimpleMotor class' do
+    it 'can be created' do
+      boda = Body.new 90, 46
+      bodb = Body.new 9, 6
+      CP::SimpleMotor.new(boda,bodb,2)
+    end
+  end
+end

data/spec/shape_spec.rb

@@ -34,7 +34,14 @@ describe 'ShapeStruct in chipmunk' do
     it 'can get its layers' do
       bod = CP::Body.new 90, 76
       s = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
-      s.layers.should == -1
+      # he sets layers to -1 on an unsigned int
+      s.layers.should == 2**32-1
+    end
+
+    it 'can get its group' do
+      bod = CP::Body.new 90, 76
+      s = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
+      s.struct.group.should == 0
     end
 
     it 'can get its col type' do
@@ -45,6 +52,26 @@ describe 'ShapeStruct in chipmunk' do
       s.collision_type.should == :foo
       s.struct.collision_type.should == :foo.object_id
     end
+
+    it 'can get its sensor'
+    it 'can get its u' do
+      bod = CP::Body.new 90, 76
+      s = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
+      s.u.should be_close(0,0.001)
+    end
+    it 'can get its surf vec'
+
+    it 'can get its data' do
+      bod = CP::Body.new 90, 76
+      s = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
+      s.data.read_int.should == s.object_id
+    end
+
+    it 'can get its klass' do
+      bod = CP::Body.new 90, 76
+      s = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
+      ShapeClassStruct.new(s.struct.klass).type.should == :circle_shape
+    end
   end
   describe 'Segment class' do
     it 'can be created' do

data/spec/space_spec.rb

@@ -8,4 +8,101 @@ describe 'Shape in chipmunk' do
     s.iterations = 9
     s.iterations.should == 9
   end
+  it 'can set its gravity' do
+    s = CP::Space.new
+    s.gravity = vec2(4,5)
+    s.gravity.x.should == 4
+    s.gravity.y.should == 5
+  end
+
+  it 'can have a shape added to it' do
+    s = CP::Space.new
+    bod = CP::Body.new 90, 76
+    shapy = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
+    s.add_shape shapy
+
+  end
+
+  it 'can have old style callbacks' do
+    space = CP::Space.new
+    bod = CP::Body.new 90, 76
+    shapy = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
+    shapy.collision_type = :foo
+
+    bod_one = CP::Body.new 90, 76
+    shapy_one = CP::Shape::Circle.new bod_one, 40, CP::ZERO_VEC_2
+    shapy_one.collision_type = :bar
+    space.add_shape shapy
+    space.add_shape shapy_one
+
+    called = false
+    space.add_collision_func :foo, :bar do |a,b|
+      a.should_not be_nil
+      b.should_not be_nil
+      called = true
+      1
+    end
+
+    space.step 1
+    called.should be_true
+  end
+
+  class CollisionHandler
+    attr_reader :begin_called
+    def begin(a,b)
+      @begin_called = [a,b]
+    end
+  end
+
+  it 'can have new style callbacks' do
+    ch = CollisionHandler.new
+
+    space = CP::Space.new
+    bod = CP::Body.new 90, 76
+    shapy = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
+    shapy.collision_type = :foo
+
+    bod_one = CP::Body.new 90, 76
+    shapy_one = CP::Shape::Circle.new bod_one, 40, CP::ZERO_VEC_2
+    shapy_one.collision_type = :bar
+    space.add_shape shapy
+    space.add_shape shapy_one
+
+    space.add_collision_handler :foo, :bar, ch
+
+    space.step 1
+    
+    ch.begin_called[0].should == shapy
+    ch.begin_called[1].should == shapy_one
+  end
+
+  it 'can have lots of shapes no GC corruption' do
+    space = CP::Space.new
+
+    bods = []
+    shapes = []
+    5.times do |i|
+      bods[i] = CP::Body.new(90, 76)
+      shapes[i] = CP::Shape::Circle.new(bods[i], 40, CP::ZERO_VEC_2)
+      shapes[i].collision_type = "bar#{i}".to_sym
+      space.add_shape(shapes[i])
+      space.add_body(bods[i])
+    end
+
+    GC.start
+
+    space.step 1
+  end
+
+  it 'can have constraints added' do
+    space = CP::Space.new
+
+    boda = Body.new 90, 46
+    bodb = Body.new 9, 6
+    pj = CP::PinJoint.new(boda,bodb,ZERO_VEC_2,ZERO_VEC_2)
+
+    space.add_constraint pj
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chipmunk-ffi
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Shawn Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -05:00
+date: 2009-12-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,12 +47,23 @@ files:
 - lib/chipmunk-ffi.rb
 - lib/chipmunk-ffi/bb.rb
 - lib/chipmunk-ffi/body.rb
+- lib/chipmunk-ffi/constraint.rb
+- lib/chipmunk-ffi/constraints/damped_spring.rb
+- lib/chipmunk-ffi/constraints/gear_joint.rb
+- lib/chipmunk-ffi/constraints/groove_joint.rb
+- lib/chipmunk-ffi/constraints/pin_joint.rb
+- lib/chipmunk-ffi/constraints/pivot_joint.rb
+- lib/chipmunk-ffi/constraints/ratchet_joint.rb
+- lib/chipmunk-ffi/constraints/rotary_limit_joint.rb
+- lib/chipmunk-ffi/constraints/simple_motor.rb
+- lib/chipmunk-ffi/constraints/slide_joint.rb
 - lib/chipmunk-ffi/core.rb
 - lib/chipmunk-ffi/shape.rb
 - lib/chipmunk-ffi/space.rb
 - lib/chipmunk-ffi/vec2.rb
 - spec/bb_spec.rb
 - spec/body_spec.rb
+- spec/constraint_spec.rb
 - spec/core_spec.rb
 - spec/shape_spec.rb
 - spec/space_spec.rb
@@ -89,6 +100,7 @@ summary: FFI bindings for chipmunk physics lib.
 test_files: 
 - spec/bb_spec.rb
 - spec/body_spec.rb
+- spec/constraint_spec.rb
 - spec/core_spec.rb
 - spec/shape_spec.rb
 - spec/space_spec.rb