Changeset 5924 for code/branches/core5/src/orxonox/graphics

Timestamp:

Oct 9, 2009, 6:04:16 PM (15 years ago)

Author:

scheusso

Message:

reverted r5911 partially and removed fallbackcamera
level scene now gets deleted after all when changing from level to mainmenu

File:

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

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

@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/GameMode.h"
+#include "core/GUIManager.h"
 #include "Scene.h"
 #include "CameraManager.h"
@@ -50 +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.");
@@ -78 +76 @@
         if (this->isInitialized())
         {
+            if( GUIManager::getInstance().getCamera() == this->camera_ )
+                GUIManager::getInstance().setCamera( NULL );
             this->releaseFocus();
 
@@ -120 +120 @@
     void Camera::requestFocus()
     {
-        this->getScene()->getCameraManager()->requestFocus(this);
+        CameraManager::getInstance().requestFocus(this);
     }
 
     void Camera::releaseFocus()
     {
-        this->getScene()->getCameraManager()->releaseFocus(this);
+        CameraManager::getInstance().releaseFocus(this);
     }
 
@@ -140 +140 @@
     {
         this->bHasFocus_ = true;
-        this->getScene()->getCameraManager()->useCamera(this->camera_);
+        CameraManager::getInstance().useCamera(this->camera_);
     }