Changeset 4918 in orxonox.OLD for orxonox/trunk/src/story_entities/world.cc

Timestamp:

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

Author:

patrick

Message:

orxonox/trunk: the CDEngine now knows the terrain

File:

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

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();
 }