Changeset 8215 in orxonox.OLD

Timestamp:

Jun 7, 2006, 9:24:25 PM (18 years ago)

Author:

patrick

Message:

bsp: integrated the collision checks

Location:

branches/bsp_model/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (3 diffs)
• lib/graphics/importer/bsp_manager.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (2 diffs)

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

@@ -99 +99 @@
 void CDEngine::checkCollisionGround(std::list<WorldEntity*>& list1)
 {
-
+  std::list<BaseObject*>::const_iterator bspIterator;
   std::list<WorldEntity*>::iterator entityIterator;
-  std::list<BaseObject*>::const_iterator bspIterator;
-  const std::list<BaseObject*>* list = ClassList::getList(CL_BSP_MODEL);
+  const std::list<BaseObject*>* bspList = ClassList::getList(CL_BSP_MODEL);
+  if( bspList == NULL)
+    return;
 
   // for all bsp managers check all entities
-  for( bspIterator = list->begin(); bspIterator != list->end(); bspIterator++) {
+  for( bspIterator = bspList->begin(); bspIterator != bspList->end(); bspIterator++) {
       for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
         static_cast<BspManager*>(*bspIterator)->checkCollision(*entityIterator);
@@ -122 +123 @@
   PRINT(0)("=  CDEngine: Spawning Tree: Finished\n");
   PRINT(0)("=======================================================\n");
-
 }
 
@@ -143 +143 @@
 }
 
+
 /**
  * this draws the debug spawn tree

branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

@@ -173 +173 @@
   this->outputFraction = 1.0f;
 
-#warning not here
-  this->checkCollision(State::getPlayer()->getPlayable());
-
-
   if ( viscluster < 0  || ((int *)(this->bspFile->header))[35] == 0 )  //!< if (sizeof(Visdata) == 0)
   {

branches/bsp_model/src/story_entities/game_world.cc

@@ -413 +413 @@
 void GameWorld::collisionDetection()
 {
+  // object-object collision detection
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
       this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
@@ -425 +426 @@
       this->dataTank->objectManager->getObjectList(OM_COMMON));
 
+  // ground collision detection: BSP Model
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_00));
 }