chipmunk-ffi 0.2.1 → 1.0.0

data/README.markdown

@@ -0,0 +1,36 @@
+Chipmunk-FFI
+====
+
+Why should I use Chipmunk-FFI
+----------------------
+
+* To use chipmunk's latest features that are not yet present in their bundle or other gems.
+* To use chipmunk from within jruby.
+* To make shawn42 feel better about spending time on this gem.
+
+
+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/ )
+
+Then...
+
+    gem install chipmunk-ffi
+
+
+License
+-------
+
+MIT
+Copyright 2009 Shawn Anderson
+
+
+Author
+------
+
+Shawn Anderson <shawn42+chipmunk@gmail.com>

data/Rakefile

@@ -8,6 +8,8 @@ begin
     gem.email = "shawn42@gmail.com"
     gem.homepage = "http://shawn42.github.com/chipmunk-ffi"
     gem.authors = ["Shawn Anderson"]
+    gem.add_dependency "ffi", ">= 0.6.0"
+    gem.add_dependency "nice-ffi"
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "jeweler"
     gem.test_files = FileList['{spec,test}/**/*.rb']
@@ -18,11 +20,15 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-desc "Run all rspecs"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
-end
-task :default => :spec
+begin
+  require 'spec/rake/spectask'
+  desc "Run all rspecs"
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_files = FileList['spec/*_spec.rb']
+  end
+  task :default => :spec
 
+rescue LoadError
+  puts "Rspec (or a dependency) not available. Install it with: sudo gem install rspec"
+end
 # vim: syntax=Ruby

data/VERSION

@@ -1 +1 @@
-0.2.1
+1.0.0

data/chipmunk-ffi.gemspec

@@ -1,22 +1,27 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{chipmunk-ffi}
-  s.version = "0.2.1"
+  s.version = "1.0.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-16}
+  s.date = %q{2010-01-04}
   s.description = %q{FFI bindings for chipmunk physics lib.}
   s.email = %q{shawn42@gmail.com}
+  s.extra_rdoc_files = [
+    "README.markdown"
+  ]
   s.files = [
-    "Rakefile",
+    "README.markdown",
+     "Rakefile",
      "VERSION",
      "chipmunk-ffi.gemspec",
      "lib/chipmunk-ffi.rb",
+     "lib/chipmunk-ffi/arbiter.rb",
      "lib/chipmunk-ffi/bb.rb",
      "lib/chipmunk-ffi/body.rb",
      "lib/chipmunk-ffi/constraint.rb",
@@ -32,14 +37,19 @@ Gem::Specification.new do |s|
      "lib/chipmunk-ffi/core.rb",
      "lib/chipmunk-ffi/shape.rb",
      "lib/chipmunk-ffi/space.rb",
+     "lib/chipmunk-ffi/space_hash.rb",
+     "lib/chipmunk-ffi/unsafe.rb",
      "lib/chipmunk-ffi/vec2.rb",
      "spec/bb_spec.rb",
      "spec/body_spec.rb",
      "spec/constraint_spec.rb",
      "spec/core_spec.rb",
+     "spec/perf.rb",
      "spec/shape_spec.rb",
+     "spec/space_hash_spec.rb",
      "spec/space_spec.rb",
      "spec/spec_helper.rb",
+     "spec/unsafe_spec.rb",
      "spec/vec2_spec.rb"
   ]
   s.homepage = %q{http://shawn42.github.com/chipmunk-ffi}
@@ -53,9 +63,12 @@ Gem::Specification.new do |s|
      "spec/body_spec.rb",
      "spec/constraint_spec.rb",
      "spec/core_spec.rb",
+     "spec/perf.rb",
      "spec/shape_spec.rb",
+     "spec/space_hash_spec.rb",
      "spec/space_spec.rb",
      "spec/spec_helper.rb",
+     "spec/unsafe_spec.rb",
      "spec/vec2_spec.rb"
   ]
 
@@ -64,14 +77,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ffi>, [">= 0.6.0"])
+      s.add_runtime_dependency(%q<nice-ffi>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
+      s.add_dependency(%q<ffi>, [">= 0.6.0"])
+      s.add_dependency(%q<nice-ffi>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<ffi>, [">= 0.6.0"])
+    s.add_dependency(%q<nice-ffi>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
+

data/lib/chipmunk-ffi.rb

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

data/lib/chipmunk-ffi/arbiter.rb

@@ -0,0 +1,108 @@
+module CP
+  # FIXME tell Scott Lembcke that this function is missing from chipmunk_ffi.h
+  # cp_static_inline :cpArbiterIsFirstContact, [:pointer], :int
+  
+  cp_static_inline :cpArbiterGetNormal, [:pointer, :int], Vect.by_value
+  cp_static_inline :cpArbiterGetPoint, [:pointer, :int], Vect.by_value
+  
+  func :cpArbiterTotalImpulse, [:pointer], Vect.by_value
+  func :cpArbiterTotalImpulseWithFriction, [:pointer], Vect.by_value
+  
+  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 Arbiter
+    attr_reader :struct
+    def initialize(ptr)
+      @struct = ArbiterStruct.new(ptr)
+      @shapes = nil
+      
+      # Temporary workaround for a bug in chipmunk, fixed in r342.
+      @struct.num_contacts = 0 if @struct.contacts.null?
+    end
+    
+    def first_contact?
+      # CP.cpArbiterIsFirstContact(@struct.pointer).nonzero?
+      @struct.first_col.nonzero?
+    end
+    
+    def point(index = 0)
+      raise IndexError unless (0...@struct.num_contacts).include? index
+      Vec2.new CP.cpArbiterGetPoint(@struct.pointer, index)
+    end
+    
+    def normal(index = 0)
+      raise IndexError unless (0...@struct.num_contacts).include? index
+      Vec2.new CP.cpArbiterGetNormal(@struct.pointer, index)
+    end
+    
+    def impulse with_friction = false
+      if with_friction
+        Vec2.new CP.cpArbiterTotalImpulseWithFriction(@struct.pointer)
+      else
+        Vec2.new CP.cpArbiterTotalImpulse(@struct.pointer)
+      end
+    end
+    
+    def shapes
+      return @shapes if @shapes
+
+      swapped = @struct.swapped_col.nonzero?
+      arba = swapped ? @struct.b : @struct.a
+      arbb = swapped ? @struct.a : @struct.b
+
+      as = ShapeStruct.new(arba)
+      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_long 0
+      rb_b = ObjectSpace._id2ref b_obj_id
+
+      @shapes = [ rb_a, rb_b ]
+    end
+    
+    def a
+      self.shapes[0]
+    end
+    
+    def b
+      self.shapes[1]
+    end
+    
+    def e
+      @struct.e
+    end
+    def e=(new_e)
+      @struct.e = new_e
+    end
+    
+    def u
+      @struct.u
+    end
+    def u=(new_u)
+      @struct.u = new_u
+    end
+    
+    def each_contact
+      (0...@struct.num_contacts).each do |index|
+        yield CP.cpArbiterGetPoint(@struct, index), CP.cpArbiterGetNormal(@struct, index)
+      end
+    end
+  end
+  
+end
+

data/lib/chipmunk-ffi/body.rb

@@ -41,6 +41,10 @@ module CP
   cp_static_inline :cpBodyWorld2Local, [:pointer, Vect.by_value], Vect.by_value
   cp_static_inline :cpBodyApplyImpulse, [:pointer, Vect.by_value, Vect.by_value], :void
 
+  func :cpBodySetMass, [:pointer, CP_FLOAT], :void
+  func :cpBodySetMoment, [:pointer, CP_FLOAT], :void
+  func :cpBodySetAngle, [:pointer, CP_FLOAT], :void
+
   class Body
     attr_reader :struct
     def initialize(*args)
@@ -59,20 +63,30 @@ module CP
       @struct.m
     end
     def m=(pm)
-      @struct.m = pm
+      CP.cpBodySetMass(@struct.pointer, pm)
     end
     alias :mass :m
     alias :mass= :m=
 
+    def m_inv
+      @struct.m_inv
+    end
+    alias :mass_inv :m_inv
+
     def i
       @struct.i
     end
     def i=(pi)
-      @struct.i = pi
+      CP.cpBodySetMoment(@struct.pointer, pi)
     end
     alias :moment :i
     alias :moment= :i=
 
+    def i_inv
+      @struct.i_inv
+    end
+    alias :moment_inv :i_inv
+
     def p
       Vec2.new @struct.p
     end
@@ -107,7 +121,7 @@ module CP
       @struct.a
     end
     def a=(pa)
-      @struct.a = pa
+      CP.cpBodySetAngle(@struct.pointer, pa)
     end
     alias :angle :a
     alias :angle= :a=
@@ -134,12 +148,30 @@ module CP
       Vec2.new @struct.rot
     end
 
+    def v_limit
+      @struct.v_limit
+    end
+    def v_limit=(new_v_limit)
+      @struct.v_limit = new_v_limit
+    end
+    alias :vel_limit  :v_limit
+    alias :vel_limit= :v_limit=
+
+    def w_limit
+      @struct.w_limit
+    end
+    def w_limit=(new_w_limit)
+      @struct.w_limit = new_w_limit
+    end
+    alias :ang_vel_limit  :w_limit
+    alias :ang_vel_limit= :w_limit=
+
     def local2world(v)
-      CP.cpBodyLocal2World(@struct.pointer,v.struct)
+      Vec2.new CP.cpBodyLocal2World(@struct.pointer,v.struct)
     end
 
     def world2local(v)
-      CP.cpBodyWorld2Local(@struct.pointer,v.struct)
+      Vec2.new CP.cpBodyWorld2Local(@struct.pointer,v.struct)
     end
 
     def reset_forces
@@ -155,7 +187,7 @@ module CP
     end
 
     def update_velocity(g,dmp,dt)
-      CP.cpBodyUpdateVelocity(@struct.pointer,g,dmp,dt)
+      CP.cpBodyUpdateVelocity(@struct.pointer,g.struct,dmp,dt)
     end
 
     def update_position(dt)

data/lib/chipmunk-ffi/core.rb

@@ -24,17 +24,17 @@ module CP
   end
 
   func :cpMomentForCircle, [CP_FLOAT,CP_FLOAT,CP_FLOAT,Vect.by_value], CP_FLOAT
-  def moment_for_circle(m,r1,r2,offset)
+  def self.moment_for_circle(m,r1,r2,offset)
     cpMomentForCircle(m, r1, r2, offset.struct);
   end
 
   func :cpMomentForSegment, [CP_FLOAT,Vect.by_value,Vect.by_value], CP_FLOAT
-  def moment_for_segment(m,v1,v2)
+  def self.moment_for_segment(m,v1,v2)
     cpMomentForCircle(m, v1.struct, v2.struct)
   end
 
   func :cpMomentForPoly, [CP_FLOAT,:int,:pointer,Vect.by_value], CP_FLOAT
-  def moment_for_poly(m,verts,offset)
+  def self.moment_for_poly(m,verts,offset)
     mem_pointer = FFI::MemoryPointer.new Vect, verts.size
     vert_structs = verts.collect{|s|s.struct}
 
@@ -47,6 +47,9 @@ module CP
     cpMomentForPoly(m, verts.size, mem_pointer, offset.struct)
   end
 
+  def moment_for_circle(*args);CP.moment_for_circle(*args);end
+  def moment_for_poly(*args);CP.moment_for_poly(*args);end
+  def moment_for_segment(*args);CP.moment_for_segment(*args);end
   func :cpInitChipmunk, [], :void
   cpInitChipmunk
 

data/lib/chipmunk-ffi/shape.rb

@@ -37,19 +37,33 @@ module CP
           )
   end
   class SegmentQueryInfoStruct < NiceFFI::Struct
-    layout(:shape, ShapeStruct,
+    layout(:shape, :pointer,
            :t, CP_FLOAT,
            :n, Vect
           )
   end
 
+
   func :cpCircleShapeNew, [BodyStruct,CP_FLOAT,Vect.by_value], ShapeStruct
   func :cpSegmentShapeNew, [BodyStruct,Vect.by_value,Vect.by_value,CP_FLOAT], ShapeStruct
   func :cpPolyShapeNew, [BodyStruct,:int,:pointer,Vect.by_value], ShapeStruct
   func :cpShapeCacheBB, [ShapeStruct], :void
   func :cpResetShapeIdCounter, [], :void
+  func :cpShapePointQuery, [:pointer, Vect.by_value], :int
+	func :cpShapeSegmentQuery, [:pointer, Vect.by_value, Vect.by_value, :pointer], :int
 
   module Shape
+    class SegmentQueryInfo
+      attr_reader :hit, :t, :n
+      def initialize(hit,t=nil,n=nil,info=nil,ptr=nil)
+        @hit = hit
+        @t = t
+        @n = n
+        @info = info
+        @ptr = ptr
+      end
+    end
+
     attr_reader :struct
 
     def body
@@ -92,10 +106,9 @@ module CP
     end
 
     def cache_bb
-      CP.cpShapeCacheBB(@struct.bb)
+      CP.cpShapeCacheBB(@struct.bb) 
       bb
     end
-
     def e
       @struct.e
     end
@@ -119,14 +132,26 @@ module CP
 
     def surface_v
       Vec2.new @struct.surface_v
-    end
+    end 
     def surface_v=(new_sv)
       @struct.surface_v.pointer.put_bytes 0, new_sv.struct.to_bytes, 0,Vect.size
     end
 
+    def sensor?
+      @struct.sensor == 0 ? false : true
+    end
+    def sensor=(new_sensor)
+      @struct.sensor = new_sensor ? 1 : 0
+    end
+
+    def point_query(point)
+      bool_int = CP.cpShapePointQuery(@struct.pointer, point.struct)
+      bool_int == 0 ? false : true
+    end
+
     def set_data_pointer
-      mem = FFI::MemoryPointer.new(:ulong)
-      mem.put_ulong 0, object_id
+      mem = FFI::MemoryPointer.new(:long)
+      mem.put_long 0, object_id
       # this is needed to prevent data corruption by GC
       @shape_pointer = mem
       @struct.data = mem
@@ -136,6 +161,23 @@ module CP
       CP.cpResetShapeIdCounter
     end
 
+    def segment_query(a,b)
+      ptr = FFI::MemoryPointer.new(SegmentQueryInfoStruct.size)
+      info = SegmentQueryInfoStruct.new ptr
+	
+      bool_int = CP.cpShapeSegmentQuery(@struct.pointer, a.struct.pointer, b.struct.pointer, ptr)
+      hit = bool_int == 0 ? false : true
+      if hit
+        #obj_id = info.shape.data.get_long 0
+        #shape = ObjectSpace._id2ref obj_id
+        # TODO prob need to dup these things
+        n = Vec2.new(info.n)
+        SegmentQueryInfo.new hit, info.t, n, info, ptr
+      else
+        SegmentQueryInfo.new hit
+      end
+    end
+   
     class Circle
       include Shape
       def initialize(body, rad, offset_vec)