Changeset 10379 in orxonox.OLD for trunk/src/story_entities/menu

Timestamp:

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

Author:

patrick

Message:

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

File:

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

trunk/src/story_entities/menu/game_menu.cc

@@ -110 +110 @@
   this->subscribeEvent(ES_MENU, SDLK_ESCAPE);
 
-  this->dataTank->localCamera->setRelCoor(this->cameraVector);
+  State::getCamera()->setRelCoor(this->cameraVector);
   //this->dataTank->localCamera->setFovy(60);
 
@@ -391 +391 @@
   Quaternion q(/*0.00005*/ dt * .1, Vector(0.0, 1.0, 0.0));
   this->cameraVector = q.apply(this->cameraVector);
-  this->dataTank->localCamera->setRelCoor(this->cameraVector);
-  this->dataTank->localCamera->getTarget()->setRelCoorSoft(0,0,0);
+  State::getCamera()->setRelCoor(this->cameraVector);
+  State::getCamera()->getTarget()->setRelCoorSoft(0,0,0);
 }