Changeset 10272 in orxonox.OLD for branches/camera/src/story_entities

Timestamp:

Jan 17, 2007, 6:16:08 PM (18 years ago)

Author:

gfilip

Message:

evrything finally solved

Location:

branches/camera/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• game_world_data.cc (modified) (3 diffs)

branches/camera/src/story_entities/game_world.cc

@@ -551 +551 @@
   State::getCamera()->apply ();
   State::getCamera()->project ();
-  //this->dataTank->localCamera->apply ();
-  //this->dataTank->localCamera->project ();
   GraphicsEngine::storeMatrices();
 }

branches/camera/src/story_entities/game_world_data.cc

@@ -30 +30 @@
 #include "player.h"
 #include "camera.h"
+#include "cameraman.h"
 #include "terrain.h"
 #include "skybox.h"
@@ -99 +100 @@
   PNode::getNullParent();
   Camera* localCamera = new Camera();
-  localCamera->setName ("GameWorld-Camera");
+    localCamera->setName ("GameWorld-Camera");
   State::setCamera(localCamera, localCamera->getTarget());
-
+  cameraman* camMan = new cameraman();
+  State::setCameraman(camMan);
   LightManager::getInstance();
 
@@ -332 +334 @@
   LoadParamXML(root, "GameRule", this, GameWorldData, loadGameRule);
 
-  LoadParam(root, "clip-region", State::getCamera(), Camera, setClipRegion);
+  LoadParam(root, "clip-region", State::getCameraman(), cameraman, setClipRegion);