Changeset 5924 for code/branches/core5/src/orxonox/CameraManager.cc

Timestamp:

Oct 9, 2009, 6:04:16 PM (16 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/CameraManager.cc (modified) (6 diffs)

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

@@ -38 +38 @@
 #include "core/GUIManager.h"
 #include "core/ObjectList.h"
+#include "core/ScopedSingletonManager.h"
 #include "tools/Shader.h"
 #include "graphics/Camera.h"
@@ -44 +45 @@
 namespace orxonox
 {
-    CameraManager::CameraManager(BaseObject* creator)
-        : BaseObject(creator)
-        , viewport_(GraphicsManager::getInstance().getViewport())
-        , fallbackCamera_(NULL)
+    CameraManager* CameraManager::singletonPtr_s = 0;
+    ManageScopedSingleton(CameraManager, ScopeID::Graphics, false);
+
+    CameraManager::CameraManager()
+        : viewport_(GraphicsManager::getInstance().getViewport())
     {
-        assert(GameMode::showsGraphics());
     }
 
     CameraManager::~CameraManager()
     {
-        for (std::list<Camera*>::iterator it = this->cameraList_.begin(); it != this->cameraList_.end();)
-            if ((*it)->camera_ == GUIManager::getInstance().getCamera())
-                GUIManager::getInstance().setCamera(NULL);
-
-        if (this->fallbackCamera_)
-            this->getScene()->getSceneManager()->destroyCamera(this->fallbackCamera_);
+        GUIManager::getInstance().setCamera(0);
     }
 
     Camera* CameraManager::getActiveCamera() const
     {
-        if (!this->cameraList_.empty())
+        if (this->cameraList_.size() > 0)
             return this->cameraList_.front();
         else
@@ -72 +68 @@
     void CameraManager::requestFocus(Camera* camera)
     {
+        if (!GameMode::showsGraphics())
+            assert(0);
+
         // notify old camera (if it exists)
-        if (!this->cameraList_.empty())
+        if (this->cameraList_.size() > 0)
             this->cameraList_.front()->removeFocus();
 
@@ -79 +78 @@
 
         // make sure we don't add it twice
-        for (std::list<Camera*>::iterator it = this->cameraList_.begin(); it != this->cameraList_.end();)
+        for (std::list<Camera*>::iterator it = this->cameraList_.begin(); it != this->cameraList_.end(); ++it)
             if ((*it) == camera)
-                this->cameraList_.erase(it++);
-            else
-                ++it;
+                return;
 
         // add to list
@@ -91 +88 @@
     void CameraManager::releaseFocus(Camera* camera)
     {
+        if (!GameMode::showsGraphics())
+            assert(0);
+
         // notify the cam of releasing the focus
         if (!this->cameraList_.empty() && this->cameraList_.front() == camera)
@@ -98 +98 @@
 
             // set new focus if possible
-            if (!this->cameraList_.empty())
+            if (this->cameraList_.size() > 0)
                 this->cameraList_.front()->setFocus();
-            else
-            {
-                // there are no more cameras, create a fallback
-                if (!this->fallbackCamera_)
-                    this->fallbackCamera_ = camera->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
-                this->useCamera(this->fallbackCamera_);
-            }
         }
         else