chipmunk-ffi 0.2.1 → 1.0.0

data/lib/chipmunk-ffi/space.rb

@@ -1,8 +1,13 @@
 module CP
+  # used for layers; will only work on 32 bit values 
+  # (chipmunk cheats and sets these to -1)
+  ALL_ONES = 2**32-1
+
   callback :cpCollisionBeginFunc, [:pointer,:pointer,:pointer], :int
   callback :cpCollisionPreSolveFunc, [:pointer,:pointer,:pointer], :int
   callback :cpCollisionPostSolveFunc, [:pointer,:pointer,:pointer], :int
   callback :cpCollisionSeparateFunc, [:pointer,:pointer,:pointer], :int
+	callback :cpSpacePointQueryFunc, [:pointer,:pointer], :void
 
   class CollisionHandlerStruct < NiceFFI::Struct
     layout(
@@ -16,22 +21,6 @@ module CP
     )
   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,
@@ -79,6 +68,8 @@ module CP
    :cpCollisionBeginFunc, :cpCollisionPreSolveFunc, :cpCollisionPostSolveFunc, :cpCollisionSeparateFunc, :pointer], :void
   func :cpSpaceRemoveCollisionHandler, [:pointer, :uint, :uint], :void
 
+  func :cpSpacePointQuery, [:pointer, Vect.by_value, :uint, :uint, :cpSpacePointQueryFunc, :pointer], :pointer
+  func :cpSpacePointQueryFirst, [:pointer, Vect.by_value, :uint, :uint], :pointer
 
   class Space
     attr_reader :struct
@@ -133,11 +124,11 @@ module CP
             arbb = swapped ? arb.a : arb.b
 
             as = ShapeStruct.new(arba)
-            a_obj_id = as.data.get_ulong 0
+            a_obj_id = as.data.get_long 0
             rb_a = ObjectSpace._id2ref a_obj_id
 
             bs = ShapeStruct.new(arbb)
-            b_obj_id = bs.data.get_ulong 0
+            b_obj_id = bs.data.get_long 0
             rb_b = ObjectSpace._id2ref b_obj_id
 
             block.call rb_a, rb_b
@@ -179,27 +170,17 @@ module CP
     end
 
     def wrap_collision_callback(a,b,type,handler)
+      arity = handler.method(type).arity
       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
+        arbiter = Arbiter.new(arb_ptr)
+        
+        ret = case arity
+        when 1 then handler.send type, arbiter
+        when 2 then handler.send type, *arbiter.shapes
+        when 3 then handler.send type, arbiter, *arbiter.shapes
+        else raise ArgumentError
         end
+        ret ? 1 : 0
       end
       @callbacks[[a,b,type]] = [handler,callback]
       callback
@@ -284,20 +265,47 @@ module CP
       CP.cpSpaceStep @struct.pointer, dt
     end
 
-    def shape_point_query(*args)
-      raise "Not Implmented yet"
+    def each_body(&block)
+      @bodies.each &block
+#      typedef void (*cpSpaceBodyIterator)(cpBody *body, void *data);
+#      void cpSpaceEachBody(cpSpace *space, cpSpaceBodyIterator func, void *data);
+    end
+
+    def shape_point_query(pt)
+      point_query_first pt, ALL_ONES, 0
     end
 
-    def static_shape_point_query(*args)
+    def static_shape_point_query(pt)
       raise "Not Implmented yet"
     end
 
-    def each_body(&block)
-      @bodies.each &block
-#      typedef void (*cpSpaceBodyIterator)(cpBody *body, void *data);
-#      void cpSpaceEachBody(cpSpace *space, cpSpaceBodyIterator func, void *data);
+    def point_query_first(point, layers, group)
+      shape_ptr = CP.cpSpacePointQueryFirst(@struct.pointer, point.struct, layers, group)
+      if shape_ptr.null?
+        nil
+      else
+        shape = ShapeStruct.new(shape_ptr)
+        obj_id = shape.data.get_long 0
+        ObjectSpace._id2ref obj_id
+      end
+    end
+
+    def active_shapes_hash
+      SpaceHash.new(SpaceHashStruct.new(@struct.active_shapes))
     end
 
+    def point_query(point, layers, group, &block)
+      return nil unless block_given?
+
+      query_proc = Proc.new do |shape_ptr,data|
+        shape = ShapeStruct.new(shape_ptr)
+        obj_id = shape.data.get_long 0
+        shape = ObjectSpace._id2ref obj_id
+        block.call shape
+      end
+
+      CP.cpSpacePointQuery(@struct.pointer, point.struct, layers, group,query_proc,nil)
+    end
 
   end
 end

data/lib/chipmunk-ffi/space_hash.rb

@@ -0,0 +1,63 @@
+module CP
+
+  callback :cpSpaceHashBBFunc, [:pointer], BBStruct.by_value
+  callback :cpSpaceHashQueryFunc, [:pointer, :pointer, :pointer], :void
+
+  class SpaceHashStruct < NiceFFI::Struct
+    layout(:num_cells, :int,
+           :cell_dim, CP_FLOAT,
+           :bb_func, :cpSpaceHashBBFunc,
+           :handle_set, :pointer,
+           :table, :pointer,
+           :bins, :pointer,
+           :stamp, :int)
+  end
+  func :cpSpaceHashNew,  [CP_FLOAT,:int,:cpSpaceHashBBFunc], :pointer
+  func :cpSpaceHashQuery, [:pointer, :pointer, BBStruct.by_value, :cpSpaceHashQueryFunc, :pointer], :void
+  func :cpSpaceHashInsert, [:pointer, :pointer, :uint, BBStruct.by_value], :void
+  func :cpSpaceHashRemove, [:pointer, :pointer, :uint], :void
+
+  class SpaceHash
+    attr_reader :struct
+    def initialize(*args, &bb_func)
+      case args.size
+      when 1
+        @struct = args.first
+      when 2
+        raise "need bb func" unless block_given?
+        cell_dim = args[0]
+        cells = args[1]
+        @struct = SpaceHashStruct.new(CP.cpSpaceHashNew(cell_dim, cells, bb_func))
+      end
+    end
+
+    def num_cells;@struct.num_cells;end
+    def cell_dim;@struct.cell_dim;end
+    
+    def insert(obj, bb)
+      CP.cpSpaceHashInsert(@struct.pointer, obj.struct.pointer, obj.struct.hash_value, bb.struct)
+    end
+
+    def remove(obj)
+      CP.cpSpaceHashRemove(@struct.pointer, obj.struct.pointer, obj.struct.hash_value)
+    end
+
+    def query_func
+      @query_func ||= Proc.new do |obj,other,data|
+        s = ShapeStruct.new(other)
+        obj_id = s.data.get_long 0
+        @shapes <<  ObjectSpace._id2ref(obj_id)
+      end
+    end
+
+    def query_by_bb(bb)
+      @shapes = []
+      CP.cpSpaceHashQuery(@struct.pointer, nil, bb.struct, query_func, nil)
+      @shapes
+    end
+
+  end
+
+end
+
+

data/lib/chipmunk-ffi/unsafe.rb

@@ -0,0 +1,47 @@
+require 'chipmunk-ffi'
+
+module CP
+  func :cpCircleShapeSetRadius, [:pointer, CP_FLOAT], :void
+  func :cpCircleShapeSetOffset, [:pointer, Vect.by_value], :void
+  
+  func :cpSegmentShapeSetEndpoints, [:pointer, Vect.by_value, Vect.by_value], :void
+  func :cpSegmentShapeSetRadius,    [:pointer, CP_FLOAT], :void
+  
+  func :cpPolyShapeSetVerts, [:pointer, :int, :pointer, Vect.by_value], :void
+  
+  module Shape
+    class Circle
+      def radius=(new_radius)
+        CP.cpCircleShapeSetRadius(@struct, new_radius)
+      end
+      def offset=(new_offset)
+        CP.cpCircleShapeSetOffset(@struct, new_offset.struct)
+      end
+    end
+    class Segment
+      def endpoints=(new_endpoints)
+        new_a, new_b = *new_endpoints.map { |v| v.struct }
+        CP.cpSegmentShapeSetEndpoints(@struct, new_a, new_b)
+      end
+      def radius=(new_radius)
+        CP.cpSegmentShapeSetRadius(@struct, new_radius)
+      end
+    end
+    class Poly
+      def verts=(new_verts_and_offset)
+        new_verts, new_offset = *new_verts_and_offset
+        
+        new_verts_pointer = FFI::MemoryPointer.new Vect, new_verts.count
+        
+        size = Vect.size
+        tmp = new_verts_pointer
+        new_verts.each_with_index  do |vert, i|
+          tmp.send(:put_bytes, 0, vert.struct.to_bytes, 0, size)
+          tmp += size unless i == new_verts.length - 1 # avoid OOB
+        end
+        
+        CP.cpPolyShapeSetVerts(@struct.pointer, new_verts.count, new_verts_pointer, new_offset.struct)
+      end
+    end
+  end
+end

data/lib/chipmunk-ffi/vec2.rb

@@ -1,7 +1,24 @@
 module CP
-  class Vect < NiceFFI::Struct
+  class Vect < FFI::Struct
     layout( :x, CP_FLOAT,
-           :y, CP_FLOAT )
+            :y, CP_FLOAT )
+
+    def self.release( ptr )
+      free ptr
+    end
+
+    def initialize( ptr )
+      case ptr
+      when FFI::MemoryPointer, FFI::Buffer, FFI::AutoPointer
+        super ptr
+      else
+        super FFI::AutoPointer.new(ptr, self.class.method(:release))
+      end
+    end
+
+    def to_bytes
+      return self.pointer.get_bytes(0, self.size)
+    end
   end
 
   cp_static_inline :cpv, [CP_FLOAT,CP_FLOAT], Vect.by_value
@@ -9,8 +26,8 @@ module CP
   cp_static_inline :cpvadd, [Vect.by_value,Vect.by_value], Vect.by_value
   cp_static_inline :cpvsub, [Vect.by_value,Vect.by_value], Vect.by_value
   cp_static_inline :cpvmult, [Vect.by_value,CP_FLOAT], Vect.by_value
-  cp_static_inline :cpvdot, [Vect.by_value,Vect.by_value], Vect.by_value
-  cp_static_inline :cpvcross, [Vect.by_value,Vect.by_value], Vect.by_value
+  cp_static_inline :cpvdot, [Vect.by_value,Vect.by_value], CP_FLOAT
+  cp_static_inline :cpvcross, [Vect.by_value,Vect.by_value], CP_FLOAT
 
   cp_static_inline :cpvperp, [Vect.by_value], Vect.by_value
   cp_static_inline :cpvrperp, [Vect.by_value], Vect.by_value
@@ -20,13 +37,13 @@ module CP
 
   cp_static_inline :cpvlengthsq, [Vect.by_value], CP_FLOAT
 
-  cp_static_inline :cpvlerp, [Vect.by_value,Vect.by_value], Vect.by_value
+  cp_static_inline :cpvlerp, [Vect.by_value,Vect.by_value,CP_FLOAT], Vect.by_value
 
   cp_static_inline :cpvnormalize, [Vect.by_value], Vect.by_value
   cp_static_inline :cpvnormalize_safe, [Vect.by_value], Vect.by_value
 
   cp_static_inline :cpvclamp, [Vect.by_value,Vect.by_value], Vect.by_value
-  cp_static_inline :cpvlerpconst, [Vect.by_value,Vect.by_value], Vect.by_value
+  cp_static_inline :cpvlerpconst, [Vect.by_value,Vect.by_value, CP_FLOAT], Vect.by_value
   cp_static_inline :cpvdist, [Vect.by_value,Vect.by_value], CP_FLOAT
   cp_static_inline :cpvdistsq, [Vect.by_value,Vect.by_value], CP_FLOAT
 
@@ -48,23 +65,23 @@ module CP
       when 2
         @struct = CP.cpv(*args)
       else
-        raise "wrong number of args for Vec, got #{args.size}, but expected 2"
+        raise "wrong number of arguments (#{args.size} for 2)"
       end
     end
 
     def x
-      @struct.x
+      @struct[:x]
     end
     def x=(new_x)
-      raise TypeError "cant't modify frozen object" if frozen?
-      @struct.x = new_x
+      raise TypeError, "can't modify frozen vec2" if frozen?
+      @struct[:x] = new_x
     end
     def y
-      @struct.y
+      @struct[:y]
     end
     def y=(new_y)
-      raise TypeError "cant't modify frozen object" if frozen?
-      @struct.y = new_y
+      raise TypeError, "can't modify frozen vec2" if frozen?
+      @struct[:y] = new_y
     end
 
     def self.for_angle(angle)
@@ -80,7 +97,7 @@ module CP
     end
 
     def to_a
-      [@struct.x,@struct.y]
+      [@struct[:x],@struct[:y]]
     end
 
     def -@
@@ -117,7 +134,7 @@ module CP
     end
 
     def rperp
-      Vec2.new CP.cpvperp(@struct)
+      Vec2.new CP.cpvrperp(@struct)
     end
 
     def project(other_vec)
@@ -136,8 +153,8 @@ module CP
       CP.cpvlengthsq(@struct)
     end
 
-    def lerp(other_vec)
-      Vec2.new CP.cpvlerp(@struct, other_vec.struct)
+    def lerp(other_vec, t)
+      Vec2.new CP.cpvlerp(@struct, other_vec.struct, t)
     end
 
     def normalize
@@ -157,16 +174,16 @@ module CP
       Vec2.new CP.cpvclamp(@struct)
     end
 
-    def lerpconst(other_vec)
-      Vec2.new CP.cpvlerpconst(@struct)
+    def lerpconst(other_vec, d)
+      Vec2.new CP.cpvlerpconst(@struct, other_vec.struct, d)
     end
 
     def dist(other_vec)
-      CP.cpvdist(@struct)
+      CP.cpvdist(@struct, other_vec.struct)
     end
 
     def distsq(other_vec)
-      CP.cpvdistsq(@struct)
+      CP.cpvdistsq(@struct, other_vec.struct)
     end
 
     def near?(other_vec, dist)

data/spec/body_spec.rb

@@ -9,6 +9,7 @@ describe 'A new Body' do
     b = CP::Body.new(5, 7)
     b.m = 900
     b.m.should == 900
+    b.m_inv.should be_close(1.0/900, 0.001)
   end
 
   it 'can set its pos' do
@@ -31,21 +32,125 @@ describe 'A new Body' do
     b.v.y.should == 6
   end
 
-  it 'can set its moment'
-  it 'can set its force'
-  it 'can set its angle'
-  it 'can set its angle_vel'
-  it 'can set its torque'
-  it 'can get its rot'
-  it 'can get local2world'
-  it 'can get world2local'
-  it 'can reset its forces'
-  it 'can apply force'
-  it 'can apply impulse'
-  it 'can update its velocity over a timestep'
+  it 'can set its moment' do
+    b = CP::Body.new(5, 7)
+    b.moment = 37
+    b.moment.should == 37
+    b.moment_inv.should be_close(1.0/37, 0.001)
+  end
+
+  it 'can set its force' do
+    b = CP::Body.new(5, 7)
+    b.f.x.should == 0
+    b.f.y.should == 0
+
+    b.f = vec2(4,6)
+    b.f.x.should == 4
+    b.f.y.should == 6
+  end
+
+  it 'can set its angle' do
+    b = CP::Body.new(5, 7)
+    b.a = 37
+    b.a.should == 37
+  end
+
+  it 'can set its angle_vel' do
+    b = CP::Body.new(5, 7)
+    b.w = 37
+    b.w.should == 37
+  end
+
+  it 'can set its torque' do
+    b = CP::Body.new(5, 7)
+    b.t = 37
+    b.t.should == 37
+  end
+
+  it 'can get its rot' do
+    b = CP::Body.new(5, 7)
+    b.rot.x.should == 1
+    b.rot.y.should == 0
+  end
+
+  it 'can set its v_limit' do
+    b = CP::Body.new(5, 7)
+    b.v_limit = 37
+    b.v_limit.should == 37
+  end
+
+  it 'can get its v_limit' do
+    b = CP::Body.new(5, 7)
+    b.v_limit.should === CP::INFINITY
+  end
+
+  it 'can set its w_limit' do
+    b = CP::Body.new(5, 7)
+    b.w_limit = 37
+    b.w_limit.should == 37
+  end
+
+  it 'can get its w_limit' do
+    b = CP::Body.new(5, 7)
+    b.w_limit.should === CP::INFINITY
+  end
+
+  it 'can get local2world' do
+    b = CP::Body.new(5, 7)
+    b.pos = vec2(4,6)
+    v = b.local2world(vec2(0,0))
+    v.x.should == 4
+    v.y.should == 6
+  end
+
+  it 'can get world2local' do
+    b = CP::Body.new(5, 7)
+    b.pos = vec2(4,6)
+    v = b.world2local(vec2(4,6))
+    v.x.should == 0
+    v.y.should == 0
+  end
+
+  it 'can reset its forces' do
+    b = CP::Body.new(5, 7)
+    b.f = vec2(4,6)
+    b.reset_forces
+    b.f.x.should == 0
+    b.f.y.should == 0
+  end
+
+  it 'can apply force' do
+    b = CP::Body.new(5, 7)
+    b.apply_force(vec2(1,0), ZERO_VEC_2)
+    b.f.x.should == 1
+    b.f.y.should == 0
+  end
+
+  it 'can apply impulse' do
+    b = CP::Body.new(5, 7)
+    b.apply_impulse(vec2(1,0), ZERO_VEC_2)
+    # shouldn't mess with force
+    b.f.x.should == 0
+    b.f.y.should == 0
+
+    b.v.x.should == 0.2
+    b.v.y.should == 0
+  end
 
   it 'should be able to update its position' do
     b = CP::Body.new(5, 7)
+    b.apply_impulse(vec2(1,0), ZERO_VEC_2)
     b.update_position 25
+    b.p.x.should be_close(5,0.001)
+    b.p.y.should be_close(0,0.001)
+  end
+
+  it 'can update its velocity over a timestep' do
+    b = CP::Body.new(5, 7)
+    b.apply_impulse(vec2(1,0), ZERO_VEC_2)
+    b.update_velocity vec2(0,0), 0.5, 25
+    b.v.x.should be_close(0.1,0.001)
+    b.v.y.should be_close(0,0.001)
   end
+
 end