chipmunk 4.1.0 → 5.2.0

data/ext/chipmunk/rb_cpSpace.c

@@ -1,330 +1,544 @@
-/* Copyright (c) 2007 Scott Lembcke
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
- 
-#include "chipmunk.h"
-
-#include "ruby.h"
-#include "rb_chipmunk.h"
-
-ID id_call;
-
-
-VALUE c_cpSpace;
-
-static VALUE
-rb_cpSpaceAlloc(VALUE klass)
-{
-	cpSpace *space = cpSpaceAlloc();
-	return Data_Wrap_Struct(klass, NULL, cpSpaceFree, space);
-}
-
-static VALUE
-rb_cpSpaceInitialize(VALUE self)
-{
-	cpSpace *space = SPACE(self);
-	cpSpaceInit(space);
-	
-	// These might as well be in one shared hash.
-	rb_iv_set(self, "static_shapes", rb_ary_new());
-	rb_iv_set(self, "active_shapes", rb_ary_new());
-	rb_iv_set(self, "bodies", rb_ary_new());
-	rb_iv_set(self, "joints", rb_ary_new());
-	rb_iv_set(self, "blocks", rb_hash_new());
-
-	return self;
-}
-
-static VALUE
-rb_cpSpaceGetIterations(VALUE self)
-{
-	return INT2NUM(SPACE(self)->iterations);
-}
-
-static VALUE
-rb_cpSpaceSetIterations(VALUE self, VALUE val)
-{
-	SPACE(self)->iterations = NUM2INT(val);
-	return val;
-}
-
-static VALUE
-rb_cpSpaceGetElasticIterations(VALUE self)
-{
-	return INT2NUM(SPACE(self)->elasticIterations);
-}
-
-static VALUE
-rb_cpSpaceSetElasticIterations(VALUE self, VALUE val)
-{
-	SPACE(self)->elasticIterations = NUM2INT(val);
-	return val;
-}
-
-static VALUE
-rb_cpSpaceGetDamping(VALUE self)
-{
-	return rb_float_new(SPACE(self)->damping);
-}
-
-static VALUE
-rb_cpSpaceSetDamping(VALUE self, VALUE val)
-{
-	SPACE(self)->damping = NUM2DBL(val);
-	return val;
-}
-
-static VALUE
-rb_cpSpaceGetGravity(VALUE self)
-{
-	return VWRAP(self, &SPACE(self)->gravity);
-}
-
-static VALUE
-rb_cpSpaceSetGravity(VALUE self, VALUE val)
-{
-	SPACE(self)->gravity = *VGET(val);
-	return val;
-}
-
-static int
-collisionCallback(cpShape *a, cpShape *b, cpContact *contacts, int numContacts, cpFloat normal_coef, void *data)
-{
-	VALUE block = (VALUE)data;
-	VALUE shapea = (VALUE)a->data;
-	VALUE shapeb = (VALUE)b->data;
-	
-	return rb_funcall(block, id_call, 2, shapea, shapeb);
-}
-
-static VALUE
-rb_cpSpaceAddCollisionFunc(int argc, VALUE *argv, VALUE self)
-{
-	VALUE a, b, block;
-	rb_scan_args(argc, argv, "20&", &a, &b, &block);
-
-	VALUE id_a = rb_obj_id(a);
-	VALUE id_b = rb_obj_id(b);
-	if(NIL_P(block)) {
-		cpSpaceAddCollisionPairFunc(SPACE(self), NUM2UINT(id_a), NUM2UINT(id_b),
-								    NULL, NULL);
-	} else {
-		cpSpaceAddCollisionPairFunc(SPACE(self), NUM2UINT(id_a), NUM2UINT(id_b),
-									collisionCallback, (void *)block);
-	}
-	
-	VALUE blocks = rb_iv_get(self, "blocks");
-	rb_hash_aset(blocks, rb_ary_new3(2, id_a, id_b), block);
-	
-	return Qnil;
-}
-
-static VALUE
-rb_cpSpaceRemoveCollisionFunc(VALUE self, VALUE a, VALUE b)
-{
-	VALUE id_a = rb_obj_id(a);
-	VALUE id_b = rb_obj_id(b);
-	cpSpaceRemoveCollisionPairFunc(SPACE(self), NUM2UINT(id_a), NUM2UINT(id_b));
-	
-	VALUE blocks = rb_iv_get(self, "blocks");
-	rb_hash_delete(blocks, rb_ary_new3(2, id_a, id_b));
-	
-	return Qnil;
-}
-
-static VALUE
-rb_cpSpaceSetDefaultCollisionFunc(int argc, VALUE *argv, VALUE self)
-{
-	VALUE block;
-	rb_scan_args(argc, argv, "00&", &block);
-	
-	if(NIL_P(block)) {
-		cpSpaceSetDefaultCollisionPairFunc(SPACE(self), NULL, NULL);
-	} else {
-		cpSpaceSetDefaultCollisionPairFunc(SPACE(self), collisionCallback, (void *)block);
-	}
-		
-	rb_hash_aset(rb_iv_get(self, "blocks"), ID2SYM(rb_intern("default")), block);
-	
-	return Qnil;
-}
-
-static VALUE
-rb_cpSpaceAddShape(VALUE self, VALUE shape)
-{
-	cpSpaceAddShape(SPACE(self), SHAPE(shape));
-	rb_ary_push(rb_iv_get(self, "active_shapes"), shape);
-	return shape;
-}
-
-static VALUE
-rb_cpSpaceAddStaticShape(VALUE self, VALUE shape)
-{
-	cpSpaceAddStaticShape(SPACE(self), SHAPE(shape));
-	rb_ary_push(rb_iv_get(self, "static_shapes"), shape);
-	return shape;
-}
-
-static VALUE
-rb_cpSpaceAddBody(VALUE self, VALUE body)
-{
-	cpSpaceAddBody(SPACE(self), BODY(body));
-	rb_ary_push(rb_iv_get(self, "bodies"), body);
-	return body;
-}
-
-static VALUE
-rb_cpSpaceAddJoint(VALUE self, VALUE joint)
-{
-	cpSpaceAddJoint(SPACE(self), JOINT(joint));
-	rb_ary_push(rb_iv_get(self, "joints"), joint);
-	return joint;
-}
-
-static VALUE
-rb_cpSpaceRemoveShape(VALUE self, VALUE shape)
-{
-	cpSpaceRemoveShape(SPACE(self), SHAPE(shape));
-	return rb_ary_delete(rb_iv_get(self, "active_shapes"), shape);
-}
-
-static VALUE
-rb_cpSpaceRemoveStaticShape(VALUE self, VALUE shape)
-{
-	cpSpaceRemoveStaticShape(SPACE(self), SHAPE(shape));
-	return rb_ary_delete(rb_iv_get(self, "static_shapes"), shape);
-}
-
-static VALUE
-rb_cpSpaceRemoveBody(VALUE self, VALUE body)
-{
-	cpSpaceRemoveBody(SPACE(self), BODY(body));
-	return rb_ary_delete(rb_iv_get(self, "bodies"), body);
-}
-
-static VALUE
-rb_cpSpaceRemoveJoint(VALUE self, VALUE joint)
-{
-	cpSpaceRemoveJoint(SPACE(self), JOINT(joint));
-	return rb_ary_delete(rb_iv_get(self, "joints"), joint);
-}
-
-static VALUE
-rb_cpSpaceResizeStaticHash(VALUE self, VALUE dim, VALUE count)
-{
-	cpSpaceResizeStaticHash(SPACE(self), NUM2DBL(dim), NUM2INT(count));
-	return Qnil;
-}
-
-static VALUE
-rb_cpSpaceResizeActiveHash(VALUE self, VALUE dim, VALUE count)
-{
-	cpSpaceResizeActiveHash(SPACE(self), NUM2DBL(dim), NUM2INT(count));
-	return Qnil;
-}
-
-static VALUE
-rb_cpSpaceRehashStatic(VALUE self)
-{
-	cpSpaceRehashStatic(SPACE(self));
-	return Qnil;
-}
-
-static void
-pointQueryHelper(cpShape *shape, void *block)
-{
-	rb_funcall((VALUE)block, id_call, 1, (VALUE)shape->data);
-}
-
-static VALUE
-rb_cpSpaceShapePointQuery(int argc, VALUE *argv, VALUE self)
-{
-	VALUE point, block;
-	rb_scan_args(argc, argv, "10&", &point, &block);
-	
-	cpSpaceShapePointQuery(SPACE(self), *VGET(point), pointQueryHelper, (void *)block);
-	
-	return Qnil;
-}
-
-static VALUE
-rb_cpSpaceStaticShapePointQuery(int argc, VALUE *argv, VALUE self)
-{
-	VALUE point, block;
-	rb_scan_args(argc, argv, "10&", &point, &block);
-	
-	cpSpaceStaticShapePointQuery(SPACE(self), *VGET(point), pointQueryHelper, (void *)block);
-	
-	return Qnil;
-}
-
-static VALUE
-rb_cpSpaceStep(VALUE self, VALUE dt)
-{
-	cpSpaceStep(SPACE(self), NUM2DBL(dt));
-	return Qnil;
-}
-
-
-
-void
-Init_cpSpace(void)
-{
-	id_call = rb_intern("call");
-	
-	c_cpSpace = rb_define_class_under(m_Chipmunk, "Space", rb_cObject);
-	rb_define_alloc_func(c_cpSpace, rb_cpSpaceAlloc);
-	rb_define_method(c_cpSpace, "initialize", rb_cpSpaceInitialize, 0);
-	
-	rb_define_method(c_cpSpace, "iterations", rb_cpSpaceGetIterations, 0);
-	rb_define_method(c_cpSpace, "iterations=", rb_cpSpaceSetIterations, 1);
-	
-	rb_define_method(c_cpSpace, "elastic_iterations", rb_cpSpaceGetElasticIterations, 0);
-	rb_define_method(c_cpSpace, "elastic_iterations=", rb_cpSpaceSetElasticIterations, 1);
-	
-	rb_define_method(c_cpSpace, "damping", rb_cpSpaceGetDamping, 0);
-	rb_define_method(c_cpSpace, "damping=", rb_cpSpaceSetDamping, 1);
-	
-	rb_define_method(c_cpSpace, "gravity", rb_cpSpaceGetGravity, 0);
-	rb_define_method(c_cpSpace, "gravity=", rb_cpSpaceSetGravity, 1);
-
-	rb_define_method(c_cpSpace, "add_collision_func", rb_cpSpaceAddCollisionFunc, -1);
-	rb_define_method(c_cpSpace, "remove_collision_func", rb_cpSpaceRemoveCollisionFunc, 2);
-	rb_define_method(c_cpSpace, "set_default_collision_func", rb_cpSpaceSetDefaultCollisionFunc, -1);
-	
-	rb_define_method(c_cpSpace, "add_shape", rb_cpSpaceAddShape, 1);
-	rb_define_method(c_cpSpace, "add_static_shape", rb_cpSpaceAddStaticShape, 1);
-	rb_define_method(c_cpSpace, "add_body", rb_cpSpaceAddBody, 1);
-	rb_define_method(c_cpSpace, "add_joint", rb_cpSpaceAddJoint, 1);
-	
-	rb_define_method(c_cpSpace, "remove_shape", rb_cpSpaceRemoveShape, 1);
-	rb_define_method(c_cpSpace, "remove_static_shape", rb_cpSpaceRemoveStaticShape, 1);
-	rb_define_method(c_cpSpace, "remove_body", rb_cpSpaceRemoveBody, 1);
-	rb_define_method(c_cpSpace, "remove_joint", rb_cpSpaceRemoveJoint, 1);
-	
-	rb_define_method(c_cpSpace, "resize_static_hash", rb_cpSpaceResizeStaticHash, 2);
-	rb_define_method(c_cpSpace, "resize_active_hash", rb_cpSpaceResizeActiveHash, 2);
-	rb_define_method(c_cpSpace, "rehash_static", rb_cpSpaceRehashStatic, 0);
-	
-	rb_define_method(c_cpSpace, "shape_point_query", rb_cpSpaceShapePointQuery, -1);
-	rb_define_method(c_cpSpace, "static_shape_point_query", rb_cpSpaceStaticShapePointQuery, -1);
-	
-	rb_define_method(c_cpSpace, "step", rb_cpSpaceStep, 1);
-}
+/* Copyright (c) 2007 Scott Lembcke
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+ 
+#include <stdlib.h>
+#include "chipmunk.h"
+
+#include "ruby.h"
+#include "rb_chipmunk.h"
+
+static ID id_call;
+static ID id_begin;
+static ID id_pre_solve;
+static ID id_post_solve;
+static ID id_separate;
+
+
+VALUE c_cpSpace;
+
+static VALUE
+rb_cpSpaceAlloc(VALUE klass)
+{
+	cpSpace *space = cpSpaceAlloc();
+	return Data_Wrap_Struct(klass, NULL, cpSpaceFree, space);
+}
+
+static VALUE
+rb_cpSpaceInitialize(VALUE self)
+{
+	cpSpace *space = SPACE(self);
+	cpSpaceInit(space);
+	
+	// These might as well be in one shared hash.
+	rb_iv_set(self, "static_shapes", rb_ary_new());
+	rb_iv_set(self, "active_shapes", rb_ary_new());
+	rb_iv_set(self, "bodies", rb_ary_new());
+	rb_iv_set(self, "constraints", rb_ary_new());
+	rb_iv_set(self, "blocks", rb_hash_new());
+
+	return self;
+}
+
+static VALUE
+rb_cpSpaceGetIterations(VALUE self)
+{
+	return INT2NUM(SPACE(self)->iterations);
+}
+
+static VALUE
+rb_cpSpaceSetIterations(VALUE self, VALUE val)
+{
+	SPACE(self)->iterations = NUM2INT(val);
+	return val;
+}
+
+static VALUE
+rb_cpSpaceGetElasticIterations(VALUE self)
+{
+	return INT2NUM(SPACE(self)->elasticIterations);
+}
+
+static VALUE
+rb_cpSpaceSetElasticIterations(VALUE self, VALUE val)
+{
+	SPACE(self)->elasticIterations = NUM2INT(val);
+	return val;
+}
+
+static VALUE
+rb_cpSpaceGetDamping(VALUE self)
+{
+	return rb_float_new(SPACE(self)->damping);
+}
+
+static VALUE
+rb_cpSpaceSetDamping(VALUE self, VALUE val)
+{
+	SPACE(self)->damping = NUM2DBL(val);
+	return val;
+}
+
+static VALUE
+rb_cpSpaceGetGravity(VALUE self)
+{
+	return VWRAP(self, &SPACE(self)->gravity);
+}
+
+static VALUE
+rb_cpSpaceSetGravity(VALUE self, VALUE val)
+{
+	SPACE(self)->gravity = *VGET(val);
+	return val;
+}
+
+#define respondsTo(obj, id) rb_respond_to(obj, id)
+
+static int
+isBlock(VALUE obj)
+{
+	return rb_respond_to(obj, id_call);
+}
+
+static VALUE 
+callbackToMethod(VALUE obj, ID func) {
+  return rb_funcall(obj, rb_intern("method"), 1, ID2SYM(func));  
+} 
+
+static VALUE 
+callbackArity(VALUE callback) {
+  return rb_funcall(callback, rb_intern("arity"), 0, 0);  
+} 
+
+static int
+doNothingCallback(cpArbiter *arb, cpSpace *space, void *data)
+{
+	return 0;
+}
+
+/* This callback can also pass arbiters... */
+static int 
+genericCallback(cpArbiter *arb, cpSpace * space, 
+  void * data, ID func) 
+{  
+  int arity = 3;
+  /* int arity = rb_obj_method_arity((VALUE) data, func); */
+  /* XXX: this doesn't work. */
+  VALUE arbiter   = Qnil;
+  cpShape *a      = NULL;
+  cpShape *b      = NULL;
+  VALUE proc      = Qnil;
+  VALUE block     = (VALUE) data;
+  VALUE result;
+  
+  if(isBlock(block)) { 
+    proc          = block;      
+  } else  {    
+    proc          = callbackToMethod((VALUE) data, func);  
+  }
+  
+  arity           = NUM2INT(callbackArity(proc));
+  
+  switch (arity) { 
+    case -1:
+      result  = rb_funcall(proc, id_call, 3, (VALUE)a->data, (VALUE)b->data, arbiter);
+      break;
+    case 0:
+      result  = rb_funcall(proc, id_call, 0);      
+      break;
+    case 1:
+      arbiter = ARBWRAP(arb);
+      result  = rb_funcall(proc, id_call, 1, arbiter);      
+      break;
+    case 2:
+      cpArbiterGetShapes(arb, &a, &b);
+      result  = rb_funcall(proc, id_call, 2, (VALUE)a->data, (VALUE)b->data);
+      break;
+    case 3:
+      cpArbiterGetShapes(arb, &a, &b);
+      arbiter = ARBWRAP(arb);
+      result  = rb_funcall(proc, id_call, 3, (VALUE)a->data, (VALUE)b->data, arbiter);
+      break;
+    default: 
+      rb_raise(rb_eArgError, "Arity of callback must be -1, 0, 1, 2, or 3.");
+      break;
+  }
+  return  (RTEST(result) ? 1 : 0); 
+    
+} 
+
+static int
+compatibilityCallback(cpArbiter *arb, cpSpace *space, void *data)
+{
+	/*CP_ARBITER_GET_SHAPES(arb, a, b);
+	return rb_funcall((VALUE)data, id_call, 2, (VALUE)a->data, (VALUE)b->data);
+	*/
+        return genericCallback(arb, space, data, id_call);
+}
+
+static int
+beginCallback(cpArbiter *arb, cpSpace *space, void *data)
+{
+	return genericCallback(arb, space, data, id_begin);
+}
+
+static int
+preSolveCallback(cpArbiter *arb, cpSpace *space, void *data)
+{ 
+        return genericCallback(arb, space, data, id_pre_solve);
+}
+
+static void
+postSolveCallback(cpArbiter *arb, cpSpace *space, void *data)
+{
+        genericCallback(arb, space, data, id_post_solve);}
+
+static void
+separateCallback(cpArbiter *arb, cpSpace *space, void *data)
+{
+        genericCallback(arb, space, data, id_separate);
+}
+
+
+static VALUE
+rb_cpSpaceAddCollisionHandler(int argc, VALUE *argv, VALUE self)
+{
+	VALUE a, b, obj, block;
+	obj = 0;
+	rb_scan_args(argc, argv, "21&", &a, &b, &obj, &block);
+
+	VALUE id_a   = rb_obj_id(a);
+	VALUE id_b   = rb_obj_id(b);
+	VALUE blocks = rb_iv_get(self, "blocks");
+	
+	if(RTEST(obj) && RTEST(block)){
+		rb_raise(rb_eArgError, "Cannot specify both a handler object and a block.");
+	} else if(RTEST(block)){
+		cpSpaceAddCollisionHandler(
+			SPACE(self), NUM2UINT(id_a), NUM2UINT(id_b),
+			NULL,
+			compatibilityCallback,
+			NULL,
+			NULL,
+			(void *)block
+		);
+		
+		rb_hash_aset(blocks, rb_ary_new3(2, id_a, id_b), block);
+	} else if(RTEST(obj)) {
+		// Do we need to make it pass arbiters??? FFI bindings also don't bother.
+		cpSpaceAddCollisionHandler(
+			SPACE(self), NUM2UINT(id_a), NUM2UINT(id_b),
+			(respondsTo(obj, id_begin)      ? beginCallback     : NULL),
+			(respondsTo(obj, id_pre_solve)  ? preSolveCallback  : NULL),
+			(respondsTo(obj, id_post_solve) ? postSolveCallback : NULL),
+			(respondsTo(obj, id_separate)   ? separateCallback  : NULL),
+			(void *)obj
+		);		
+		rb_hash_aset(blocks, rb_ary_new3(2, id_a, id_b), obj);
+	} else {
+		cpSpaceAddCollisionHandler(
+			SPACE(self), NUM2UINT(id_a), NUM2UINT(id_b),
+			NULL, doNothingCallback, NULL, NULL, NULL
+		);
+	}
+		
+	return Qnil;
+}
+
+static VALUE
+rb_cpSpaceRemoveCollisionHandler(VALUE self, VALUE a, VALUE b)
+{
+	VALUE id_a = rb_obj_id(a);
+	VALUE id_b = rb_obj_id(b);
+	cpSpaceRemoveCollisionHandler(SPACE(self), NUM2UINT(id_a), NUM2UINT(id_b));
+	
+	VALUE blocks = rb_iv_get(self, "blocks");
+	rb_hash_delete(blocks, rb_ary_new3(2, id_a, id_b));
+	
+	return Qnil;
+}
+
+static VALUE
+rb_cpSpaceSetDefaultCollisionHandler(int argc, VALUE *argv, VALUE self)
+{
+	VALUE obj, block; 
+	rb_scan_args(argc, argv, "01&", &obj, &block);
+  
+	if(RTEST(obj) && RTEST(block)){
+		rb_raise(rb_eArgError, "Cannot specify both a handler object and a block.");
+	} else if(RTEST(block)){
+		// Do we need need to make it pass arbiters? FFI bindings don't do it.
+		cpSpaceSetDefaultCollisionHandler(
+			SPACE(self),
+			NULL,
+			compatibilityCallback,
+			NULL,
+			NULL,
+			(void *)block
+		);
+    		
+		rb_hash_aset(rb_iv_get(self, "blocks"), ID2SYM(rb_intern("default")), block);
+	} else if(RTEST(obj)) {
+		cpSpaceSetDefaultCollisionHandler(
+			SPACE(self),   
+			(respondsTo(obj, id_begin)      ? beginCallback     : NULL),
+			(respondsTo(obj, id_pre_solve)  ? preSolveCallback  : NULL),
+			(respondsTo(obj, id_post_solve) ? postSolveCallback : NULL),
+			(respondsTo(obj, id_separate)   ? separateCallback  : NULL),
+			(void *)obj
+		);
+		
+		rb_hash_aset(rb_iv_get(self, "blocks"), ID2SYM(rb_intern("default")), obj);
+	} else {
+		cpSpaceSetDefaultCollisionHandler(
+			SPACE(self), NULL, doNothingCallback, NULL, NULL, NULL
+		);    
+	}
+	
+	return Qnil;
+}
+
+static VALUE
+rb_cpSpaceAddShape(VALUE self, VALUE shape)
+{
+	cpSpaceAddShape(SPACE(self), SHAPE(shape));
+	rb_ary_push(rb_iv_get(self, "active_shapes"), shape);
+	return shape;
+}
+
+static VALUE
+rb_cpSpaceAddStaticShape(VALUE self, VALUE shape)
+{
+	cpSpaceAddStaticShape(SPACE(self), SHAPE(shape));
+	rb_ary_push(rb_iv_get(self, "static_shapes"), shape);
+	return shape;
+}
+
+static VALUE
+rb_cpSpaceAddBody(VALUE self, VALUE body)
+{
+	cpSpaceAddBody(SPACE(self), BODY(body));
+	rb_ary_push(rb_iv_get(self, "bodies"), body);
+	return body;
+}
+
+static VALUE
+rb_cpSpaceAddConstraint(VALUE self, VALUE constraint)
+{
+	cpSpaceAddConstraint(SPACE(self), CONSTRAINT(constraint));
+	rb_ary_push(rb_iv_get(self, "constraints"), constraint);
+	return constraint;
+}
+
+static VALUE
+rb_cpSpaceRemoveShape(VALUE self, VALUE shape)
+{
+	cpSpaceRemoveShape(SPACE(self), SHAPE(shape));
+	return rb_ary_delete(rb_iv_get(self, "active_shapes"), shape);
+}
+
+static VALUE
+rb_cpSpaceRemoveStaticShape(VALUE self, VALUE shape)
+{
+	cpSpaceRemoveStaticShape(SPACE(self), SHAPE(shape));
+	return rb_ary_delete(rb_iv_get(self, "static_shapes"), shape);
+}
+
+static VALUE
+rb_cpSpaceRemoveBody(VALUE self, VALUE body)
+{
+	cpSpaceRemoveBody(SPACE(self), BODY(body));
+	return rb_ary_delete(rb_iv_get(self, "bodies"), body);
+}
+
+static VALUE
+rb_cpSpaceRemoveConstraint(VALUE self, VALUE constraint)
+{
+	cpSpaceRemoveConstraint(SPACE(self), CONSTRAINT(constraint));
+	return rb_ary_delete(rb_iv_get(self, "constraints"), constraint);
+}
+
+static VALUE
+rb_cpSpaceResizeStaticHash(VALUE self, VALUE dim, VALUE count)
+{
+	cpSpaceResizeStaticHash(SPACE(self), NUM2DBL(dim), NUM2INT(count));
+	return Qnil;
+}
+
+static VALUE
+rb_cpSpaceResizeActiveHash(VALUE self, VALUE dim, VALUE count)
+{
+	cpSpaceResizeActiveHash(SPACE(self), NUM2DBL(dim), NUM2INT(count));
+	return Qnil;
+}
+
+static VALUE
+rb_cpSpaceRehashStatic(VALUE self)
+{
+	cpSpaceRehashStatic(SPACE(self));
+	return Qnil;
+}
+
+static void
+pointQueryCallback(cpShape *shape, VALUE block)
+{
+	rb_funcall(block, id_call, 1, (VALUE)shape->data);
+}
+
+static VALUE
+rb_cpSpacePointQuery(int argc, VALUE *argv, VALUE self)
+{
+	VALUE point, layers, group, block;
+	rb_scan_args(argc, argv, "12&", &point, &layers, &group, &block);
+	
+	cpSpacePointQuery(
+		SPACE(self), *VGET(point),
+		(NIL_P(layers) ? ~0 : NUM2UINT(layers)),
+		(NIL_P(group) ? 0 : NUM2UINT(rb_obj_id(group))),
+		(cpSpacePointQueryFunc)pointQueryCallback, (void *)block
+	);
+	
+	return Qnil;
+}
+
+static VALUE
+rb_cpSpacePointQueryFirst(int argc, VALUE *argv, VALUE self)
+{
+	VALUE point, layers, group;
+	rb_scan_args(argc, argv, "12", &point, &layers, &group);
+	
+	cpShape *shape = cpSpacePointQueryFirst(
+		SPACE(self), *VGET(point),
+		(NIL_P(layers) ? ~0 : NUM2UINT(layers)),
+		(NIL_P(group) ? 0 : NUM2UINT(rb_obj_id(group)))
+	);
+	
+	return (shape ? (VALUE)shape->data : Qnil);
+}
+
+static void
+segmentQueryCallback(cpShape *shape, cpFloat t, cpVect n, VALUE block)
+{
+	rb_funcall(block, id_call, 1, (VALUE)shape->data, rb_float_new(t), VNEW(n));
+}
+
+static VALUE
+rb_cpSpaceSegmentQuery(int argc, VALUE *argv, VALUE self)
+{
+	VALUE a, b, layers, group, block;
+	rb_scan_args(argc, argv, "22&", &a, &b, &layers, &group, &block);
+	
+	cpSpaceSegmentQuery(
+		SPACE(self), *VGET(a), *VGET(b),
+		(NIL_P(layers) ? ~0 : NUM2UINT(layers)),
+		(NIL_P(group) ? 0 : NUM2UINT(rb_obj_id(group))),
+		(cpSpaceSegmentQueryFunc)segmentQueryCallback, (void *)block
+	);
+	
+	return Qnil;
+}
+
+static VALUE
+rb_cpSpaceSegmentQueryFirst(int argc, VALUE *argv, VALUE self)
+{
+	VALUE a, b, layers, group, block;
+	rb_scan_args(argc, argv, "22&", &a, &b, &layers, &group, &block);
+	
+	cpSegmentQueryInfo info = {NULL, 1.0f, cpvzero};
+	
+	cpSpaceSegmentQueryFirst(
+		SPACE(self), *VGET(a), *VGET(b),
+		(NIL_P(layers) ? ~0 : NUM2UINT(layers)),
+		(NIL_P(group) ? 0 : NUM2UINT(rb_obj_id(group))),
+		&info
+	);
+	
+	if(info.shape){
+		return rb_ary_new3(3, (VALUE)info.shape->data, rb_float_new(info.t), VNEW(info.n));
+	} else {
+		return Qnil;
+	}
+}
+
+static VALUE
+rb_cpSpaceStep(VALUE self, VALUE dt)
+{
+	cpSpaceStep(SPACE(self), NUM2DBL(dt));
+	return Qnil;
+}
+
+
+
+void
+Init_cpSpace(void)
+{
+	id_call        = rb_intern("call");
+	id_begin       = rb_intern("begin");
+	id_pre_solve   = rb_intern("pre_solve");
+	id_post_solve  = rb_intern("post_solve");
+	id_separate    = rb_intern("separate");
+	
+	c_cpSpace = rb_define_class_under(m_Chipmunk, "Space", rb_cObject);
+	rb_define_alloc_func(c_cpSpace, rb_cpSpaceAlloc);
+	rb_define_method(c_cpSpace, "initialize", rb_cpSpaceInitialize, 0);
+	
+	rb_define_method(c_cpSpace, "iterations", rb_cpSpaceGetIterations, 0);
+	rb_define_method(c_cpSpace, "iterations=", rb_cpSpaceSetIterations, 1);
+	
+	rb_define_method(c_cpSpace, "elastic_iterations", rb_cpSpaceGetElasticIterations, 0);
+	rb_define_method(c_cpSpace, "elastic_iterations=", rb_cpSpaceSetElasticIterations, 1);
+	
+	rb_define_method(c_cpSpace, "damping", rb_cpSpaceGetDamping, 0);
+	rb_define_method(c_cpSpace, "damping=", rb_cpSpaceSetDamping, 1);
+	
+	rb_define_method(c_cpSpace, "gravity", rb_cpSpaceGetGravity, 0);
+	rb_define_method(c_cpSpace, "gravity=", rb_cpSpaceSetGravity, 1);
+
+	rb_define_method(c_cpSpace, "add_collision_func", rb_cpSpaceAddCollisionHandler, -1);
+	rb_define_method(c_cpSpace, "remove_collision_func", rb_cpSpaceRemoveCollisionHandler, 2);
+	rb_define_method(c_cpSpace, "set_default_collision_func", rb_cpSpaceSetDefaultCollisionHandler, -1);
+	
+	rb_define_method(c_cpSpace, "add_collision_handler", rb_cpSpaceAddCollisionHandler, -1);
+	rb_define_method(c_cpSpace, "remove_collision_handler", rb_cpSpaceRemoveCollisionHandler, 2);
+	rb_define_method(c_cpSpace, "set_default_collision_handler", rb_cpSpaceSetDefaultCollisionHandler, -1);
+	
+	
+	rb_define_method(c_cpSpace, "add_shape", rb_cpSpaceAddShape, 1);
+	rb_define_method(c_cpSpace, "add_static_shape", rb_cpSpaceAddStaticShape, 1);
+	rb_define_method(c_cpSpace, "add_body", rb_cpSpaceAddBody, 1);
+	rb_define_method(c_cpSpace, "add_constraint", rb_cpSpaceAddConstraint, 1);
+	
+	rb_define_method(c_cpSpace, "remove_shape", rb_cpSpaceRemoveShape, 1);
+	rb_define_method(c_cpSpace, "remove_static_shape", rb_cpSpaceRemoveStaticShape, 1);
+	rb_define_method(c_cpSpace, "remove_body", rb_cpSpaceRemoveBody, 1);
+	rb_define_method(c_cpSpace, "remove_constraint", rb_cpSpaceRemoveConstraint, 1);
+	
+	rb_define_method(c_cpSpace, "resize_static_hash", rb_cpSpaceResizeStaticHash, 2);
+	rb_define_method(c_cpSpace, "resize_active_hash", rb_cpSpaceResizeActiveHash, 2);
+	rb_define_method(c_cpSpace, "rehash_static", rb_cpSpaceRehashStatic, 0);
+	
+	rb_define_method(c_cpSpace, "point_query", rb_cpSpacePointQuery, -1);
+	rb_define_method(c_cpSpace, "point_query_first", rb_cpSpacePointQueryFirst, -1);
+	
+	rb_define_method(c_cpSpace, "segment_query", rb_cpSpaceSegmentQuery, -1);
+	rb_define_method(c_cpSpace, "segment_query_first", rb_cpSpaceSegmentQueryFirst, -1);
+	
+	rb_define_method(c_cpSpace, "step", rb_cpSpaceStep, 1);
+}