chipmunk-ffi 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/chipmunk-ffi.gemspec

@@ -5,18 +5,31 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chipmunk-ffi}
-  s.version = "0.0.1"
+  s.version = "0.1.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-02}
+  s.date = %q{2009-12-04}
   s.description = %q{FFI bindings for chipmunk physics lib.}
   s.email = %q{shawn42@gmail.com}
   s.files = [
     "Rakefile",
      "VERSION",
      "chipmunk-ffi.gemspec",
-     "lib/chipmunk-ffi.rb"
+     "lib/chipmunk-ffi.rb",
+     "lib/chipmunk-ffi/bb.rb",
+     "lib/chipmunk-ffi/body.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/core_spec.rb",
+     "spec/shape_spec.rb",
+     "spec/space_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/vec2_spec.rb"
   ]
   s.homepage = %q{http://shawn42.github.com/chipmunk-ffi}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -24,6 +37,15 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{chipmunk-ffi}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{FFI bindings for chipmunk physics lib.}
+  s.test_files = [
+    "spec/bb_spec.rb",
+     "spec/body_spec.rb",
+     "spec/core_spec.rb",
+     "spec/shape_spec.rb",
+     "spec/space_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/vec2_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/chipmunk-ffi.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'nice-ffi'
 
 module CP
@@ -16,12 +15,12 @@ module CP
 
   end
   load_library "chipmunk", CP::LOAD_PATHS
-  def self.cp_static_inline(func_sym, ret, args)
+  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(Vect.by_value, args, FFI::Pointer.new(self.send(func_name)), :convention => :default )
+    func = FFI::Function.new(ret, args, FFI::Pointer.new(self.send(func_name)), :convention => :default )
     const_set const_func_name, func
 
     instance_eval <<-METHOD
@@ -33,187 +32,10 @@ module CP
 
   CP_FLOAT = :double
 
-  class Vect < NiceFFI::Struct
-    layout( :x, CP_FLOAT,
-           :y, CP_FLOAT )
-
-  end
-
-  cp_static_inline :cpv, Vect.by_value, [CP_FLOAT,CP_FLOAT]
-  cp_static_inline :cpvneg, Vect.by_value, [Vect.by_value]
-  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, [Vect.by_value,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 :cpvperp, Vect.by_value, [Vect.by_value]
-  cp_static_inline :cpvrperp, Vect.by_value, [Vect.by_value]
-  cp_static_inline :cpvproject, Vect.by_value, [Vect.by_value,Vect.by_value]
-  cp_static_inline :cpvrotate, Vect.by_value, [Vect.by_value,Vect.by_value]
-  cp_static_inline :cpvunrotate, Vect.by_value, [Vect.by_value,Vect.by_value]
-
-  cp_static_inline :cpvlengthsq, CP_FLOAT, [Vect.by_value]
-
-  cp_static_inline :cpvlerp, Vect.by_value, [Vect.by_value,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 :cpvdist, CP_FLOAT, [Vect.by_value,Vect.by_value]
-  cp_static_inline :cpvdistsq, CP_FLOAT, [Vect.by_value,Vect.by_value]
-
-  cp_static_inline :cpvnear, :int, [Vect.by_value,Vect.by_value, CP_FLOAT]
-
-  func :cpvlength, [Vect.by_value], CP_FLOAT
-  func :cpvforangle, [CP_FLOAT], Vect.by_value
-  func :cpvslerp, [Vect.by_value, Vect.by_value, CP_FLOAT], Vect.by_value
-  func :cpvslerpconst, [Vect.by_value, Vect.by_value, CP_FLOAT], Vect.by_value
-  func :cpvtoangle, [Vect.by_value], CP_FLOAT
-  func :cpvstr, [Vect.by_value], :string
-
-  class Vec2
-    attr_accessor :struct
-    def initialize(x,y)
-      @struct = CP.cpv(x,y)
-    end
-
-    def x
-      @struct.x
-    end
-    def x=(new_x)
-      @struct.x = new_x
-    end
-    def y
-      @struct.y
-    end
-    def y=(new_y)
-      @struct.y = new_y
-    end
-
-    def self.for_angle(angle)
-      create_from_struct CP.cpvforangle(angle)
-    end
-
-    def to_s
-      CP.cpvstr @struct
-    end
-
-    def to_angle
-      CP.cpvtoangle @struct
-    end
-
-    def to_a
-      [@struct.x,@struct.y]
-    end
-
-    def -@
-      create_from_struct CP.cpvneg(@struct)  
-    end
-
-    def +(other_vec)
-      create_from_struct CP.cpvadd(@struct, other_vec.struct)
-    end
-
-    def -(other_vec)
-      create_from_struct CP.cpvsub(@struct, other_vec.struct)
-    end
-
-    def *(s)
-      create_from_struct CP.cpvmult(@struct, s)
-    end
-
-    def /(s)
-      factor = 1.0/s
-      create_from_struct CP.cpvmult(@struct, s)
-    end
-
-    def dot(other_vec)
-      CP.cpvdot(@struct, other_vec.struct)
-    end
-
-    def cross(other_vec)
-      CP.cpvcross(@struct, other_vec.struct)
-    end
-
-    def perp
-      create_from_struct CP.cpvperp(@struct)
-    end
-
-    def rperp
-      create_from_struct CP.cpvperp(@struct)
-    end
-
-    def project(other_vec)
-      create_from_struct CP.cpvproject(@struct, other_vec.struct)
-    end
-
-    def rotate(other_vec)
-      create_from_struct CP.cpvrotate(@struct, other_vec.struct)
-    end
-
-    def unrotate(other_vec)
-      create_from_struct CP.cpvunrotate(@struct, other_vec.struct)
-    end
-
-    def lengthsq
-      CP.cpvlengthsq(@struct)
-    end
-
-    def lerp(other_vec)
-    end
-
-    def normalize
-      create_from_struct CP.cpvnormalize(@struct)
-    end
-
-    def normalize!
-      @struct = CP.cpvnormalize(@struct)
-    end
-
-    def normalize_safe
-      create_from_struct CP.cpvnormalize_safe(@struct)
-    end
-
-    def clamp(other_vec)
-      create_from_struct CP.cpvclamp(@struct)
-    end
-
-    def lerpconst(other_vec)
-      create_from_struct CP.cpvlerpconst(@struct)
-    end
-
-    def dist(other_vec)
-      CP.cpvdist(@struct)
-    end
-
-    def distsq(other_vec)
-      CP.cpvdistsq(@struct)
-    end
-
-    def near?(other_vec, dist)
-      delta_v = CP.cpvsub(@struct, other_vec.struct)
-      CP.cpvdot(delta_v, delta_v) < dist*dist
-    end
-
-    def length
-      CP::cpvlength @struct
-    end
-
-    private 
-
-    def create_from_struct(struct)
-      new_v = dup
-      new_v.struct = struct
-      new_v
-    end
-
-  end
-  ZERO_VEC_2 = Vec2.new(0,0).freeze
-
 end
-def vec2(x,y)
-  CP::Vec2.new x, y
+libs = %w{vec2 core bb body shape space}
+#	Init_cpConstraint();
+$: << File.dirname(__FILE__)
+libs.each do |lib|
+  require "chipmunk-ffi/#{lib}"
 end

data/lib/chipmunk-ffi/bb.rb

@@ -0,0 +1,71 @@
+module CP
+
+  class BBStruct < NiceFFI::Struct
+    layout( :l, CP_FLOAT,
+           :b, CP_FLOAT,
+           :r, CP_FLOAT,
+           :t, CP_FLOAT )
+  end
+
+  cp_static_inline :cpBBNew,  [CP_FLOAT,CP_FLOAT,CP_FLOAT,CP_FLOAT], BBStruct.by_value
+  cp_static_inline :cpBBintersects, [BBStruct.by_value,BBStruct.by_value], :int
+  cp_static_inline :cpBBcontainsBB, [BBStruct.by_value,BBStruct.by_value], :int
+  cp_static_inline :cpBBcontainsVect, [BBStruct.by_value,Vect.by_value], :int
+
+  func :cpBBClampVect, [BBStruct.by_value,Vect.by_value], Vect.by_value
+  func :cpBBWrapVect, [BBStruct.by_value,Vect.by_value], Vect.by_value
+
+  class BB
+    attr_reader :struct
+    def initialize(*args)
+      case args.size
+      when 1
+        @struct = args.first
+      when 4
+        @struct = CP.cpBBNew(*args)
+      else
+        raise "wrong number of args for BB, got #{args.size}, but expected 4"
+      end
+    end
+    def l;@struct.l;end
+    def b;@struct.b;end
+    def r;@struct.r;end
+    def t;@struct.t;end
+
+    def l=(new_l);@struct.l=new_l;end
+    def b=(new_b);@struct.b=new_b;end
+    def r=(new_r);@struct.r=new_r;end
+    def t=(new_t);@struct.t=new_t;end
+
+    def intersect?(other_bb)
+      b = CP.cpBBintersects(@struct,other_bb.struct)
+      b == 0 ? false : true
+    end
+
+    def contains_bb?(other_bb)
+      b = CP.cpBBcontainsBB(@struct,other_bb.struct)
+      b == 0 ? false : true
+    end
+
+    def contains_vect?(other_bb)
+      b = CP.cpBBcontainsVect(@struct,other_bb.struct)
+      b == 0 ? false : true
+    end
+
+    def clamp_vect(v)
+      v_struct = CP.cpBBClampVect(@struct,v.struct)
+      Vec2.new v_struct
+    end
+
+    def wrap_vect(v)
+      v_struct = CP.cpBBWrapVect(@struct,v.struct)
+      Vec2.new v_struct
+    end
+
+    def to_s
+      "#<CP::BB:(% .3f, % .3f) -> (% .3f, % .3f)>" % [l,b,r,t]
+    end
+  end
+
+end
+

data/lib/chipmunk-ffi/body.rb

@@ -0,0 +1,171 @@
+module CP
+
+  callback :cpBodyVelocityFunc, [:pointer, Vect.by_value, CP_FLOAT, CP_FLOAT], :void
+  callback :cpBodyPostitionFunc, [: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,
+      :m, CP_FLOAT,
+      :m_inv, CP_FLOAT,
+      :i, CP_FLOAT,
+      :i_inv, CP_FLOAT,
+      :p, Vect,
+      :v, Vect,
+      :f, Vect,
+      :a, CP_FLOAT,
+      :w, CP_FLOAT,
+      :t, CP_FLOAT,
+      :rot, Vect,
+      :data, :pointer,
+      :v_bias, Vect,
+      :w_bias, CP_FLOAT
+    )
+
+    def self.release(me)
+      # TODO is this right?
+      CP.cpBodyDestroy me
+    end
+  end
+  func :cpBodyNew, [CP_FLOAT, CP_FLOAT], BodyStruct
+  func :cpBodyDestroy, [BodyStruct], :void
+  func :cpBodyUpdateVelocity, [BodyStruct,Vect.by_value,CP_FLOAT,CP_FLOAT], :void
+  func :cpBodyUpdatePosition, [BodyStruct,CP_FLOAT], :void
+  func :cpBodyApplyForce, [:pointer, Vect.by_value, Vect.by_value], :void
+  func :cpBodyResetForces, [:pointer], :void
+
+  cp_static_inline :cpBodyLocal2World, [:pointer, Vect.by_value], Vect.by_value
+  cp_static_inline :cpBodyWorld2Local, [:pointer, Vect.by_value], Vect.by_value
+  cp_static_inline :cpBodyApplyImpulse, [:pointer, Vect.by_value, Vect.by_value], :void
+
+  class Body
+    attr_reader :struct
+    def initialize(*args)
+      case args.size
+      when 1
+        @struct = args.first
+      when 2
+        ptr = CP.cpBodyNew(*args)
+        @struct = BodyStruct.new ptr
+      else
+        raise "wrong number of args for Body, got #{args.size}, but expected 2"
+      end
+    end
+
+    def m
+      @struct.m
+    end
+    def m=(pm)
+      @struct.m = pm
+    end
+    alias :mass :m
+    alias :mass= :m=
+
+    def i
+      @struct.i
+    end
+    def i=(pi)
+      @struct.i = pi
+    end
+    alias :moment :i
+    alias :moment= :i=
+
+    def p
+      Vec2.new @struct.p
+    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
+    alias :pos= :p=
+
+    def v
+      Vec2.new @struct.v
+    end
+    def v=(pv)
+      @struct.v = pv.struct
+      @struct.v.pointer.put_bytes 0, pv.struct.to_bytes, 0,Vect.size
+      self
+    end
+    alias :vel :v
+    alias :vel= :v=
+
+    def f
+      Vec2.new @struct.f
+    end
+    def f=(pf)
+      @struct.f.pointer.put_bytes 0, pf.struct.to_bytes, 0,Vect.size
+      @struct.f = pf.struct
+      self
+    end
+    alias :force :f
+    alias :force= :f=
+
+    def a
+      @struct.a
+    end
+    def a=(pa)
+      @struct.a = pa
+    end
+    alias :angle :a
+    alias :angle= :a=
+
+    def w
+      @struct.w
+    end
+    def w=(pw)
+      @struct.w = pw
+    end
+    alias :ang_vel :w
+    alias :ang_vel= :w=
+
+    def t
+      @struct.t
+    end
+    def t=(pt)
+      @struct.t = pt
+    end
+    alias :torque :t
+    alias :torque= :t=
+
+    def rot
+      Vec2.new @struct.rot
+    end
+
+    def local2world(v)
+      CP.cpBodyLocal2World(@struct.pointer,v.struct)
+    end
+
+    def world2local(v)
+      CP.cpBodyWorld2Local(@struct.pointer,v.struct)
+    end
+
+    def reset_forces
+      CP.cpBodyResetForces(@struct.pointer)
+    end
+
+    def apply_force(f,r)
+      CP.cpBodyApplyForce(@struct.pointer,f.struct,r.struct)
+    end
+
+    def apply_impulse(j,r)
+      CP.cpBodyApplyImpulse(@struct.pointer,j.struct,r.struct)
+    end
+
+    def update_velocity(g,dmp,dt)
+      CP.cpBodyUpdateVelocity(@struct.pointer,g,dmp,dt)
+    end
+
+    def update_position(dt)
+      CP.cpBodyUpdatePosition(@struct.pointer,dt)
+    end
+
+  end
+end