Changeset 10355 in orxonox.OLD for branches/ODE/src/lib/collision_detection

Timestamp:

Jan 24, 2007, 8:48:26 PM (18 years ago)

Author:

bottac

Message:

Here comes the updated version.

Location:

branches/ODE

Files:

• . (copied) (copied from trunk)
• src/lib/collision_detection/cd_engine.cc (modified) (4 diffs)

branches/ODE/src/lib/collision_detection/cd_engine.cc

@@ -68 +68 @@
 void CDEngine::checkCollisions(ObjectManager::EntityList& list1, ObjectManager::EntityList& list2)
 {
+
+
   BVTree* tree;
   ObjectManager::EntityList::iterator entity1, entity2, pre1, pre2;
@@ -84 +86 @@
         if( likely((*entity2) != this->terrain))
         {
+          
           PRINTF(5)("checking object %s (%s) against %s (%s)\n",
-            (*entity1)->getClassCName(), (*entity1)->getCName(), (*entity2)->getClassCName(), (*entity2)->getCName());
+           (*entity1)->getClassCName(), (*entity1)->getCName(), (*entity2)->getClassCName(), (*entity2)->getCName());
+          #ifndef WITH_ODE
           tree = (*entity1)->getOBBTree();
           if( likely(tree != NULL) && (*entity2)->getOBBTree() != NULL)
-            tree->collideWith(*entity1, *entity2);
+          tree->collideWith(*entity1, *entity2);
+          #endif
+                (*entity1)->checkCollision(*entity2);
+        
+         
         }
       }
@@ -102 +110 @@
 {
   std::list<WorldEntity*>::iterator entityIterator;
+        
+for( ObjectList<Terrain>::const_iterator bspIterator = Terrain::objectList().begin();
+       bspIterator != Terrain::objectList().end();
+       bspIterator++) {
+   for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
+      {
+                PRINTF(5)("Checking %s against: %s\n", ((dynamic_cast<Terrain*>(*bspIterator)))->getCName(),    (*entityIterator)->getClassCName());
+        (dynamic_cast<Terrain*>(*bspIterator))->checkCollision(*entityIterator);
+      }
+ }
+        
   // for all bsp managers check all entities
   for( ObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
@@ -108 +127 @@
       for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
       {
-//         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassCName());
+       //  PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getCName(), (*entityIterator)->getClassCName());
         (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
       }
+   
   }
+ 
 }