Changeset 5925 for code/branches/core5/src/orxonox

Timestamp:

Oct 9, 2009, 6:46:54 PM (15 years ago)

Author:

rgrieder

Message:

Reapplied some of the changes that got reverted in the last commit (including two fixes).

Location:

code/branches/core5/src/orxonox

Files:

• CameraManager.cc (modified) (6 diffs)
• graphics/Camera.cc (modified) (3 diffs)

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

@@ -51 +51 @@
         : viewport_(GraphicsManager::getInstance().getViewport())
     {
+        assert(GameMode::showsGraphics());
     }
 
@@ -60 +61 @@
     Camera* CameraManager::getActiveCamera() const
     {
-        if (this->cameraList_.size() > 0)
+        if (!this->cameraList_.empty())
             return this->cameraList_.front();
         else
@@ -68 +69 @@
     void CameraManager::requestFocus(Camera* camera)
     {
-        if (!GameMode::showsGraphics())
-            assert(0);
-
         // notify old camera (if it exists)
-        if (this->cameraList_.size() > 0)
+        if (!this->cameraList_.empty())
             this->cameraList_.front()->removeFocus();
 
@@ -78 +76 @@
 
         // make sure we don't add it twice
-        for (std::list<Camera*>::iterator it = this->cameraList_.begin(); it != this->cameraList_.end(); ++it)
+        for (std::list<Camera*>::iterator it = this->cameraList_.begin(); it != this->cameraList_.end();)
             if ((*it) == camera)
-                return;
-
+                this->cameraList_.erase(it++);
+            else
+                ++it;
         // add to list
         this->cameraList_.push_front(camera);
@@ -88 +87 @@
     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 +94 @@
 
             // set new focus if possible
-            if (this->cameraList_.size() > 0)
+            if (!this->cameraList_.empty())
                 this->cameraList_.front()->setFocus();
         }

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"
@@ -50 +51 @@
         RegisterObject(Camera);
 
+        if (!GameMode::showsGraphics())
+            ThrowException(AbortLoading, "Can't create Camera, no graphics.");
         if (!this->getScene())
             ThrowException(AbortLoading, "Can't create Camera, no scene.");
@@ -76 +79 @@
         if (this->isInitialized())
         {
-            if( GUIManager::getInstance().getCamera() == this->camera_ )
-                GUIManager::getInstance().setCamera( NULL );
+            if (GUIManager::getInstance().getCamera() == this->camera_)
+                GUIManager::getInstance().setCamera(NULL);
             this->releaseFocus();