chipmunk 5.3.4.0 → 5.3.4.2

data/ext/chipmunk/rb_cpBB.c

@@ -1,15 +1,15 @@
 /* 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
@@ -27,137 +27,121 @@
 
 VALUE c_cpBB;
 
-static VALUE BBNEW(cpBB bb) {
+static VALUE
+BBNEW(cpBB bb) {
   cpBB *ptr = malloc(sizeof(cpBB));
   *ptr = bb;
-  return Data_Wrap_Struct(c_cpBB, NULL, free, ptr); 
+  return Data_Wrap_Struct(c_cpBB, NULL, free, ptr);
 }
 
 static VALUE
-rb_cpBBAlloc(VALUE klass)
-{
-	cpBB *bb = malloc(sizeof(cpBB));
-	return Data_Wrap_Struct(klass, NULL, free, bb);
+rb_cpBBAlloc(VALUE klass) {
+  cpBB *bb = calloc(sizeof(cpBB), 1);
+  return Data_Wrap_Struct(klass, NULL, free, bb);
 }
 
 static VALUE
-rb_cpBBInitialize(VALUE self, VALUE l, VALUE b, VALUE r, VALUE t)
-{
-	cpBB *bb = BBGET(self);
-	bb->l = NUM2DBL(l);
-	bb->b = NUM2DBL(b);
-	bb->r = NUM2DBL(r);
-	bb->t = NUM2DBL(t);
-	
-	return self;
+rb_cpBBInitialize(VALUE self, VALUE l, VALUE b, VALUE r, VALUE t) {
+  cpBB *bb = BBGET(self);
+  bb->l = NUM2DBL(l);
+  bb->b = NUM2DBL(b);
+  bb->r = NUM2DBL(r);
+  bb->t = NUM2DBL(t);
+
+  return self;
 }
 
 static VALUE
-rb_cpBBintersects(VALUE self, VALUE other)
-{
-	int value = cpBBintersects(*BBGET(self), *BBGET(other));
-	return value ? Qtrue : Qfalse;
+rb_cpBBintersects(VALUE self, VALUE other) {
+  int value = cpBBintersects(*BBGET(self), *BBGET(other));
+  return value ? Qtrue : Qfalse;
 }
 
 static VALUE
-rb_cpBBcontainsBB(VALUE self, VALUE other)
-{
+rb_cpBBcontainsBB(VALUE self, VALUE other) {
   int value = cpBBcontainsBB(*BBGET(self), *BBGET(other));
   return value ? Qtrue : Qfalse;
 }
 
 static VALUE
-rb_cpBBcontainsVect(VALUE self, VALUE other)
-{
+rb_cpBBcontainsVect(VALUE self, VALUE other) {
   int value = cpBBcontainsVect(*BBGET(self), *VGET(other));
   return value ? Qtrue : Qfalse;
 }
 
 static VALUE
-rb_cpBBcontains(VALUE self, VALUE other)
-{
-  if (rb_class_of(other) == c_cpBB) {  
+rb_cpBBcontains(VALUE self, VALUE other) {
+  if (rb_class_of(other) == c_cpBB) {
     return rb_cpBBcontainsBB(self, other);
   } else if (rb_class_of(other) == c_cpVect) {
     return rb_cpBBcontainsVect(self, other);
-  } 
+  }
   rb_raise(rb_eArgError, "contains works only with a BB or A Vect2 argument");
   return Qnil;
 }
 
 static VALUE
-rb_cpBBClampVect(VALUE self, VALUE v)
-{
-	return VNEW(cpBBClampVect(*BBGET(self), *VGET(v)));
+rb_cpBBClampVect(VALUE self, VALUE v) {
+  return VNEW(cpBBClampVect(*BBGET(self), *VGET(v)));
 }
 
 static VALUE
-rb_cpBBWrapVect(VALUE self, VALUE v)
-{
-	return VNEW(cpBBWrapVect(*BBGET(self), *VGET(v)));
+rb_cpBBWrapVect(VALUE self, VALUE v) {
+  return VNEW(cpBBWrapVect(*BBGET(self), *VGET(v)));
 }
 
 static VALUE
-rb_cpBBGetL(VALUE self)
-{
-	return rb_float_new(BBGET(self)->l);
+rb_cpBBGetL(VALUE self) {
+  return rb_float_new(BBGET(self)->l);
 }
 
 static VALUE
-rb_cpBBGetB(VALUE self)
-{
-	return rb_float_new(BBGET(self)->b);
+rb_cpBBGetB(VALUE self) {
+  return rb_float_new(BBGET(self)->b);
 }
 
 static VALUE
-rb_cpBBGetR(VALUE self)
-{
-	return rb_float_new(BBGET(self)->r);
+rb_cpBBGetR(VALUE self) {
+  return rb_float_new(BBGET(self)->r);
 }
 
 static VALUE
-rb_cpBBGetT(VALUE self)
-{
-	return rb_float_new(BBGET(self)->t);
+rb_cpBBGetT(VALUE self) {
+  return rb_float_new(BBGET(self)->t);
 }
 
 static VALUE
-rb_cpBBSetL(VALUE self, VALUE val)
-{
-	BBGET(self)->l = NUM2DBL(val);
-	return val;
+rb_cpBBSetL(VALUE self, VALUE val) {
+  BBGET(self)->l = NUM2DBL(val);
+  return val;
 }
 
 static VALUE
-rb_cpBBSetB(VALUE self, VALUE val)
-{
-	BBGET(self)->b = NUM2DBL(val);
-	return val;
+rb_cpBBSetB(VALUE self, VALUE val) {
+  BBGET(self)->b = NUM2DBL(val);
+  return val;
 }
 
 static VALUE
-rb_cpBBSetR(VALUE self, VALUE val)
-{
-	BBGET(self)->r = NUM2DBL(val);
-	return val;
+rb_cpBBSetR(VALUE self, VALUE val) {
+  BBGET(self)->r = NUM2DBL(val);
+  return val;
 }
 
 static VALUE
-rb_cpBBSetT(VALUE self, VALUE val)
-{
-	BBGET(self)->t = NUM2DBL(val);
-	return val;
+rb_cpBBSetT(VALUE self, VALUE val) {
+  BBGET(self)->t = NUM2DBL(val);
+  return val;
 }
 
 static VALUE
-rb_cpBBToString(VALUE self)
-{
-	char str[256];
-	cpBB *bb = BBGET(self);
-	
-	sprintf(str, "#<CP::BB:(% .3f, % .3f) -> (% .3f, % .3f)>", bb->l, bb->b, bb->r, bb->t);
-	
-	return rb_str_new2(str);
+rb_cpBBToString(VALUE self) {
+  char str[256];
+  cpBB *bb = BBGET(self);
+
+  sprintf(str, "#<CP::BB:(% .3f, % .3f) -> (% .3f, % .3f)>", bb->l, bb->b, bb->r, bb->t);
+
+  return rb_str_new2(str);
 }
 
 static VALUE
@@ -172,39 +156,38 @@ rb_cpBBexpand(VALUE self, VALUE other) {
 
 
 void
-Init_cpBB(void)
-{
-	c_cpBB = rb_define_class_under(m_Chipmunk, "BB", rb_cObject);
-	rb_define_alloc_func(c_cpBB, rb_cpBBAlloc);
-	rb_define_method(c_cpBB, "initialize", rb_cpBBInitialize, 4);
-	
-	rb_define_method(c_cpBB, "l", rb_cpBBGetL, 0);
-	rb_define_method(c_cpBB, "b", rb_cpBBGetB, 0);
-	rb_define_method(c_cpBB, "r", rb_cpBBGetR, 0);
-	rb_define_method(c_cpBB, "t", rb_cpBBGetT, 0);
-
-	rb_define_method(c_cpBB, "l=", rb_cpBBSetL, 1);
-	rb_define_method(c_cpBB, "b=", rb_cpBBSetB, 1);
-	rb_define_method(c_cpBB, "r=", rb_cpBBSetR, 1);
-	rb_define_method(c_cpBB, "t=", rb_cpBBSetT, 1);
-
-	rb_define_method(c_cpBB, "intersect?", rb_cpBBintersects, 1);
-  rb_define_method(c_cpBB, "intersects?", rb_cpBBintersects, 1); 
-	//containsBB
-	//containsVect
+Init_cpBB(void) {
+  c_cpBB = rb_define_class_under(m_Chipmunk, "BB", rb_cObject);
+  rb_define_alloc_func(c_cpBB, rb_cpBBAlloc);
+  rb_define_method(c_cpBB, "initialize", rb_cpBBInitialize, 4);
+
+  rb_define_method(c_cpBB, "l", rb_cpBBGetL, 0);
+  rb_define_method(c_cpBB, "b", rb_cpBBGetB, 0);
+  rb_define_method(c_cpBB, "r", rb_cpBBGetR, 0);
+  rb_define_method(c_cpBB, "t", rb_cpBBGetT, 0);
+
+  rb_define_method(c_cpBB, "l=", rb_cpBBSetL, 1);
+  rb_define_method(c_cpBB, "b=", rb_cpBBSetB, 1);
+  rb_define_method(c_cpBB, "r=", rb_cpBBSetR, 1);
+  rb_define_method(c_cpBB, "t=", rb_cpBBSetT, 1);
+
+  rb_define_method(c_cpBB, "intersect?", rb_cpBBintersects, 1);
+  rb_define_method(c_cpBB, "intersects?", rb_cpBBintersects, 1);
+  //containsBB
+  //containsVect
   rb_define_method(c_cpBB, "contains?", rb_cpBBcontains, 1);
   rb_define_method(c_cpBB, "contain?", rb_cpBBcontains, 1);
-   
+
   rb_define_method(c_cpBB, "contains_bb?", rb_cpBBcontainsBB, 1);
   rb_define_method(c_cpBB, "contain_bb?", rb_cpBBcontainsBB, 1);
   rb_define_method(c_cpBB, "contains_vect?", rb_cpBBcontainsVect, 1);
   rb_define_method(c_cpBB, "contain_vect?", rb_cpBBcontainsVect, 1);
-  
-	rb_define_method(c_cpBB, "clamp_vect", rb_cpBBClampVect, 1);
-	rb_define_method(c_cpBB, "wrap_vect" , rb_cpBBWrapVect, 1);
-  rb_define_method(c_cpBB, "merge"     , rb_cpBBmerge, 1);
-  rb_define_method(c_cpBB, "expand"    , rb_cpBBexpand, 1);
-   
-	
-	rb_define_method(c_cpBB, "to_s", rb_cpBBToString, 0);
+
+  rb_define_method(c_cpBB, "clamp_vect", rb_cpBBClampVect, 1);
+  rb_define_method(c_cpBB, "wrap_vect", rb_cpBBWrapVect, 1);
+  rb_define_method(c_cpBB, "merge", rb_cpBBmerge, 1);
+  rb_define_method(c_cpBB, "expand", rb_cpBBexpand, 1);
+
+
+  rb_define_method(c_cpBB, "to_s", rb_cpBBToString, 0);
 }

data/ext/chipmunk/rb_cpBody.c

@@ -1,15 +1,15 @@
 /* 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
@@ -18,7 +18,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include <stdlib.h>
 #include "chipmunk.h"
 
@@ -29,191 +29,164 @@ VALUE c_cpBody;
 VALUE c_cpStaticBody;
 
 static VALUE
-rb_cpBodyAlloc(VALUE klass)
-{
-	cpBody *body = cpBodyNew(1.0f, 1.0f);   
-	return Data_Wrap_Struct(klass, NULL, cpBodyFree, body);
+rb_cpBodyAlloc(VALUE klass) {
+  cpBody *body = cpBodyNew(1.0f, 1.0f);
+  return Data_Wrap_Struct(klass, NULL, cpBodyFree, body);
 }
 
 static VALUE
-rb_cpBodyInitialize(VALUE self, VALUE m, VALUE i)
-{
-	cpBody *body = BODY(self);
-	cpBodyInit(body, NUM2DBL(m), NUM2DBL(i));
-  body->data   = (void *)self; 
-	return self;
+rb_cpBodyInitialize(VALUE self, VALUE m, VALUE i) {
+  cpBody *body = BODY(self);
+  cpBodyInit(body, NUM2DBL(m), NUM2DBL(i));
+  body->data = (void *)self;
+  return self;
 }
 
 static VALUE
-rb_cpBodyAllocStatic(VALUE klass)
-{
+rb_cpBodyAllocStatic(VALUE klass) {
   cpBody *body = cpBodyNewStatic();
   return Data_Wrap_Struct(c_cpStaticBody, NULL, cpBodyFree, body);
 }
 
 static VALUE
-rb_cpBodyInitializeStatic(VALUE self)
-{
+rb_cpBodyInitializeStatic(VALUE self) {
   cpBody *body = STATICBODY(self);
   cpBodyInitStatic(body);
-  body->data   = (void *)self;
+  body->data = (void *)self;
   return self;
 }
 
-static VALUE 
+static VALUE
 rb_cpStaticBodyNew(VALUE klass) {
   return rb_cpBodyInitializeStatic(rb_cpBodyAllocStatic(klass));
 }
 
 
 static VALUE
-rb_cpBodyGetMass(VALUE self)
-{
-	return rb_float_new(BODY(self)->m);
+rb_cpBodyGetMass(VALUE self) {
+  return rb_float_new(BODY(self)->m);
 }
 
 static VALUE
-rb_cpBodyGetMassInv(VALUE self)
-{
+rb_cpBodyGetMassInv(VALUE self) {
   return rb_float_new(BODY(self)->m_inv);
 }
 
 static VALUE
-rb_cpBodyGetMoment(VALUE self)
-{
-	return rb_float_new(BODY(self)->i);
+rb_cpBodyGetMoment(VALUE self) {
+  return rb_float_new(BODY(self)->i);
 }
 
 
 static VALUE
-rb_cpBodyGetMomentInv(VALUE self)
-{
+rb_cpBodyGetMomentInv(VALUE self) {
   return rb_float_new(BODY(self)->i_inv);
 }
 
 static VALUE
-rb_cpBodyGetPos(VALUE self)
-{
-	return VWRAP(self, &BODY(self)->p);
+rb_cpBodyGetPos(VALUE self) {
+  return VWRAP(self, &BODY(self)->p);
 }
 
 static VALUE
-rb_cpBodyGetVel(VALUE self)
-{
-	return VWRAP(self, &BODY(self)->v);
+rb_cpBodyGetVel(VALUE self) {
+  return VWRAP(self, &BODY(self)->v);
 }
 
 static VALUE
-rb_cpBodyGetForce(VALUE self)
-{
-	return VWRAP(self, &BODY(self)->f);
+rb_cpBodyGetForce(VALUE self) {
+  return VWRAP(self, &BODY(self)->f);
 }
 
 static VALUE
-rb_cpBodyGetAngle(VALUE self)
-{
-	return rb_float_new(BODY(self)->a);
+rb_cpBodyGetAngle(VALUE self) {
+  return rb_float_new(BODY(self)->a);
 }
 
 static VALUE
-rb_cpBodyGetAVel(VALUE self)
-{
-	return rb_float_new(BODY(self)->w);
+rb_cpBodyGetAVel(VALUE self) {
+  return rb_float_new(BODY(self)->w);
 }
 
 static VALUE
-rb_cpBodyGetTorque(VALUE self)
-{
-	return rb_float_new(BODY(self)->t);
+rb_cpBodyGetTorque(VALUE self) {
+  return rb_float_new(BODY(self)->t);
 }
 
 static VALUE
-rb_cpBodyGetVLimit(VALUE self)
-{
+rb_cpBodyGetVLimit(VALUE self) {
   return rb_float_new(BODY(self)->v_limit);
 }
 
 static VALUE
-rb_cpBodyGetWLimit(VALUE self)
-{
+rb_cpBodyGetWLimit(VALUE self) {
   return rb_float_new(BODY(self)->w_limit);
 }
 
 
 static VALUE
-rb_cpBodyGetRot(VALUE self)
-{
-	return VWRAP(self, &BODY(self)->rot);
+rb_cpBodyGetRot(VALUE self) {
+  return VWRAP(self, &BODY(self)->rot);
 }
 
 
 static VALUE
-rb_cpBodySetMass(VALUE self, VALUE val)
-{
-	cpBodySetMass(BODY(self), NUM2DBL(val));
-	return val;
+rb_cpBodySetMass(VALUE self, VALUE val) {
+  cpBodySetMass(BODY(self), NUM2DBL(val));
+  return val;
 }
 
 static VALUE
-rb_cpBodySetMoment(VALUE self, VALUE val)
-{
-	cpBodySetMoment(BODY(self), NUM2DBL(val));
-	return val;
+rb_cpBodySetMoment(VALUE self, VALUE val) {
+  cpBodySetMoment(BODY(self), NUM2DBL(val));
+  return val;
 }
 
 static VALUE
-rb_cpBodySetPos(VALUE self, VALUE val)
-{
-	BODY(self)->p = *VGET(val);
-	return val;
+rb_cpBodySetPos(VALUE self, VALUE val) {
+  BODY(self)->p = *VGET(val);
+  return val;
 }
 
 static VALUE
-rb_cpBodySetVel(VALUE self, VALUE val)
-{
-	BODY(self)->v = *VGET(val);
-	return val;
+rb_cpBodySetVel(VALUE self, VALUE val) {
+  BODY(self)->v = *VGET(val);
+  return val;
 }
 
 static VALUE
-rb_cpBodySetForce(VALUE self, VALUE val)
-{
-	BODY(self)->f = *VGET(val);
-	return val;
+rb_cpBodySetForce(VALUE self, VALUE val) {
+  BODY(self)->f = *VGET(val);
+  return val;
 }
 
 static VALUE
-rb_cpBodySetAngle(VALUE self, VALUE val)
-{
-	cpBodySetAngle(BODY(self), NUM2DBL(val));
-	return val;
+rb_cpBodySetAngle(VALUE self, VALUE val) {
+  cpBodySetAngle(BODY(self), NUM2DBL(val));
+  return val;
 }
 
 static VALUE
-rb_cpBodySetAVel(VALUE self, VALUE val)
-{
-	BODY(self)->w = NUM2DBL(val);
-	return val;
+rb_cpBodySetAVel(VALUE self, VALUE val) {
+  BODY(self)->w = NUM2DBL(val);
+  return val;
 }
 
 static VALUE
-rb_cpBodySetTorque(VALUE self, VALUE val)
-{
-	BODY(self)->t = NUM2DBL(val);
-	return val;
+rb_cpBodySetTorque(VALUE self, VALUE val) {
+  BODY(self)->t = NUM2DBL(val);
+  return val;
 }
 
 
 static VALUE
-rb_cpBodySetVLimit(VALUE self, VALUE val)
-{
+rb_cpBodySetVLimit(VALUE self, VALUE val) {
   BODY(self)->v_limit = NUM2DBL(val);
   return val;
 }
 
 static VALUE
-rb_cpBodySetWLimit(VALUE self, VALUE val)
-{
+rb_cpBodySetWLimit(VALUE self, VALUE val) {
   BODY(self)->w_limit = NUM2DBL(val);
   return val;
 }
@@ -221,107 +194,107 @@ rb_cpBodySetWLimit(VALUE self, VALUE val)
 
 
 static VALUE
-rb_cpBodyLocal2World(VALUE self, VALUE v)
-{
-	return VNEW(cpBodyLocal2World(BODY(self), *VGET(v)));
+rb_cpBodyLocal2World(VALUE self, VALUE v) {
+  return VNEW(cpBodyLocal2World(BODY(self), *VGET(v)));
 }
 
 static VALUE
-rb_cpBodyWorld2Local(VALUE self, VALUE v)
-{
-	return VNEW(cpBodyWorld2Local(BODY(self), *VGET(v)));
+rb_cpBodyWorld2Local(VALUE self, VALUE v) {
+  return VNEW(cpBodyWorld2Local(BODY(self), *VGET(v)));
 }
 
 static VALUE
-rb_cpBodyResetForces(VALUE self)
-{
-	cpBodyResetForces(BODY(self));
-	return self;
+rb_cpBodyResetForces(VALUE self) {
+  cpBodyResetForces(BODY(self));
+  return self;
 }
 
 static VALUE
-rb_cpBodyApplyForce(VALUE self, VALUE f, VALUE r)
-{
-	cpBodyApplyForce(BODY(self), *VGET(f), *VGET(r));
-	return self;
+rb_cpBodyApplyForce(VALUE self, VALUE f, VALUE r) {
+  cpBodyApplyForce(BODY(self), *VGET(f), *VGET(r));
+  return self;
 }
 
 static VALUE
-rb_cpBodyApplyImpulse(VALUE self, VALUE j, VALUE r)
-{
-	cpBodyApplyImpulse(BODY(self), *VGET(j), *VGET(r));
-	return self;
+rb_cpBodyApplyImpulse(VALUE self, VALUE j, VALUE r) {
+  cpBodyApplyImpulse(BODY(self), *VGET(j), *VGET(r));
+  return self;
 }
 
 static VALUE
-rb_cpBodyUpdateVelocity(VALUE self, VALUE g, VALUE dmp, VALUE dt)
-{
-	cpBodyUpdateVelocity(BODY(self), *VGET(g), NUM2DBL(dmp), NUM2DBL(dt));
-	return self;
+rb_cpBodyUpdateVelocity(VALUE self, VALUE g, VALUE dmp, VALUE dt) {
+  cpBodyUpdateVelocity(BODY(self), *VGET(g), NUM2DBL(dmp), NUM2DBL(dt));
+  return self;
 }
 
 static VALUE
-rb_cpBodyUpdatePosition(VALUE self, VALUE dt)
-{
-	cpBodyUpdatePosition(BODY(self), NUM2DBL(dt));
-	return self;
+rb_cpBodyUpdatePosition(VALUE self, VALUE dt) {
+  cpBodyUpdatePosition(BODY(self), NUM2DBL(dt));
+  return self;
 }
 
-static VALUE rb_cpBodyActivate(VALUE self) {
+static VALUE
+rb_cpBodyActivate(VALUE self) {
   cpBodyActivate(BODY(self));
   return self;
 }
 
-static cpBody * rb_cpBodySleepValidate(VALUE vbody) {
+static cpBody *
+rb_cpBodySleepValidate(VALUE vbody) {
   cpBody * body  = BODY(vbody);
-  cpSpace *space = body->space;  
+  cpSpace *space = body->space;
   if(!space) {
     rb_raise(rb_eArgError, "Cannot put a body to sleep that has not been added to a space.");
     return NULL;
   }
-  if (cpBodyIsStatic(body) && cpBodyIsRogue(body)) { 
+  if (cpBodyIsStatic(body) && cpBodyIsRogue(body)) {
     rb_raise(rb_eArgError, "Rogue AND static bodies cannot be put to sleep.");
     return NULL;
-  }  
-  if(space->locked) { 
-     rb_raise(rb_eArgError, "Bodies can not be put to sleep during a query or a call to Space#add_collision_func. Put these calls into a post-step callback using Space#add_collision_handler.");
-     return NULL;
   }
-  return body; 
+  if(space->locked) {
+    rb_raise(rb_eArgError, "Bodies can not be put to sleep during a query or a call to Space#add_collision_func. Put these calls into a post-step callback using Space#add_collision_handler.");
+    return NULL;
+  }
+  return body;
 }
 
-static VALUE rb_cpBodySleep(VALUE self) {
+static VALUE
+rb_cpBodySleep(VALUE self) {
   cpBody * body = rb_cpBodySleepValidate(self);
   cpBodySleep(body);
   return self;
 }
 
-static VALUE rb_cpBodySleepWithGroup(VALUE self, VALUE vgroup) {
+static VALUE
+rb_cpBodySleepWithGroup(VALUE self, VALUE vgroup) {
   cpBody * group = NIL_P(vgroup) ? NULL : rb_cpBodySleepValidate(vgroup);
   cpBody * body  = rb_cpBodySleepValidate(self);
-  
-  if (!cpBodyIsSleeping(group)) { 
+
+  if (!cpBodyIsSleeping(group)) {
     rb_raise(rb_eArgError, "Cannot use a non-sleeping body as a group identifier.");
-  }  
+  }
   cpBodySleepWithGroup(body, group);
   return self;
 }
 
 
-static VALUE rb_cpBodyIsSleeping(VALUE self) {
+static VALUE
+rb_cpBodyIsSleeping(VALUE self) {
   return cpBodyIsSleeping(BODY(self)) ? Qtrue : Qfalse;
 }
 
-static VALUE rb_cpBodyIsStatic(VALUE self) {
+static VALUE
+rb_cpBodyIsStatic(VALUE self) {
   cpBody * body = BODY(self);
-  cpBool stat   = 0; 
+  cpBool stat   = 0;
   // cpBodyInitStatic(body);
-  stat = cpBodyIsStatic(body);  
+  stat = cpBodyIsStatic(body);
   return stat ? Qtrue : Qfalse;
-  // 
+  //
 }
 
-static VALUE rb_cpBodyIsRogue(VALUE self) {
+static VALUE
+rb_cpBodyIsRogue(VALUE self) {
   return cpBodyIsRogue(BODY(self)) ? Qtrue : Qfalse;
 }
 
@@ -336,29 +309,28 @@ respondsTo(VALUE obj, ID method) {
 
 /*
 
-typedef void (*cpBodyVelocityFunc)(struct cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt);
-typedef void (*cpBodyPositionFunc)(struct cpBody *body, cpFloat dt);
-*/
+   typedef void (*cpBodyVelocityFunc)(struct cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt);
+   typedef void (*cpBodyPositionFunc)(struct cpBody *body, cpFloat dt);
+ */
 
 static void
 bodyVelocityCallback(cpBody *body, cpVect gravity, cpFloat damping, cpFloat dt) {
-  VALUE vbody     = (VALUE)(body->data); 
-  VALUE block     = rb_iv_get(vbody, "velocity_func");
-  VALUE vgravity  = VNEW(gravity);
-  VALUE vdamping  = rb_float_new(damping);
-  VALUE vdt       = rb_float_new(dt);
+  VALUE vbody    = (VALUE)(body->data);
+  VALUE block    = rb_iv_get(vbody, "velocity_func");
+  VALUE vgravity = VNEW(gravity);
+  VALUE vdamping = rb_float_new(damping);
+  VALUE vdt      = rb_float_new(dt);
   rb_funcall(block, rb_intern("call"), 4, vbody, vgravity, vdamping, vdt);
 }
 
-static VALUE 
-rb_cpBodySetVelocityFunc(int argc, VALUE *argv, VALUE self)
-{
+static VALUE
+rb_cpBodySetVelocityFunc(int argc, VALUE *argv, VALUE self) {
   VALUE block;
-  cpBody * body = BODY(self);  
+  cpBody * body = BODY(self);
   rb_scan_args(argc, argv, "&", &block);
   // Restore defaults if no block
   if (NIL_P(block)) {
-    body->velocity_func = cpBodyUpdateVelocityDefault;
+    body->velocity_func = cpBodyUpdateVelocity; //Default;
     return Qnil;
   }
   // set block for use in callback
@@ -369,21 +341,20 @@ rb_cpBodySetVelocityFunc(int argc, VALUE *argv, VALUE self)
 
 static void
 bodyPositionCallback(cpBody *body, cpFloat dt) {
-  VALUE vbody     = (VALUE)(body->data); 
-  VALUE block     = rb_iv_get(vbody, "position_func");
-  VALUE vdt       = rb_float_new(dt);
+  VALUE vbody = (VALUE)(body->data);
+  VALUE block = rb_iv_get(vbody, "position_func");
+  VALUE vdt   = rb_float_new(dt);
   rb_funcall(block, rb_intern("call"), 2, vbody, vdt);
 }
 
-static VALUE 
-rb_cpBodySetPositionFunc(int argc, VALUE *argv, VALUE self)
-{
+static VALUE
+rb_cpBodySetPositionFunc(int argc, VALUE *argv, VALUE self) {
   VALUE block;
-  cpBody * body = BODY(self);  
+  cpBody * body = BODY(self);
   rb_scan_args(argc, argv, "&", &block);
   // Restore defaults if no block
   if (NIL_P(block)) {
-    body->velocity_func = cpBodyUpdateVelocityDefault;
+    body->position_func = cpBodyUpdatePosition; //Default;
     return Qnil;
   }
   // set block for use in callback
@@ -410,95 +381,102 @@ rb_cpBodySlew(VALUE self, VALUE pos, VALUE dt) {
   return self;
 }
 
+static VALUE
+rb_cpBodyKineticEnergy(VALUE self) {
+  return DBL2NUM(cpBodyKineticEnergy(BODY(self)));
+}
+
 
 void
-Init_cpBody(void)
-{
-	c_cpBody = rb_define_class_under(m_Chipmunk, "Body", rb_cObject);
-	rb_define_alloc_func(c_cpBody, rb_cpBodyAlloc);
-	rb_define_method(c_cpBody, "initialize", rb_cpBodyInitialize, 2);
-	
-	c_cpStaticBody = rb_define_class_under(m_Chipmunk, "StaticBody", c_cpBody);  
+Init_cpBody(void) {
+  c_cpBody       = rb_define_class_under(m_Chipmunk, "Body", rb_cObject);
+  rb_define_alloc_func(c_cpBody, rb_cpBodyAlloc);
+  rb_define_method(c_cpBody, "initialize", rb_cpBodyInitialize, 2);
+
+  c_cpStaticBody = rb_define_class_under(m_Chipmunk, "StaticBody", c_cpBody);
+  rb_define_alloc_func(c_cpStaticBody, rb_cpBodyAlloc);
   // rb_define_alloc_func will not work here, since superclass defines this.
   // so, we define new here in stead.
-  rb_define_singleton_method(c_cpStaticBody, "new", rb_cpStaticBodyNew, 0);
-  rb_define_method(c_cpStaticBody, "initialize", rb_cpBodyInitializeStatic, 0);  
+  // rb_define_singleton_method(c_cpStaticBody, "new", rb_cpStaticBodyNew, 0);
+  rb_define_method(c_cpStaticBody, "initialize", rb_cpBodyInitializeStatic, 0);
   rb_define_singleton_method(c_cpBody, "new_static",  rb_cpStaticBodyNew, 0);
 
-	rb_define_method(c_cpBody, "m"           , rb_cpBodyGetMass, 0);
-	rb_define_method(c_cpBody, "i"           , rb_cpBodyGetMoment, 0);
-  	
-	rb_define_method(c_cpBody, "p"   , rb_cpBodyGetPos, 0);
-	rb_define_method(c_cpBody, "v"   , rb_cpBodyGetVel, 0);
-	rb_define_method(c_cpBody, "f"   , rb_cpBodyGetForce, 0);
-	rb_define_method(c_cpBody, "a"   , rb_cpBodyGetAngle, 0);
-	rb_define_method(c_cpBody, "w"   , rb_cpBodyGetAVel, 0);
-	rb_define_method(c_cpBody, "t"   , rb_cpBodyGetTorque, 0);
-	rb_define_method(c_cpBody, "rot" , rb_cpBodyGetRot, 0);
-	
-	rb_define_method(c_cpBody, "m=", rb_cpBodySetMass, 1);
-	rb_define_method(c_cpBody, "i=", rb_cpBodySetMoment, 1);
-	rb_define_method(c_cpBody, "p=", rb_cpBodySetPos, 1);
-	rb_define_method(c_cpBody, "v=", rb_cpBodySetVel, 1);
-	rb_define_method(c_cpBody, "f=", rb_cpBodySetForce, 1);
-	rb_define_method(c_cpBody, "a=", rb_cpBodySetAngle, 1);
-	rb_define_method(c_cpBody, "w=", rb_cpBodySetAVel, 1);
-	rb_define_method(c_cpBody, "t=", rb_cpBodySetTorque, 1);
-	
-	rb_define_method(c_cpBody, "mass" , rb_cpBodyGetMass, 0);
-	rb_define_method(c_cpBody, "moment" , rb_cpBodyGetMoment, 0);	
-	rb_define_method(c_cpBody, "pos" , rb_cpBodyGetPos, 0);
-	rb_define_method(c_cpBody, "vel" , rb_cpBodyGetVel, 0);
-	rb_define_method(c_cpBody, "force" , rb_cpBodyGetForce, 0);
-	rb_define_method(c_cpBody, "angle" , rb_cpBodyGetAngle, 0);
-	rb_define_method(c_cpBody, "ang_vel" , rb_cpBodyGetAVel, 0);
-	rb_define_method(c_cpBody, "torque" , rb_cpBodyGetTorque, 0);
-	rb_define_method(c_cpBody, "rot", rb_cpBodyGetRot, 0);
-  
-  rb_define_method(c_cpBody, "m_inv"       , rb_cpBodyGetMassInv, 0);
-  rb_define_method(c_cpBody, "mass_inv"    , rb_cpBodyGetMassInv, 0);
-  rb_define_method(c_cpBody, "moment_inv"  , rb_cpBodyGetMomentInv, 0);
-  rb_define_method(c_cpBody, "v_limit"     , rb_cpBodyGetVLimit, 0);
-  rb_define_method(c_cpBody, "w_limit"     , rb_cpBodyGetWLimit, 0);
-
-	
-	rb_define_method(c_cpBody, "mass="    , rb_cpBodySetMass, 1);
-	rb_define_method(c_cpBody, "moment="  , rb_cpBodySetMoment, 1);
-	rb_define_method(c_cpBody, "pos="     , rb_cpBodySetPos, 1);
-	rb_define_method(c_cpBody, "vel="     , rb_cpBodySetVel, 1);
-	rb_define_method(c_cpBody, "force="   , rb_cpBodySetForce, 1);
-	rb_define_method(c_cpBody, "angle="   , rb_cpBodySetAngle, 1);
-	rb_define_method(c_cpBody, "ang_vel=" , rb_cpBodySetAVel, 1);
-	rb_define_method(c_cpBody, "torque="  , rb_cpBodySetTorque, 1);
-  rb_define_method(c_cpBody, "v_limit=" , rb_cpBodySetVLimit, 1);
-  rb_define_method(c_cpBody, "w_limit=" , rb_cpBodySetWLimit, 1);
- 
-	
-	rb_define_method(c_cpBody, "local2world", rb_cpBodyLocal2World, 1);
-	rb_define_method(c_cpBody, "world2local", rb_cpBodyWorld2Local, 1);
-
-	rb_define_method(c_cpBody, "reset_forces", rb_cpBodyResetForces, 0);
-	rb_define_method(c_cpBody, "apply_force", rb_cpBodyApplyForce, 2);
-	rb_define_method(c_cpBody, "apply_impulse", rb_cpBodyApplyImpulse, 2);
-	
-	rb_define_method(c_cpBody, "update_velocity", rb_cpBodyUpdateVelocity, 3);
-	rb_define_method(c_cpBody, "update_position", rb_cpBodyUpdatePosition, 1);
-  rb_define_method(c_cpBody, "slew"           , rb_cpBodySlew          , 2); 
-	
-	rb_define_method(c_cpBody, "static?", rb_cpBodyIsStatic, 0);
-	rb_define_method(c_cpBody, "rogue?", rb_cpBodyIsRogue, 0);
-	rb_define_method(c_cpBody, "sleeping?", rb_cpBodyIsSleeping, 0);
-	rb_define_method(c_cpBody, "sleep?", rb_cpBodyIsSleeping, 0);
-  rb_define_method(c_cpBody, "sleep_with_self" , rb_cpBodySleep, 0);
-  rb_define_method(c_cpBody, "sleep_self"      , rb_cpBodySleep, 0);
-  rb_define_method(c_cpBody, "sleep_alone"     , rb_cpBodySleep, 0);  
-	rb_define_method(c_cpBody, "sleep_with_group", rb_cpBodySleepWithGroup, 1);
-	rb_define_method(c_cpBody, "sleep_group"     , rb_cpBodySleepWithGroup, 1);
-	rb_define_method(c_cpBody, "activate"        , rb_cpBodyActivate   , 0);
-	rb_define_method(c_cpBody, "velocity_func"   , rb_cpBodySetVelocityFunc, -1);
-  rb_define_method(c_cpBody, "position_func"   , rb_cpBodySetPositionFunc, -1);
-  
-  rb_define_method(c_cpBody, "object="         , rb_cpBodySetData, 1);
-  rb_define_method(c_cpBody, "object"          , rb_cpBodyGetData, 0);
-	
+  rb_define_method(c_cpBody, "m", rb_cpBodyGetMass, 0);
+  rb_define_method(c_cpBody, "i", rb_cpBodyGetMoment, 0);
+
+  rb_define_method(c_cpBody, "p", rb_cpBodyGetPos, 0);
+  rb_define_method(c_cpBody, "v", rb_cpBodyGetVel, 0);
+  rb_define_method(c_cpBody, "f", rb_cpBodyGetForce, 0);
+  rb_define_method(c_cpBody, "a", rb_cpBodyGetAngle, 0);
+  rb_define_method(c_cpBody, "w", rb_cpBodyGetAVel, 0);
+  rb_define_method(c_cpBody, "t", rb_cpBodyGetTorque, 0);
+  rb_define_method(c_cpBody, "rot", rb_cpBodyGetRot, 0);
+
+  rb_define_method(c_cpBody, "m=", rb_cpBodySetMass, 1);
+  rb_define_method(c_cpBody, "i=", rb_cpBodySetMoment, 1);
+  rb_define_method(c_cpBody, "p=", rb_cpBodySetPos, 1);
+  rb_define_method(c_cpBody, "v=", rb_cpBodySetVel, 1);
+  rb_define_method(c_cpBody, "f=", rb_cpBodySetForce, 1);
+  rb_define_method(c_cpBody, "a=", rb_cpBodySetAngle, 1);
+  rb_define_method(c_cpBody, "w=", rb_cpBodySetAVel, 1);
+  rb_define_method(c_cpBody, "t=", rb_cpBodySetTorque, 1);
+
+  rb_define_method(c_cpBody, "mass", rb_cpBodyGetMass, 0);
+  rb_define_method(c_cpBody, "moment", rb_cpBodyGetMoment, 0);
+  rb_define_method(c_cpBody, "pos", rb_cpBodyGetPos, 0);
+  rb_define_method(c_cpBody, "vel", rb_cpBodyGetVel, 0);
+  rb_define_method(c_cpBody, "force", rb_cpBodyGetForce, 0);
+  rb_define_method(c_cpBody, "angle", rb_cpBodyGetAngle, 0);
+  rb_define_method(c_cpBody, "ang_vel", rb_cpBodyGetAVel, 0);
+  rb_define_method(c_cpBody, "torque", rb_cpBodyGetTorque, 0);
+  rb_define_method(c_cpBody, "rot", rb_cpBodyGetRot, 0);
+
+  rb_define_method(c_cpBody, "m_inv", rb_cpBodyGetMassInv, 0);
+  rb_define_method(c_cpBody, "mass_inv", rb_cpBodyGetMassInv, 0);
+  rb_define_method(c_cpBody, "moment_inv", rb_cpBodyGetMomentInv, 0);
+  rb_define_method(c_cpBody, "v_limit", rb_cpBodyGetVLimit, 0);
+  rb_define_method(c_cpBody, "w_limit", rb_cpBodyGetWLimit, 0);
+
+
+  rb_define_method(c_cpBody, "mass=", rb_cpBodySetMass, 1);
+  rb_define_method(c_cpBody, "moment=", rb_cpBodySetMoment, 1);
+  rb_define_method(c_cpBody, "pos=", rb_cpBodySetPos, 1);
+  rb_define_method(c_cpBody, "vel=", rb_cpBodySetVel, 1);
+  rb_define_method(c_cpBody, "force=", rb_cpBodySetForce, 1);
+  rb_define_method(c_cpBody, "angle=", rb_cpBodySetAngle, 1);
+  rb_define_method(c_cpBody, "ang_vel=", rb_cpBodySetAVel, 1);
+  rb_define_method(c_cpBody, "torque=", rb_cpBodySetTorque, 1);
+  rb_define_method(c_cpBody, "v_limit=", rb_cpBodySetVLimit, 1);
+  rb_define_method(c_cpBody, "w_limit=", rb_cpBodySetWLimit, 1);
+
+
+  rb_define_method(c_cpBody, "local2world", rb_cpBodyLocal2World, 1);
+  rb_define_method(c_cpBody, "world2local", rb_cpBodyWorld2Local, 1);
+
+  rb_define_method(c_cpBody, "reset_forces", rb_cpBodyResetForces, 0);
+  rb_define_method(c_cpBody, "apply_force", rb_cpBodyApplyForce, 2);
+  rb_define_method(c_cpBody, "apply_impulse", rb_cpBodyApplyImpulse, 2);
+
+  rb_define_method(c_cpBody, "update_velocity", rb_cpBodyUpdateVelocity, 3);
+  rb_define_method(c_cpBody, "update_position", rb_cpBodyUpdatePosition, 1);
+  rb_define_method(c_cpBody, "slew", rb_cpBodySlew, 2);
+
+  rb_define_method(c_cpBody, "static?", rb_cpBodyIsStatic, 0);
+  rb_define_method(c_cpBody, "rogue?", rb_cpBodyIsRogue, 0);
+  rb_define_method(c_cpBody, "sleeping?", rb_cpBodyIsSleeping, 0);
+  rb_define_method(c_cpBody, "sleep?", rb_cpBodyIsSleeping, 0);
+  rb_define_method(c_cpBody, "sleep_with_self", rb_cpBodySleep, 0);
+  rb_define_method(c_cpBody, "sleep_self", rb_cpBodySleep, 0);
+  rb_define_method(c_cpBody, "sleep_alone", rb_cpBodySleep, 0);
+  rb_define_method(c_cpBody, "sleep_with_group", rb_cpBodySleepWithGroup, 1);
+  rb_define_method(c_cpBody, "sleep_group", rb_cpBodySleepWithGroup, 1);
+  rb_define_method(c_cpBody, "activate", rb_cpBodyActivate, 0);
+  rb_define_method(c_cpBody, "velocity_func", rb_cpBodySetVelocityFunc, -1);
+  rb_define_method(c_cpBody, "position_func", rb_cpBodySetPositionFunc, -1);
+
+  rb_define_method(c_cpBody, "object=", rb_cpBodySetData, 1);
+  rb_define_method(c_cpBody, "object", rb_cpBodyGetData, 0);
+  rb_define_method(c_cpBody, "kinetic_energy", rb_cpBodyKineticEnergy, 0);
+
+
 }