Changeset 10379 in orxonox.OLD for trunk/src/story_entities/game_world_data.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_data.cc (modified) (6 diffs)

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