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

Timestamp:

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

Author:

patrick

Message:

removed many very heavy segfaults

File:

• branches/coll_rect/src/lib/collision_reaction/cr_engine.cc (modified) (8 diffs)

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

@@ -66 +66 @@
       PRINTF(0)("CollisionReaction Error: CollisionEvent cache size missmatch: %i of %i\n", this->collisionEventsUnused.size(), CR_MAX_COLLISION_EVENTS);
 
-    this->flushCollisions();
+    this->reset();
 
     CollisionIterator it1 = this->collisionsUnused.begin();
@@ -121 +121 @@
       return this->collisionsUsed.back();
     }
-    else return NULL;
+    else
+    {
+      PRINTF(0)("There is no Collision Object left in the precache table, fatal error will cause segfault, change CR_MAX_COLLISIONS\n");
+      assert(false);
+      return NULL;
+    }
   }
 
@@ -136 +141 @@
       return this->collisionEventsUsed.back();
     }
-    else return NULL;
+    else
+    {
+      PRINTF(0)("There is no Collision Object left in the precache table, fatal error will cause segfault, change CR_MAX_COLLISION_EVENTS\n");
+      assert(false);
+      return NULL;
+    }
   }
 
@@ -147 +157 @@
     // for all collisions:
     CollisionIterator ci = CollisionTube::getInstance()->begin();
-    for(; ci < CollisionTube::getInstance()->end(); ++ci)
+    for(; ci < CollisionTube::getInstance()->end(); ci++)
     {
       for( int i = CREngine::CR_PHYSICS_MOMENTUM; i < CREngine::CR_NUMBER; i++)
@@ -153 +163 @@
         if( _reactionList[i] == NULL)
           continue;
+
+        assert((*ci)->getEntityA() != NULL && (*ci)->getEntityB() != NULL);
+
+        PRINTF(0)("CR CHECK: collision between: %s, %s\n", (*ci)->getEntityA()->getClassName().c_str(), (*ci)->getEntityB()->getClassName().c_str());
 
         // check if entity A or B is subscibed for this event
@@ -161 +175 @@
           PRINTF(0)("react to %i\n", i);
         }
-
-        (*ci)->reset();
       }
-    }
-
-    this->flushCollisions();
+      (*ci)->reset();
+    }
+
+    this->reset();
   }
 
@@ -173 +186 @@
    * flushes all the collision lists and puts them to their initial state
    */
-  void CREngine::flushCollisions()
+  void CREngine::reset()
   {
     CollisionIterator it1 = this->collisionsUsed.begin();
@@ -185 +198 @@
     this->collisionsUsed.clear();
     this->collisionEventsUsed.clear();
+
+    CollisionTube::getInstance()->reset();
   }