Changeset 5911 for code/branches/core5/src/orxonox/graphics/Camera.cc

Timestamp:

Oct 8, 2009, 10:56:29 PM (15 years ago)

Author:

rgrieder

Message:

Fixed CameraManager issue with the fallback scene by assigning each Scene a CameraManager directly.
Use this→getScene()→getCameraManager() to get the camera manager.

File:

• code/branches/core5/src/orxonox/graphics/Camera.cc (modified) (4 diffs)

code/branches/core5/src/orxonox/graphics/Camera.cc

@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/GameMode.h"
 #include "Scene.h"
 #include "CameraManager.h"
@@ -49 +50 @@
         RegisterObject(Camera);
 
+        if (!GameMode::showsGraphics())
+            ThrowException(AbortLoading, "Can't create Camera, no graphics.");
         if (!this->getScene())
             ThrowException(AbortLoading, "Can't create Camera, no scene.");
@@ -117 +120 @@
     void Camera::requestFocus()
     {
-        CameraManager::getInstance().requestFocus(this);
+        this->getScene()->getCameraManager()->requestFocus(this);
     }
 
     void Camera::releaseFocus()
     {
-        CameraManager::getInstance().releaseFocus(this);
+        this->getScene()->getCameraManager()->releaseFocus(this);
     }
 
@@ -137 +140 @@
     {
         this->bHasFocus_ = true;
-        CameraManager::getInstance().useCamera(this->camera_);
+        this->getScene()->getCameraManager()->useCamera(this->camera_);
     }