Changeset 8490 in orxonox.OLD for trunk/src/lib/collision_detection

Timestamp:

Jun 15, 2006, 9:34:48 PM (19 years ago)

Author:

patrick

Message:

merged the bsp branche back to trunk

File:

• trunk/src/lib/collision_detection/cd_engine.cc (modified) (5 diffs)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -20 +20 @@
 #include "debug.h"
 
+#include "class_list.h"
+
 #include "model.h"
 #include "world_entity.h"
@@ -30 +32 @@
 
 #include "bsp_manager.h"
+#include "bsp_entity.h"
 
 using namespace std;
@@ -97 +100 @@
 void CDEngine::checkCollisionGround(std::list<WorldEntity*>& list1)
 {
-  if( likely( this->terrain != NULL))
-  {
-//    Quadtree* q = dynamic_cast<Terrain*>(this->terrain)->ssp->getQuadtree();
-//    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
-  }
 
-  if( likely( this->bspManager != NULL))
-  {
-    std::list<WorldEntity*>::iterator iterator;
-    PRINTF(3)("checking for collisions\n");
+  std::list<BaseObject*>::const_iterator bspIterator;
+  std::list<WorldEntity*>::iterator entityIterator;
+  const std::list<BaseObject*>* bspList = ClassList::getList(CL_BSP_ENTITY);
+  if( bspList == NULL)
+    return;
 
-    iterator = list1.begin();
-    while (iterator != list1.end())
-    {
-      bspManager->checkCollision(*iterator);
-      iterator++;
-    }
+  // for all bsp managers check all entities
+  for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
+      for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
+      {
+//         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassName());
+        (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
+      }
   }
 }
@@ -128 +128 @@
   PRINT(0)("=  CDEngine: Spawning Tree: Finished\n");
   PRINT(0)("=======================================================\n");
-
 }
 
@@ -149 +148 @@
 }
 
+
 /**
  * this draws the debug spawn tree