Changeset 8490 in orxonox.OLD for trunk/src/story_entities/game_world.cc

Timestamp:

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

Author:

patrick

Message:

merged the bsp branche back to trunk

File:

• trunk/src/story_entities/game_world.cc (modified) (3 diffs)

trunk/src/story_entities/game_world.cc

@@ -299 +299 @@
     /* process time */
     this->tick ();
+
     /* collision detection */
     this->collisionDetection ();
     /* collision reaction */
     this->collisionReaction ();
+
     /* update the state */
     this->update ();
+
     /* check the game rules */
     this->checkGameRules();
@@ -434 +437 @@
 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));
@@ -446 +450 @@
       this->dataTank->objectManager->getObjectList(OM_COMMON));
 
+  // ground collision detection: BSP Model
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_01));
 }