Changeset 7969 in orxonox.OLD for branches/cr

Timestamp:

May 30, 2006, 1:33:09 AM (19 years ago)

Author:

patrick

Message:

cr: collision and collision events should now be registered correctly

Location:

branches/cr/src

Files:

• lib/collision_reaction/collision_handle.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (6 diffs)

branches/cr/src/lib/collision_reaction/collision_handle.cc

@@ -120 +120 @@
 void CollisionHandle::handleCollisions()
 {
-
-  // collision reaction calculations
+  // collision reaction calculations (for every collision there will be a reaction)
+  vector<Collision*>::iterator it = this->collisionList.begin();
+  for(; it < this->collisionList.end(); it++)
+  {
+    (*it)->handleCollisionEvents();
+  }
 
   // now set state to dispatched

branches/cr/src/world_entities/world_entity.cc

@@ -33 +33 @@
 
 #include "collision_handle.h"
-#include "collision.h"
+#include "collision_event.h"
 
 #include <stdarg.h>
@@ -73 +73 @@
   for(int i = 0; i < CREngine::CR_NUMBER; ++i)
     this->collisionHandles[i] = NULL;
+  this->bReactive = false;
 
   this->toList(OM_NULL);
@@ -280 +281 @@
   this->collisionHandles[type] = NULL;
 
-  //
+  // check if there is still any handler registered
+  for(int i = 0; i < CREngine::CR_NUMBER; ++i)
+  {
+    if( this->collisionHandles[i] != NULL)
+    {
+      this->bReactive = true;
+      return;
+    }
+  }
+  this->bReactive = false;
 }
 
@@ -292 +302 @@
     this->unsubscribeReaction((CREngine::CRType)i);
 
+  // there are no reactions subscribed from now on
   this->bReactive = false;
 }
@@ -302 +313 @@
 bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
 {
+  // is there any handler listening?
+  if( !this->bReactive)
+    return false;
+
   PRINTF(0)("Registering Collision: %s vs %s \n", entityA->getClassName(), entityB->getClassName());
   // create a collision event
-  Collision* c = CREngine::getInstance()->popCollisionObject();
+  CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL);
   c->collide(entityA, entityB, bvA, bvB);
@@ -310 +325 @@
   for(int i = 0; i < CREngine::CR_NUMBER; ++i)
     if( this->collisionHandles[i] != NULL)
-      this->collisionHandles[i]->registerCollision(c);
+      this->collisionHandles[i]->registerCollisionEvent(c);
 }