Changeset 2908 for code/branches/questsystem5/src/orxonox/CameraManager.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/CameraManager.cc (modified) (5 diffs, 1 prop)

code/branches/questsystem5/src/orxonox/CameraManager.cc

@@ -35 +35 @@
 #include <OgreResource.h>
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/Iterator.h"
 #include "objects/worldentities/Camera.h"
@@ -41 +41 @@
 #include "tools/Shader.h"
 #include "util/String.h"
-#include "gui/GUIManager.h"
 
 namespace orxonox
@@ -75 +74 @@
     void CameraManager::requestFocus(Camera* camera)
     {
-        if (!GameMode::showsGraphics())
+        if (!Core::showsGraphics())
             return;
 
@@ -100 +99 @@
     void CameraManager::releaseFocus(Camera* camera)
     {
-        if (!GameMode::showsGraphics())
+        if (!Core::showsGraphics())
             return;
 
@@ -142 +141 @@
 
         this->viewport_->setCamera(camera);
-        GUIManager::getInstance().setCamera(camera);
 
         // reactivate all visible compositors