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

Timestamp:

Jan 26, 2007, 10:58:31 AM (19 years ago)

Author:

patrick

Message:

merged branche camera to trunk. resolved many conflicts as in the other projects too

File:

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

trunk/src/story_entities/game_world.cc

@@ -449 +449 @@
 
     /* update tick the rest */
-    this->dataTank->localCamera->tick(this->dtS);
+    State::getCamera()->tick(this->dtS);
     AnimationPlayer::getInstance()->tick(this->dtS);
     PhysicsEngine::getInstance()->tick(this->dtS);
@@ -578 +578 @@
 void GameWorld::applyCameraSettings()
 {
-  this->dataTank->localCamera->apply ();
-  this->dataTank->localCamera->project ();
+
+  State::getCamera()->apply ();
+  State::getCamera()->project ();
   GraphicsEngine::storeMatrices();
 }