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

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

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (2 diffs)
• game_world_data.cc (modified) (6 diffs)
• game_world_data.h (modified) (1 diff)
• menu/game_menu.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();
 }

trunk/src/story_entities/game_world_data.cc

@@ -30 +30 @@
 #include "player.h"
 #include "camera.h"
+#include "cameraman.h"
 #include "terrain.h"
 #include "skybox.h"
@@ -70 +71 @@
   this->glmis = NULL;
 
-  this->localCamera = NULL;
+
   this->localPlayer = NULL;
   this->sky = NULL;
@@ -98 +99 @@
 
   PNode::getNullParent();
-  this->localCamera = new Camera();
-  this->localCamera->setName ("GameWorld-Camera");
-  State::setCamera(this->localCamera, this->localCamera->getTarget());
-
+  Camera* localCamera = new Camera();
+    localCamera->setName ("GameWorld-Camera");
+  State::setCamera(localCamera, localCamera->getTarget());
+  CameraMan* camMan = new CameraMan();
+  State::setCameraman(camMan);
   LightManager::getInstance();
 
@@ -283 +285 @@
   State::setPlayer(NULL);
   this->localPlayer = NULL;
-  this->localCamera = NULL;
   State::setCamera(NULL, NULL);
   this->sky = NULL;
@@ -333 +334 @@
   LoadParamXML(root, "GameRule", this, GameWorldData, loadGameRule);
 
-  LoadParam(root, "clip-region", this->localCamera, Camera, setClipRegion);
+  LoadParam(root, "clip-region", State::getCameraman(), CameraMan, setClipRegion);
 
 
@@ -339 +340 @@
   //LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 
-  if( this->sky != NULL)
-    this->localCamera->addChild(this->sky);
-  OrxSound::SoundEngine::getInstance()->setListener(this->localCamera);
+
+  OrxSound::SoundEngine::getInstance()->setListener(State::getCamera());
 
   return ErrorMessage();

trunk/src/story_entities/game_world_data.h

@@ -56 +56 @@
     GLMenuImageScreen*            glmis;          //!< The Level-Loader Display
 
-    Camera*                       localCamera;    //!< The current camera
+
     Player*                       localPlayer;    //!< The player, you fly through the level.
     WorldEntity*                  sky;            //!< The environmental sky of orxonox

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