Changeset 5911 for code/branches

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.

Location:

code/branches/core5/src

Files:

• libraries/core/GUIManager.cc (modified) (2 diffs)
• libraries/core/GUIManager.h (modified) (2 diffs)
• modules/objects/Planet.cc (modified) (2 diffs)
• orxonox/CameraManager.cc (modified) (6 diffs)
• orxonox/CameraManager.h (modified) (3 diffs)
• orxonox/Scene.cc (modified) (5 diffs)
• orxonox/Scene.h (modified) (2 diffs)
• orxonox/graphics/Camera.cc (modified) (4 diffs)

code/branches/core5/src/libraries/core/GUIManager.cc

@@ -101 +101 @@
         : renderWindow_(renderWindow)
         , resourceProvider_(0)
+        , camera_(NULL)
     {
         using namespace CEGUI;
@@ -174 +175 @@
     void GUIManager::setCamera(Ogre::Camera* camera)
     {
+        this->camera_ = camera;
         if (camera == NULL)
             this->guiRenderer_->setTargetSceneManager(0);

code/branches/core5/src/libraries/core/GUIManager.h

@@ -71 +71 @@
 
         void setCamera(Ogre::Camera* camera);
+        Ogre::Camera* getCamera() { return this->camera_; }
 
         static GUIManager* getInstancePtr() { return singletonPtr_s; }
@@ -101 +102 @@
         CEGUI::Logger*                       ceguiLogger_;      //!< CEGUI's logger to be able to log CEGUI errors in our log
         std::map<std::string, PlayerInfo*>   players_;          //!< Stores the player (owner) for each gui
+        Ogre::Camera*                        camera_;           //!< Camera used to render the scene with the GUI
 
         static GUIManager*                   singletonPtr_s;    //!< Singleton reference to GUIManager

code/branches/core5/src/modules/objects/Planet.cc

@@ -47 +47 @@
      * @brief Constructor
      */
-    Planet::Planet(BaseObject* creator): MovableEntity(creator)
+    Planet::Planet(BaseObject* creator) : MovableEntity(creator)
     {
         RegisterObject(Planet);
@@ -64 +64 @@
     void Planet::tick(float dt)
     {
-        if(!this->isVisible())
+        if (!this->isVisible())
             return;
 
         if (GameMode::showsGraphics())
         {
-            Camera* activeCamera = CameraManager::getInstance().getActiveCamera();
-            if(activeCamera)
+            Camera* activeCamera = this->getScene()->getCameraManager()->getActiveCamera();
+            if (activeCamera)
             {
                 float distance = this->getPosition().distance( activeCamera->getWorldPosition() );

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"
@@ -45 +44 @@
 namespace orxonox
 {
-    CameraManager* CameraManager::singletonPtr_s = 0;
-    ManageScopedSingleton(CameraManager, ScopeID::Graphics, false);
-
-    CameraManager::CameraManager()
-        : viewport_(GraphicsManager::getInstance().getViewport())
+    CameraManager::CameraManager(BaseObject* creator)
+        : BaseObject(creator)
+        , viewport_(GraphicsManager::getInstance().getViewport())
+        , fallbackCamera_(NULL)
     {
-        this->fallbackCamera_ = 0;
+        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->fallbackCameraScene_->getSceneManager()->destroyCamera(this->fallbackCamera_);
-        GUIManager::getInstance().setCamera(0);
+            this->getScene()->getSceneManager()->destroyCamera(this->fallbackCamera_);
     }
 
     Camera* CameraManager::getActiveCamera() const
     {
-        if (this->cameraList_.size() > 0)
+        if (!this->cameraList_.empty())
             return this->cameraList_.front();
         else
@@ -71 +72 @@
     void CameraManager::requestFocus(Camera* camera)
     {
-        if (!GameMode::showsGraphics())
-            return;
-
         // notify old camera (if it exists)
-        if (this->cameraList_.size() > 0)
+        if (!this->cameraList_.empty())
             this->cameraList_.front()->removeFocus();
-        else if (this->fallbackCamera_)
-        {
-            this->fallbackCameraScene_->getSceneManager()->destroyCamera(this->fallbackCamera_);
-            this->fallbackCamera_ = 0;
-        }
 
         camera->setFocus();
 
         // 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
@@ -96 +91 @@
     void CameraManager::releaseFocus(Camera* camera)
     {
-        if (!GameMode::showsGraphics())
-            return;
-
         // notify the cam of releasing the focus
-        if (this->cameraList_.front() == camera)
+        if (!this->cameraList_.empty() && this->cameraList_.front() == camera)
         {
             camera->removeFocus();
@@ -106 +98 @@
 
             // set new focus if possible
-            if (this->cameraList_.size() > 0)
+            if (!this->cameraList_.empty())
                 this->cameraList_.front()->setFocus();
             else
@@ -112 +104 @@
                 // there are no more cameras, create a fallback
                 if (!this->fallbackCamera_)
-                {
-                    this->fallbackCameraScene_ = camera->getScene();
-                    this->fallbackCamera_ = this->fallbackCameraScene_->getSceneManager()->createCamera(getUniqueNumberString());
-                }
+                    this->fallbackCamera_ = camera->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
                 this->useCamera(this->fallbackCamera_);
             }
         }
         else
-        {
             this->cameraList_.remove(camera);
-        }
     }
 

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

@@ -41 +41 @@
 #include <list>
 #include "util/OgreForwardRefs.h"
-#include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
-#include "core/SmartPtr.h"
+#include "core/BaseObject.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport CameraManager : public Singleton<CameraManager>, public OrxonoxClass
+    class _OrxonoxExport CameraManager : public BaseObject
     {
-            friend class Singleton<CameraManager>;
         public:
-            CameraManager();
+            CameraManager(BaseObject* creator);
             ~CameraManager();
 
@@ -61 +58 @@
             void useCamera(Ogre::Camera* camera);
 
-            static CameraManager* getInstancePtr() { return singletonPtr_s; }
-
         private:
             CameraManager(const CameraManager&); // don't use
@@ -69 +64 @@
             Ogre::Viewport*       viewport_;
             Ogre::Camera*         fallbackCamera_;
-            SmartPtr<Scene>       fallbackCameraScene_;
-
-            static CameraManager* singletonPtr_s;
     };
 }

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

@@ -45 +45 @@
 #include "tools/BulletConversions.h"
 #include "Radar.h"
+#include "CameraManager.h"
 #include "worldentities/WorldEntity.h"
 
@@ -65 +66 @@
 
             this->radar_ = new Radar();
+            this->cameraManager_ = new CameraManager(this);
         }
         else
@@ -73 +75 @@
 
             this->radar_ = 0;
+            this->cameraManager_ = 0;
         }
 
@@ -94 +97 @@
         {
             if (GameMode::showsGraphics())
+            {
+                // Check whether we're still using this scene manager for the GUI
+                if (GUIManager::getInstance().getCamera() && GUIManager::getInstance().getCamera()->getSceneManager() == this->sceneManager_)
+                    GUIManager::getInstance().setCamera(NULL);
                 Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
+            }
             else
                 delete this->sceneManager_;
@@ -100 +108 @@
             if (this->radar_)
                 this->radar_->destroy();
+
+            if (this->cameraManager_)
+                this->cameraManager_->destroy();
 
             this->setPhysicalWorld(false);

code/branches/core5/src/orxonox/Scene.h

@@ -73 +73 @@
             inline Radar* getRadar()
                 { return this->radar_; }
+
+            inline CameraManager* getCameraManager()
+                { return this->cameraManager_.get(); }
             
             inline virtual uint32_t getSceneID() const { return this->getObjectID(); }
@@ -97 +100 @@
             bool                     bShadows_;
             Radar*                   radar_;
+            SmartPtr<CameraManager>  cameraManager_;
 
 

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_);
     }