Changeset 10006 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/collision_tube.cc

Timestamp:

Dec 4, 2006, 2:24:40 PM (17 years ago)

Author:

patrick

Message:

removed many very heavy segfaults

File:

• branches/coll_rect/src/lib/collision_reaction/collision_tube.cc (modified) (4 diffs)

branches/coll_rect/src/lib/collision_reaction/collision_tube.cc

@@ -27 +27 @@
 #include "cr_physics_full_walk.h"
 
+#include "debug.h"
 
 
@@ -52 +53 @@
   CollisionTube::~CollisionTube ()
   {
+    this->reset();
+  }
+
+
+
+  /**
+   * resets the collision tube after each collision detection cycle
+   */
+  void CollisionTube::reset()
+  {
     this->_collisionList.clear();
+  }
+
+
+  /**
+   * gets the collision object useable for collision events registarations
+   * @param entityA collision partner 1
+   * @param entityB collision partner 2
+   * @return the collision object to be used
+   */
+  Collision* CollisionTube::registerCollision(WorldEntity* entityA, WorldEntity* entityB)
+  {
+    assert( entityA != NULL && entityB != NULL);
+
+    Collision* collision = NULL;
+    if( !this->_collisionList.empty())
+      collision = this->_collisionList.back();
+
+    // check if there is already a collision defined between these objects or this is the first collision at all
+    if( collision == NULL || !collision->same(*entityA, *entityB))
+    {
+      collision = CREngine::getInstance()->popCollisionObject();
+      collision->collide( entityA, entityB);
+      this->_collisionList.push_back(collision);
+    }
+
+    return collision;
   }
 
@@ -67 +104 @@
   void CollisionTube::registerCollisionEvent(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
   {
-    Collision* collision = NULL;
-    if( !this->_collisionList.empty())
-      collision = this->_collisionList.back();
-
-    // check if there is already a collision defined between these objects or this is the first collision at all
-    if( collision == NULL || !collision->match(*entityA, *entityB))
-    {
-      collision = CREngine::getInstance()->popCollisionObject();
-      collision->collide( entityA, entityB);
-    }
+    // first get a useable collision object
+    Collision* collision = this->registerCollision(entityA, entityB);
 
     // now register the new collision event
@@ -95 +124 @@
    */
   void CollisionTube::registerCollisionEvent(CREngine::CollisionType type, WorldEntity* entity, WorldEntity* groundEntity,
-                              const Vector& normal, const Vector& position, bool bInWall)
+      const Vector& normal, const Vector& position, bool bInWall)
   {
-    // get last collision
-    Collision* collision = NULL;
-    if( !this->_collisionList.empty())
-      collision = this->_collisionList.back();
-
-    // check if there is already a collision defined between these objects
-    if( collision == NULL || !collision->match(*entity, *groundEntity))
-    {
-      // get a new collision object
-      collision = CREngine::getInstance()->popCollisionObject();
-      collision->collide( entity, groundEntity);
-    }
+    // first get a useable collision object
+    Collision* collision = this->registerCollision(entity, groundEntity);
 
     // now register the new collision event