Changeset 10618 in orxonox.OLD for trunk/src/story_entities/game_world.cc

Timestamp:

Apr 4, 2007, 12:13:53 PM (17 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/story_entities/game_world.cc (modified) (4 diffs)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/story_entities/game_world.cc

@@ -27 +27 @@
 
 #include "player.h"
-#include "camera.h"
-#include "environment.h"
-#include "terrain.h"
-#include "test_entity.h"
-#include "terrain.h"
+#include "tools/camera.h"
+#include "tools/cameraman.h"
+#include "environments/environment.h"
+#include "environments/terrain.h"
 #include "playable.h"
 #include "environments/mapped_water.h"
@@ -193 +192 @@
   this->dataXML = (TiXmlElement*)root->Clone();
 
-  //remove this after finished testing !!!!
-  //Object* obj= new Object();
-  //obj->setName("Obj");
-  //Account* a = new Account();
-  //a->setName("a");
-  //Account *b = new Account(30);
-  //b->setName("b");
-
-
   LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
 
@@ -454 +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)
@@ -590 +579 @@
 void GameWorld::applyCameraSettings()
 {
-  CameraMan* man = State::getCameraman();
-  Camera* c = man->getCurrentCam();
+  Camera* c = State::getCamera();
+
   if( c != NULL)
   {

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs