Changeset 10593 in orxonox.OLD for branches/cleanup/src/story_entities

Timestamp:

Feb 14, 2007, 7:27:23 PM (18 years ago)

Author:

snellen

Message:

cleaned up the cameramanager, commented all functions, corrected spelling mistakes

Location:

branches/cleanup/src/story_entities

Files:

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

branches/cleanup/src/story_entities/game_world.cc

@@ -444 +444 @@
 
     // tick camera first
-    CameraMan* man = State::getCameraman();
-    (man->getCurrentCam())->tick(this->dtS);
+    (State::getCamera())->tick(this->dtS);
     // TICK everything
     for (i = 0; i < this->dataTank->tickLists.size(); ++i)
@@ -580 +579 @@
 void GameWorld::applyCameraSettings()
 {
-  CameraMan* man = State::getCameraman();
-  Camera* c = man->getCurrentCam();
+  Camera* c = State::getCamera();
+
   if( c != NULL)
   {

branches/cleanup/src/story_entities/game_world_data.cc

@@ -101 +101 @@
   PNode::getNullParent();
   Camera* localCamera = new Camera();
-    localCamera->setName ("GameWorld-Camera");
+    localCamera->setName ("GameWorldCamera");
   State::setCamera(localCamera, localCamera->getTarget());
   //CameraMan* camMan = new CameraMan();