Changeset 7945 in orxonox.OLD for branches/cr/src/world_entities/world_entity.cc

Timestamp:

May 29, 2006, 12:48:21 AM (18 years ago)

Author:

patrick

Message:

cr: collision objects handling

File:

• branches/cr/src/world_entities/world_entity.cc (modified) (4 diffs)

branches/cr/src/world_entities/world_entity.cc

@@ -33 +33 @@
 
 #include "collision_handle.h"
+#include "collision.h"
 
 #include <stdarg.h>
@@ -68 +69 @@
   this->objectListNumber = OM_INIT;
   this->objectListIterator = NULL;
+
+  // reset all collision handles to NULL == unsubscribed state
+  for(int i = 0; i < CREngine::CR_NUMBER; ++i)
+    this->collisionHandles[i] = NULL;
 
   this->toList(OM_NULL);
@@ -242 +247 @@
 void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, long target...)
 {
+  if( this->collisionHandles[type] != NULL)  {
+    PRINTF(2)("Registering for a CollisionReaction already subscribed to! Skipping\n");
+    return;
+  }
 
   this->collisionHandles[type] = CREngine::getInstance()->subscribeReaction(this, type);
@@ -257 +266 @@
  *  @param collisionEvent the event
  */
-void WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BouningVolume* bvA, BoundingVolume* bvB)
+bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
 {
   // create a collision event