Changeset 4918 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 21, 2005, 12:37:46 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the CDEngine now knows the terrain

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/collision_detection/cd_engine.h (modified) (3 diffs)
• lib/graphics/spatial_separation/quadtree_node.cc (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -61 +61 @@
 void CDEngine::checkCollisions()
 {
-  this->checkCollisionObjects();
+  //this->checkCollisionObjects();
   this->checkCollisionGround();
 }

orxonox/trunk/src/lib/collision_detection/cd_engine.h

@@ -15 +15 @@
 class WorldEntity;
 class OBBTree;
+class Terrain;
 
 
@@ -45 +46 @@
 
   inline void setEntityList(tList<WorldEntity>* entityList) { this->entityList = entityList; }
+  inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
 
   void drawBV(int depth, int drawMode) const;
@@ -68 +70 @@
   tList<WorldEntity>*     entityList;                       //!< pointer to the world entity list
   OBBTree*                rootTree;                         //!< for testing purposes a root tree
+
+  Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
 };
 

orxonox/trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -362 +362 @@
 void QuadtreeNode::drawTree(int depth, int drawMode) const
 {
-  printf("this = %p\n", this);
   if( this->treeDepth == this->maxDepth)
   {

orxonox/trunk/src/story_entities/world.cc

@@ -276 +276 @@
 
   GraphicsEngine::getInstance()->displayFPS(true);
+
+  CDEngine::getInstance()->setEntityList( this->entities);
 }
 
@@ -377 +379 @@
           if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
-          if( element->Value() != NULL && !strcmp( element->Value(), "Terrain")) terrain = (Terrain*) created;
+          if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
+          {
+            terrain = (Terrain*) created;
+            CDEngine::getInstance()->setTerrain(terrain);
+          }
           element = element->NextSiblingElement();
           glmis->step(); //! @todo temporary
@@ -949 +955 @@
 void World::collide()
 {
-
+  CDEngine::getInstance()->checkCollisions();
 }