Changeset 7966 in orxonox.OLD for branches/cr/src/lib/collision_reaction/collision_handle.cc

Timestamp:

May 30, 2006, 1:10:11 AM (19 years ago)

Author:

patrick

Message:

cr: collision registration processes

File:

• branches/cr/src/lib/collision_reaction/collision_handle.cc (modified) (3 diffs)

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

@@ -73 +73 @@
 
 /**
+ * registers a new Collision Object
+ */
+Collision* CollisionHandle::registerCollision(WorldEntity* entityA, WorldEntity* entityB)
+{
+  // get the new collision object
+  Collision* c = CREngine::getInstance()->popCollisionObject();
+
+  c->collide(collisionEvent->getEntityA(), collisionEvent->getEntityB());
+  this->collisionList.push_back(c);
+}
+
+
+/**
  * this is the function to be called on a collision event for this handle
  *  @param collision the collision objects containing all collision informations
@@ -81 +94 @@
   if( this->collisionList.empty())
   {
-    Collision* c = CREngine::getInstance()->popCollisionObject();
-    c->collide(collisionEvent->getEntityA(), collisionEvent->getEntityB());
-    this->collisionList.push_back(c);
+    return;
   }
+
   if( ((this->collisionList.back())->getEntityA() == collisionEvent->getEntityA()) &&
         ((this->collisionList.back())->getEntityB() == collisionEvent->getEntityB()))
@@ -90 +102 @@
     (this->collisionList.back())->registerCollisionEvent(collisionEvent);
   }
+}
 
-  //this->collisionList.push_back(collisionEvent);
-}
 
 /**