Initial support for btCompoundShape and the infrastructure required to accomodate multiple meshes per collision model,

added prototype files for signals

1 files changed, 12 insertions, 4 deletions

diff --git a/src/core/entity.h b/src/core/entity.h
index 54849b7..a356525 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -57,6 +57,9 @@ public:
 
 	/// entity menus collection typedef
 	typedef std::list<MenuDescription *> Menus;
+	
+	/// type definition for entity bullet shapes collection
+	typedef std::list<btCollisionShape *> CollisionShapes;
 
 	/// create a new entity and add it to the registry
 	Entity();
@@ -164,8 +167,8 @@ public:
 	}
 	
 	/// physics collision shape
-	inline btCollisionShape *collision_shape() {
-		return entity_collision_shape;
+	inline CollisionShapes collision_shapes() {
+		return entity_collision_shapes;
 	}
 	
 	/// indicates a server-side entity
@@ -192,6 +195,11 @@ public:
 	inline Menus &menus() {
 		return entity_menus;
 	}
+	
+	/// entity collision shapes
+	inline CollisionShapes & shapes() {
+		return entity_collision_shapes;
+	}
 
 	/// extensions
 	inline Extension *extension(size_t type) const {
@@ -445,9 +453,9 @@ public:
 protected:
 	btRigidBody					*entity_body;
 	btRigidBody::btRigidBodyConstructionInfo	*entity_body_info;
-	btCollisionShape				*entity_collision_shape;
+	CollisionShapes					entity_collision_shapes;
 
-		// the zone the entity belongs to
+	// the zone the entity belongs to
 	Zone*			entity_zone;
 	// the previous zone the entity belonged too
 	Zone*			entity_oldzone;