chipmunk 5.3.4.0 → 5.3.4.2

data/ext/chipmunk/rb_cpShape.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,9 +18,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
+
 #include <stdlib.h>
 #include "chipmunk.h"
+#include "chipmunk_unsafe.h"
 
 #include "ruby.h"
 #include "rb_chipmunk.h"
@@ -43,175 +44,155 @@ rb_cpSegmentQueryInfoNew(VALUE shape, VALUE t, VALUE n) {
 
 
 static VALUE
-rb_cpShapeGetBody(VALUE self)
-{
-	return rb_ivar_get(self, id_body);
+rb_cpShapeGetBody(VALUE self) {
+  return rb_ivar_get(self, id_body);
 }
 
 static VALUE
-rb_cpShapeSensorP(VALUE self)
-{
-  return SHAPE(self)->sensor ? Qtrue : Qfalse; 
+rb_cpShapeSensorP(VALUE self) {
+  return SHAPE(self)->sensor ? Qtrue : Qfalse;
 }
 
 static VALUE
-rb_cpShapeSetSensor(VALUE self, VALUE sensor)
-{
-  int sens = (NIL_P(sensor) || (!sensor)) ? 0 : 1; 
-  SHAPE(self)->sensor =  sens;  
+rb_cpShapeSetSensor(VALUE self, VALUE sensor) {
+  int sens = (NIL_P(sensor) || (!sensor)) ? 0 : 1;
+  SHAPE(self)->sensor =  sens;
   return sensor;
 }
 
 static VALUE
-rb_cpShapeSetBody(VALUE self, VALUE body)
-{
-	SHAPE(self)->body = BODY(body);
-	rb_ivar_set(self, id_body, body);
-	
-	return body;
+rb_cpShapeSetBody(VALUE self, VALUE body) {
+  SHAPE(self)->body = BODY(body);
+  rb_ivar_set(self, id_body, body);
+
+  return body;
 }
 
 static VALUE
-rb_cpShapeGetCollType(VALUE self)
-{
-	return rb_iv_get(self, "collType");
+rb_cpShapeGetCollType(VALUE self) {
+  return rb_iv_get(self, "collType");
 }
 
 static VALUE
-rb_cpShapeSetCollType(VALUE self, VALUE val)
-{
-	VALUE col_type = rb_obj_id(val);
-	rb_iv_set(self, "collType", val);
-	SHAPE(self)->collision_type = NUM2UINT(col_type);
-	
-	return val;
+rb_cpShapeSetCollType(VALUE self, VALUE val) {
+  VALUE col_type = rb_obj_id(val);
+  rb_iv_set(self, "collType", val);
+  SHAPE(self)->collision_type = NUM2UINT(col_type);
+
+  return val;
 }
 
 static VALUE
-rb_cpShapeGetData(VALUE self)
-{
+rb_cpShapeGetData(VALUE self) {
   return rb_iv_get(self, "data");
 }
 
 static VALUE
-rb_cpShapeSetData(VALUE self, VALUE val)
-{
+rb_cpShapeSetData(VALUE self, VALUE val) {
   rb_iv_set(self, "data", val);
   return val;
 }
 
 static VALUE
-rb_cpShapeGetSelf(VALUE self)
-{
+rb_cpShapeGetSelf(VALUE self) {
   return self;
 }
 
 
 static VALUE
-rb_cpShapeGetGroup(VALUE self)
-{
-	return rb_iv_get(self, "group");
+rb_cpShapeGetGroup(VALUE self) {
+  return rb_iv_get(self, "group");
 }
 
 static VALUE
-rb_cpShapeSetGroup(VALUE self, VALUE val)
-{
-	VALUE col_type = rb_obj_id(val);
-	rb_iv_set(self, "group", val);
-	SHAPE(self)->group = NUM2UINT(col_type);
-	
-	return val;
+rb_cpShapeSetGroup(VALUE self, VALUE val) {
+  VALUE col_type = rb_obj_id(val);
+  rb_iv_set(self, "group", val);
+  SHAPE(self)->group = NUM2UINT(col_type);
+
+  return val;
 }
 
 static VALUE
-rb_cpShapeGetLayers(VALUE self)
-{
-	return UINT2NUM(SHAPE(self)->layers);
+rb_cpShapeGetLayers(VALUE self) {
+  return UINT2NUM(SHAPE(self)->layers);
 }
 
 static VALUE
-rb_cpShapeSetLayers(VALUE self, VALUE layers)
-{
-	SHAPE(self)->layers = NUM2UINT(layers);
-	
-	return layers;
+rb_cpShapeSetLayers(VALUE self, VALUE layers) {
+  SHAPE(self)->layers = NUM2UINT(layers);
+
+  return layers;
 }
 
 static VALUE
-rb_cpShapeGetBB(VALUE self)
-{
-	cpBB *bb = malloc(sizeof(cpBB));
-	*bb = SHAPE(self)->bb;
-	return Data_Wrap_Struct(c_cpBB, NULL, free, bb);
+rb_cpShapeGetBB(VALUE self) {
+  cpBB *bb = malloc(sizeof(cpBB));
+  *bb = SHAPE(self)->bb;
+  return Data_Wrap_Struct(c_cpBB, NULL, free, bb);
 }
 
 static VALUE
-rb_cpShapeCacheBB(VALUE self)
-{
-	cpShape *shape = SHAPE(self);
-	cpShapeCacheBB(shape);
-	
-	return rb_cpShapeGetBB(self);
+rb_cpShapeCacheBB(VALUE self) {
+  cpShape *shape = SHAPE(self);
+  cpShapeCacheBB(shape);
+
+  return rb_cpShapeGetBB(self);
 }
 
 static VALUE
-rb_cpShapeGetElasticity(VALUE self)
-{
-	return rb_float_new(SHAPE(self)->e);
+rb_cpShapeGetElasticity(VALUE self) {
+  return rb_float_new(SHAPE(self)->e);
 }
 
 static VALUE
-rb_cpShapeGetFriction(VALUE self)
-{
-	return rb_float_new(SHAPE(self)->u);
+rb_cpShapeGetFriction(VALUE self) {
+  return rb_float_new(SHAPE(self)->u);
 }
 
 static VALUE
-rb_cpShapeSetElasticity(VALUE self, VALUE val)
-{
-	SHAPE(self)->e = NUM2DBL(val);
-	return val;
+rb_cpShapeSetElasticity(VALUE self, VALUE val) {
+  SHAPE(self)->e = NUM2DBL(val);
+  return val;
 }
 
 static VALUE
-rb_cpShapeSetFriction(VALUE self, VALUE val)
-{
-	SHAPE(self)->u = NUM2DBL(val);
-	return val;
+rb_cpShapeSetFriction(VALUE self, VALUE val) {
+  SHAPE(self)->u = NUM2DBL(val);
+  return val;
 }
 
 static VALUE
-rb_cpShapeGetSurfaceV(VALUE self)
-{
-	return VWRAP(self, &SHAPE(self)->surface_v);
+rb_cpShapeGetSurfaceV(VALUE self) {
+  return VWRAP(self, &SHAPE(self)->surface_v);
 }
 
 static VALUE
-rb_cpShapeSetSurfaceV(VALUE self, VALUE val)
-{
-	SHAPE(self)->surface_v = *VGET(val);
-	return val;
+rb_cpShapeSetSurfaceV(VALUE self, VALUE val) {
+  SHAPE(self)->surface_v = *VGET(val);
+  return val;
 }
 
 static VALUE
-rb_cpShapeResetIdCounter(VALUE self)
-{
-	cpResetShapeIdCounter();
-	return Qnil;
+rb_cpShapeResetIdCounter(VALUE self) {
+  cpResetShapeIdCounter();
+  return Qnil;
 }
 
 // Test if a point lies within a shape.
-static VALUE rb_cpShapePointQuery(VALUE self, VALUE point) {
-  cpBool res = cpShapePointQuery(SHAPE(self), *VGET(point));  
-  return  res ? Qtrue : Qfalse;
-}  
+static VALUE
+rb_cpShapePointQuery(VALUE self, VALUE point) {
+  cpBool res = cpShapePointQuery(SHAPE(self), *VGET(point));
+  return res ? Qtrue : Qfalse;
+}
 
 
-static VALUE rb_cpShapeSegmentQuery(VALUE self, VALUE a, VALUE b) { 
+static VALUE
+rb_cpShapeSegmentQuery(VALUE self, VALUE a, VALUE b) {
   cpSegmentQueryInfo info;
   cpShapeSegmentQuery(SHAPE(self), *VGET(a), *VGET(b), &info);
-  if(info.shape) { 
-    return rb_cpSegmentQueryInfoNew((VALUE)info.shape->data, rb_float_new(info.t), VNEW(info.n)); 
+  if(info.shape) {
+    return rb_cpSegmentQueryInfoNew((VALUE)info.shape->data, rb_float_new(info.t), VNEW(info.n));
   }
   return Qnil;
 }
@@ -219,215 +200,347 @@ static VALUE rb_cpShapeSegmentQuery(VALUE self, VALUE a, VALUE b) {
 
 
 //cpCircle
+static void
+rb_cpCircleMark(void * data) {
+  cpCircleShape *circle = (cpCircleShape *) data;
+}
+
 static VALUE
-rb_cpCircleAlloc(VALUE klass)
-{
-	cpCircleShape *circle = cpCircleShapeAlloc();
-	return Data_Wrap_Struct(klass, NULL, cpShapeFree, circle);
+rb_cpCircleAlloc(VALUE klass) {
+  cpCircleShape *circle = cpCircleShapeAlloc();
+  // note: in chipmunk 5.3.4, there is a bug wich will cause
+  // cpShapeFree to segfault if cpXXXShapeInit has not been called.
+  return Data_Wrap_Struct(klass, NULL, cpShapeFree, circle);
 }
 
+
+
 static VALUE
-rb_cpCircleInitialize(VALUE self, VALUE body, VALUE radius, VALUE offset)
-{
-	cpCircleShape *circle = (cpCircleShape *)SHAPE(self);
-	
-	cpCircleShapeInit(circle, BODY(body), NUM2DBL(radius), *VGET(offset));
-	circle->shape.data = (void *)self;
-	circle->shape.collision_type = Qnil;
+rb_cpCircleInitialize(int argc, VALUE * argv, VALUE self) {
+  VALUE body, radius, offset;
+  cpCircleShape *circle = NULL;
+  rb_scan_args(argc, argv, "21", &body, &radius, &offset);
+  circle                       = (cpCircleShape *)SHAPE(self);
 
-	rb_ivar_set(self, id_body, body);
-	
-	return self;
-}
+  cpCircleShapeInit(circle, BODY(body), NUM2DBL(radius), VGET_ZERO(offset));
+  circle->shape.data           = (void *)self;
+  circle->shape.collision_type = Qnil;
+  rb_ivar_set(self, id_body, body);
 
+  return self;
+}
 
 
 
 
 //cpSegment
 static VALUE
-rb_cpSegmentAlloc(VALUE klass)
-{
-	cpSegmentShape *seg = cpSegmentShapeAlloc();
-	return Data_Wrap_Struct(klass, NULL, cpShapeFree, seg);
+rb_cpSegmentAlloc(VALUE klass) {
+  cpSegmentShape *seg = cpSegmentShapeAlloc();
+
+  return Data_Wrap_Struct(klass, NULL, cpShapeFree, seg);
 }
 
 static VALUE
-rb_cpSegmentInitialize(VALUE self, VALUE body, VALUE a, VALUE b, VALUE r)
-{
-	cpSegmentShape *seg = (cpSegmentShape *)SHAPE(self);
-	
-	cpSegmentShapeInit(seg, BODY(body), *VGET(a), *VGET(b), NUM2DBL(r));
-	seg->shape.data = (void *)self;
-	seg->shape.collision_type = Qnil;
+rb_cpSegmentInitialize(VALUE self, VALUE body, VALUE a, VALUE b, VALUE r) {
+  cpSegmentShape *seg = (cpSegmentShape *)SHAPE(self);
+
+  cpSegmentShapeInit(seg, BODY(body), *VGET(a), *VGET(b), NUM2DBL(r));
+  seg->shape.data           = (void *)self;
+  seg->shape.collision_type = Qnil;
 
-	rb_ivar_set(self, id_body, body);
-	
-	return self;
+  rb_ivar_set(self, id_body, body);
+
+  return self;
 }
 
 
 
 //cpPoly
+
+// Syntactic macro to handle fetching the vertices from a ruby array
+// to a C array.
+#define RBCP_ARRAY_POINTS(ARR, NUM, VERTS) \
+  Check_Type(ARR, T_ARRAY);                \
+  VALUE *__rbcp_ptr = RARRAY_PTR(ARR);     \
+  long NUM           = RARRAY_LEN(ARR);    \
+  cpVect VERTS[NUM];                       \
+  for(long i = 0; i < NUM; i++)            \
+    VERTS[i] = *VGET(__rbcp_ptr[i]);
+
+
+static VALUE
+rb_cpPolyValidate(VALUE self, VALUE arr) {
+  RBCP_ARRAY_POINTS(arr, num, verts);
+
+  return CP_INT_BOOL(cpPolyValidate(verts, num));
+}
+
+
 static VALUE
-rb_cpPolyAlloc(VALUE klass)
-{
-	cpPolyShape *poly = cpPolyShapeAlloc();
-	return Data_Wrap_Struct(klass, NULL, cpShapeFree, poly);
+rb_cpPolyAlloc(VALUE klass) {
+  cpPolyShape *poly = cpPolyShapeAlloc();
+  return Data_Wrap_Struct(klass, NULL, cpShapeFree, poly);
 }
 
 static VALUE
-rb_cpPolyInitialize(VALUE self, VALUE body, VALUE arr, VALUE offset)
-{
-	cpPolyShape *poly = (cpPolyShape *)SHAPE(self);
-	
-	Check_Type(arr, T_ARRAY);
-	int numVerts = RARRAY_LEN(arr);
-	VALUE *ary_ptr = RARRAY_PTR(arr);
-	cpVect verts[numVerts];
-	
-	for(int i=0; i<numVerts; i++)
-		verts[i] = *VGET(ary_ptr[i]);
-	
-	cpPolyShapeInit(poly, BODY(body), numVerts, verts, *VGET(offset));
-	poly->shape.data = (void *)self;
-	poly->shape.collision_type = Qnil;
+rb_cpPolyInitialize(int argc, VALUE * argv, VALUE self) {
+  VALUE body, arr, offset;
+  cpPolyShape *poly = (cpPolyShape *)SHAPE(self);
+
+  rb_scan_args(argc, argv, "21", &body, &arr, &offset);
+
+  RBCP_ARRAY_POINTS(arr, num, verts);
+
+  if(!cpPolyValidate(verts, num)) {
+    rb_raise(rb_eArgError, "The verts array does not from a valid polygon!");
+  }
+
+  cpPolyShapeInit(poly, BODY(body), num, verts, VGET_ZERO(offset));
+  poly->shape.data           = (void *)self;
+  poly->shape.collision_type = Qnil;
 
-	rb_ivar_set(self, id_body, body);
-	
-	return self;
+  rb_ivar_set(self, id_body, body);
+
+  return self;
 }
 
 // some getters
-static VALUE rb_cpCircleShapeGetOffset(VALUE self) {
+static VALUE
+rb_cpCircleShapeGetOffset(VALUE self) {
   return VNEW(cpCircleShapeGetOffset(SHAPE(self)));
 }
 
-static VALUE rb_cpCircleShapeGetRadius(VALUE self) {  
+static VALUE
+rb_cpCircleShapeGetRadius(VALUE self) {
   return rb_float_new(cpCircleShapeGetRadius(SHAPE(self)));
 }
 
-static VALUE rb_cpSegmentShapeGetA(VALUE self) {
+static VALUE
+rb_cpSegmentShapeGetA(VALUE self) {
   return VNEW(cpSegmentShapeGetA(SHAPE(self)));
 }
 
-static VALUE rb_cpSegmentShapeGetB(VALUE self) {  
+static VALUE
+rb_cpSegmentShapeGetB(VALUE self) {
   return VNEW(cpSegmentShapeGetB(SHAPE(self)));
 }
 
-static VALUE rb_cpSegmentShapeGetRadius(VALUE self) {
+static VALUE
+rb_cpSegmentShapeGetRadius(VALUE self) {
   return rb_float_new(cpSegmentShapeGetRadius(SHAPE(self)));
 }
 
-static VALUE rb_cpSegmentShapeGetNormal(VALUE self) {
+static VALUE
+rb_cpSegmentShapeGetNormal(VALUE self) {
   return VNEW(cpSegmentShapeGetNormal(SHAPE(self)));
 }
 
-static VALUE rb_cpPolyShapeGetNumVerts(VALUE self) {
+static VALUE
+rb_cpPolyShapeGetNumVerts(VALUE self) {
   return INT2NUM(cpPolyShapeGetNumVerts(SHAPE(self)));
 }
 
-static VALUE rb_cpPolyShapeGetVert(VALUE self, VALUE vindex) {
-  cpShape *shape     = SHAPE(self);
-  int index          = NUM2INT(vindex);  
-  if ((index < 0) || (index >= cpPolyShapeGetNumVerts(shape))) {  
+static VALUE
+rb_cpPolyShapeGetVert(VALUE self, VALUE vindex) {
+  cpShape *shape = SHAPE(self);
+  int index      = NUM2INT(vindex);
+  if ((index < 0) || (index >= cpPolyShapeGetNumVerts(shape))) {
     return Qnil;
-  }  
+  }
   return VNEW(cpPolyShapeGetVert(shape, index));
 }
 
+/* "unsafe" API. */
+
+static VALUE
+rb_cpCircleShapeSetRadius(VALUE self, VALUE radius) {
+  cpCircleShapeSetRadius(SHAPE(self), NUM2DBL(radius));
+  return self;
+}
+
+static VALUE
+rb_cpCircleShapeSetOffset(VALUE self, VALUE offset) {
+  cpCircleShapeSetOffset(SHAPE(self), *VGET(offset));
+  return self;
+}
+
+static VALUE
+rb_cpSegmentShapeSetEndpoints(VALUE self, VALUE a, VALUE b) {
+  cpSegmentShapeSetEndpoints(SHAPE(self), *VGET(a), *VGET(b));
+  return self;
+}
+
+static VALUE
+rb_cpSegmentShapeSetRadius(VALUE self, VALUE radius) {
+  cpSegmentShapeSetRadius(SHAPE(self), NUM2DBL(radius));
+  return self;
+}
+
+
+static VALUE
+rb_cpPolyShapeSetVerts(VALUE self, VALUE arr, VALUE offset) {
+  cpShape *poly = SHAPE(self);
+
+  RBCP_ARRAY_POINTS(arr, num, verts);
+
+  if(!cpPolyValidate(verts, num)) {
+    rb_raise(rb_eArgError, "The verts array does not from a valid polygon!");
+  }
+
+  cpPolyShapeSetVerts(poly, num, verts, *VGET(offset));
+  return self;
+}
+
+/* extra inline functions  from the headers */
+// Returns the minimum distance of the polygon to the axis.
+static VALUE
+rb_cpPolyShapeValueOnAxis(VALUE self, VALUE n, VALUE d) {
+  cpPolyShape * poly = (cpPolyShape *) SHAPE(self);
+  return DBL2NUM(cpPolyShapeValueOnAxis(poly, *VGET(n), NUM2DBL(d)));
+}
+
+// Returns true if the polygon contains the vertex.
+static VALUE
+rb_cpPolyShapeContainsVert(VALUE self, VALUE v) {
+  cpPolyShape * poly = (cpPolyShape *) SHAPE(self);
+  return CP_INT_BOOL(cpPolyShapeContainsVert(poly, *VGET(v)));
+}
+
+// Same as cpPolyShapeContainsVert() but ignores faces pointing away from the normal.
+static VALUE
+rb_cpPolyShapeContainsVertPartial(VALUE self, VALUE v, VALUE n) {
+  cpPolyShape * poly = (cpPolyShape *) SHAPE(self);
+  return CP_INT_BOOL(cpPolyShapeContainsVertPartial(poly, *VGET(v), *VGET(n)));
+}
+
+
+/* collision.h */
+static VALUE
+rb_cpCollideShapes(VALUE self, VALUE other) {
+  cpContact points[CP_MAX_CONTACTS_PER_ARBITER];
+  int size     = cpCollideShapes(SHAPE(self), SHAPE(other), points);
+  VALUE result = rb_ary_new();
+  for(int index = 0; index < size; index++) {
+    VALUE point   = VNEW(points[index].p);
+    VALUE normal  = VNEW(points[index].n);
+    VALUE dist    = DBL2NUM(points[index].dist);
+    VALUE contact = rb_cpContactPointNew(point, normal, dist);
+    rb_ary_push(result, contact);
+  }
+  return result;
+}
+
+
+
+
+
+
 
 void
-Init_cpShape(void)
-{
-	id_body = rb_intern("body");
-	
-	m_cpShape = rb_define_module_under(m_Chipmunk, "Shape");
-	rb_define_attr(m_cpShape, "obj", 1, 1);
-	
-	rb_define_method(m_cpShape, "body", rb_cpShapeGetBody, 0);
-	rb_define_method(m_cpShape, "body=", rb_cpShapeSetBody, 1);
-  
+Init_cpShape(void) {
+  id_body   = rb_intern("body");
+
+  m_cpShape = rb_define_module_under(m_Chipmunk, "Shape");
+  rb_define_attr(m_cpShape, "obj", 1, 1);
+
+  rb_define_method(m_cpShape, "body", rb_cpShapeGetBody, 0);
+  rb_define_method(m_cpShape, "body=", rb_cpShapeSetBody, 1);
+
   rb_define_method(m_cpShape, "sensor?", rb_cpShapeSensorP, 0);
   rb_define_method(m_cpShape, "sensor=", rb_cpShapeSetSensor, 1);
-  
-	
-	rb_define_method(m_cpShape, "collision_type", rb_cpShapeGetCollType, 0);
-	rb_define_method(m_cpShape, "collision_type=", rb_cpShapeSetCollType, 1);
-	
-  // this method only exists for Chipmunk-FFI compatibility as it seems useless 
-  // to me. 
+
+
+  rb_define_method(m_cpShape, "collision_type", rb_cpShapeGetCollType, 0);
+  rb_define_method(m_cpShape, "collision_type=", rb_cpShapeSetCollType, 1);
+
+  // this method only exists for Chipmunk-FFI compatibility as it seems useless
+  // to me.
   rb_define_method(m_cpShape, "data", rb_cpShapeGetSelf, 0);
   // So we use this as the object setter
-  rb_define_method(m_cpShape, "object" , rb_cpShapeGetData, 0);
+  rb_define_method(m_cpShape, "object", rb_cpShapeGetData, 0);
   rb_define_method(m_cpShape, "object=", rb_cpShapeSetData, 1);
-   
-	rb_define_method(m_cpShape, "group", rb_cpShapeGetGroup, 0);
-	rb_define_method(m_cpShape, "group=", rb_cpShapeSetGroup, 1);
-	
-	rb_define_method(m_cpShape, "layers", rb_cpShapeGetLayers, 0);
-	rb_define_method(m_cpShape, "layers=", rb_cpShapeSetLayers, 1);
-	
-	rb_define_method(m_cpShape, "bb"         , rb_cpShapeCacheBB, 0);
-	rb_define_method(m_cpShape, "cache_bb"   , rb_cpShapeCacheBB, 0);
-  rb_define_method(m_cpShape, "raw_bb"     , rb_cpShapeGetBB, 0); 
-	
-	rb_define_method(m_cpShape, "e", rb_cpShapeGetElasticity, 0);
-	rb_define_method(m_cpShape, "u", rb_cpShapeGetFriction, 0);
-	
-	rb_define_method(m_cpShape, "e=", rb_cpShapeSetElasticity, 1);
-	rb_define_method(m_cpShape, "u=", rb_cpShapeSetFriction, 1);
-	
-	rb_define_method(m_cpShape, "surface_v", rb_cpShapeGetSurfaceV, 0);
-	rb_define_method(m_cpShape, "surface_v=", rb_cpShapeSetSurfaceV, 1);
-  
+
+  rb_define_method(m_cpShape, "group", rb_cpShapeGetGroup, 0);
+  rb_define_method(m_cpShape, "group=", rb_cpShapeSetGroup, 1);
+
+  rb_define_method(m_cpShape, "layers", rb_cpShapeGetLayers, 0);
+  rb_define_method(m_cpShape, "layers=", rb_cpShapeSetLayers, 1);
+
+  rb_define_method(m_cpShape, "bb", rb_cpShapeCacheBB, 0);
+  rb_define_method(m_cpShape, "cache_bb", rb_cpShapeCacheBB, 0);
+  rb_define_method(m_cpShape, "raw_bb", rb_cpShapeGetBB, 0);
+
+  rb_define_method(m_cpShape, "e", rb_cpShapeGetElasticity, 0);
+  rb_define_method(m_cpShape, "u", rb_cpShapeGetFriction, 0);
+
+  rb_define_method(m_cpShape, "e=", rb_cpShapeSetElasticity, 1);
+  rb_define_method(m_cpShape, "u=", rb_cpShapeSetFriction, 1);
+
+  rb_define_method(m_cpShape, "surface_v", rb_cpShapeGetSurfaceV, 0);
+  rb_define_method(m_cpShape, "surface_v=", rb_cpShapeSetSurfaceV, 1);
+
   rb_define_method(m_cpShape, "point_query", rb_cpShapePointQuery, 1);
   rb_define_method(m_cpShape, "segment_query", rb_cpShapeSegmentQuery, 2);
-  
-   
-	
-	rb_define_singleton_method(m_cpShape, "reset_id_counter", rb_cpShapeResetIdCounter, 0);
- 
-	
-	c_cpCircleShape = rb_define_class_under(m_cpShape, "Circle", rb_cObject);
-	rb_include_module(c_cpCircleShape, m_cpShape);
-	rb_define_alloc_func(c_cpCircleShape, rb_cpCircleAlloc);
-	rb_define_method(c_cpCircleShape, "initialize", rb_cpCircleInitialize, 3);
-	
-	
-	c_cpSegmentShape = rb_define_class_under(m_cpShape, "Segment", rb_cObject);
-	rb_include_module(c_cpSegmentShape, m_cpShape);
-	rb_define_alloc_func(c_cpSegmentShape, rb_cpSegmentAlloc);
-	rb_define_method(c_cpSegmentShape, "initialize", rb_cpSegmentInitialize, 4);
-
-
-	c_cpPolyShape = rb_define_class_under(m_cpShape, "Poly", rb_cObject);
-	rb_include_module(c_cpPolyShape, m_cpShape);
-	rb_define_alloc_func(c_cpPolyShape, rb_cpPolyAlloc);
-	rb_define_method(c_cpPolyShape, "initialize", rb_cpPolyInitialize, 3);
-  
+
+
+
+  rb_define_singleton_method(m_cpShape, "reset_id_counter", rb_cpShapeResetIdCounter, 0);
+
+
+  c_cpCircleShape  = rb_define_class_under(m_cpShape, "Circle", rb_cObject);
+  rb_include_module(c_cpCircleShape, m_cpShape);
+  rb_define_alloc_func(c_cpCircleShape, rb_cpCircleAlloc);
+  rb_define_method(c_cpCircleShape, "initialize", rb_cpCircleInitialize, -1);
+
+  c_cpSegmentShape = rb_define_class_under(m_cpShape, "Segment", rb_cObject);
+  rb_include_module(c_cpSegmentShape, m_cpShape);
+  rb_define_alloc_func(c_cpSegmentShape, rb_cpSegmentAlloc);
+  rb_define_method(c_cpSegmentShape, "initialize", rb_cpSegmentInitialize, 4);
+
+
+  c_cpPolyShape    = rb_define_class_under(m_cpShape, "Poly", rb_cObject);
+  rb_include_module(c_cpPolyShape, m_cpShape);
+  rb_define_alloc_func(c_cpPolyShape, rb_cpPolyAlloc);
+  rb_define_singleton_method(c_cpPolyShape, "valid?", rb_cpPolyValidate, 1);
+
+  rb_define_method(c_cpPolyShape, "initialize", rb_cpPolyInitialize, -1);
+
   rb_define_method(c_cpCircleShape, "offset", rb_cpCircleShapeGetOffset, 0);
   rb_define_method(c_cpCircleShape, "radius", rb_cpCircleShapeGetRadius, 0);
-  rb_define_method(c_cpCircleShape, "r"     , rb_cpCircleShapeGetRadius, 0);
-  
-  rb_define_method(c_cpSegmentShape, "a"      , rb_cpSegmentShapeGetA, 0);
-  rb_define_method(c_cpSegmentShape, "b"      , rb_cpSegmentShapeGetB, 0);
-  rb_define_method(c_cpSegmentShape, "radius" , rb_cpSegmentShapeGetRadius, 0);
-  rb_define_method(c_cpSegmentShape, "r"      , rb_cpSegmentShapeGetRadius, 0);
-  rb_define_method(c_cpSegmentShape, "normal" , rb_cpSegmentShapeGetNormal, 0);
-  rb_define_method(c_cpSegmentShape, "n"      , rb_cpSegmentShapeGetNormal, 0);
-  
-  rb_define_method(c_cpPolyShape   , "num_verts" , rb_cpPolyShapeGetNumVerts, 0);  
-  rb_define_method(c_cpPolyShape   , "vert"      , rb_cpPolyShapeGetVert, 1);
+  rb_define_method(c_cpCircleShape, "r", rb_cpCircleShapeGetRadius, 0);
+
+  rb_define_method(c_cpSegmentShape, "a", rb_cpSegmentShapeGetA, 0);
+  rb_define_method(c_cpSegmentShape, "b", rb_cpSegmentShapeGetB, 0);
+  rb_define_method(c_cpSegmentShape, "radius", rb_cpSegmentShapeGetRadius, 0);
+  rb_define_method(c_cpSegmentShape, "r", rb_cpSegmentShapeGetRadius, 0);
+  rb_define_method(c_cpSegmentShape, "normal", rb_cpSegmentShapeGetNormal, 0);
+  rb_define_method(c_cpSegmentShape, "n", rb_cpSegmentShapeGetNormal, 0);
+
+  rb_define_method(c_cpPolyShape, "num_verts", rb_cpPolyShapeGetNumVerts, 0);
+  rb_define_method(c_cpPolyShape, "vert", rb_cpPolyShapeGetVert, 1);
   // also include an array-ish interface
-  rb_define_method(c_cpPolyShape   , "length"    , rb_cpPolyShapeGetNumVerts, 0);
-  rb_define_method(c_cpPolyShape   , "size"      , rb_cpPolyShapeGetNumVerts, 0);
-  rb_define_method(c_cpPolyShape   , "[]"        , rb_cpPolyShapeGetVert, 1);
-	
+  rb_define_method(c_cpPolyShape, "length", rb_cpPolyShapeGetNumVerts, 0);
+  rb_define_method(c_cpPolyShape, "size", rb_cpPolyShapeGetNumVerts, 0);
+  rb_define_method(c_cpPolyShape, "[]", rb_cpPolyShapeGetVert, 1);
+  // Not in API yet:
+  rb_define_method(c_cpPolyShape, "value_on_axis", rb_cpPolyShapeValueOnAxis, 2);
+  rb_define_method(c_cpPolyShape, "contains?", rb_cpPolyShapeContainsVert, 1);
+  rb_define_method(c_cpPolyShape, "contains_partial?", rb_cpPolyShapeContainsVertPartial, 2);
+
   /* Use a struct for this small class. More efficient. */
   c_cpSegmentQueryInfo = rb_struct_define("SegmentQueryInfo",
-                         "shape", "t", "n", NULL);
-  rb_define_const(m_Chipmunk, "SegmentQueryInfo", c_cpSegmentQueryInfo);   
-  
+                                          "shape", "t", "n", NULL);
+  rb_define_const(m_Chipmunk, "SegmentQueryInfo", c_cpSegmentQueryInfo);
+  /*"unsafe" API. */
+  rb_define_method(c_cpCircleShape, "set_radius!", rb_cpCircleShapeSetRadius, 1);
+  rb_define_method(c_cpCircleShape, "set_offset!", rb_cpCircleShapeSetOffset, 1);
+  rb_define_method(c_cpSegmentShape, "set_endpoints!", rb_cpSegmentShapeSetEndpoints, 2);
+  rb_define_method(c_cpSegmentShape, "set_radius!", rb_cpSegmentShapeSetRadius, 1);
+
+  rb_define_method(c_cpPolyShape, "set_verts!", rb_cpPolyShapeSetVerts, 2);
+
+  rb_define_method(m_cpShape, "collide!", rb_cpCollideShapes, 1);
+
 }
-// 
+//