chipmunk-ffi 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/chipmunk-ffi.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chipmunk-ffi}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shawn Anderson"]

data/lib/chipmunk-ffi/body.rb

@@ -87,7 +87,6 @@ module CP
       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
@@ -99,7 +98,6 @@ module CP
     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

data/lib/chipmunk-ffi/space.rb

@@ -122,27 +122,35 @@ module CP
 
     def add_collision_func(a,b,&block)
       beg = 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
+      pre = nil
+      unless block.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
+      else
+        # needed for old chipmunk style 
+        pre = Proc.new do |arb_ptr,space_ptr,data_ptr|
           0
         end
       end

data/spec/body_spec.rb

@@ -17,12 +17,21 @@ describe 'A new Body' do
     b.p.y.should == 0
 
     b.pos = vec2(4,6)
-#    b.pos.x.should == 4
-#    b.pos.y.should == 6
+    b.pos.x.should == 4
+    b.pos.y.should == 6
+  end
+
+  it 'can set its vel' do
+    b = CP::Body.new(5, 7)
+    b.p.x.should == 0
+    b.p.y.should == 0
+
+    b.v = vec2(4,6)
+    b.v.x.should == 4
+    b.v.y.should == 6
   end
 
   it 'can set its moment'
-  it 'can set its vel'
   it 'can set its force'
   it 'can set its angle'
   it 'can set its angle_vel'

data/spec/shape_spec.rb

@@ -72,7 +72,14 @@ describe 'ShapeStruct in chipmunk' do
       s = CP::Shape::Circle.new bod, 40, CP::ZERO_VEC_2
       ShapeClassStruct.new(s.struct.klass).type.should == :circle_shape
     end
+
+    it 'can set its bodys v' do
+      bod = CP::Body.new 90, 76
+      s = CP::Shape::Circle.new bod, 20, CP::ZERO_VEC_2
+      s.body.v = vec2(4,5)
+    end
   end
+
   describe 'Segment class' do
     it 'can be created' do
       bod = CP::Body.new 90, 76

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chipmunk-ffi
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Shawn Anderson