Changeset 5924

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

Location:

code/branches/core5/src

Files:

• libraries/core/GUIManager.h (modified) (1 diff)
• libraries/core/GraphicsManager.cc (modified) (1 diff)
• 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) (5 diffs)

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

@@ -102 +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
+        Ogre::Camera*                        camera_;           //!< Camera used to render the scene with the 
 
         static GUIManager*                   singletonPtr_s;    //!< Singleton reference to GUIManager

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

@@ -361 +361 @@
 
         // Render frame
-        ogreRoot_->_updateAllRenderTargets();
+        if( this->viewport_->getCamera() )
+            ogreRoot_->_updateAllRenderTargets();
 
         uint64_t timeAfterTick = time.getRealMicroseconds();

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 = this->getScene()->getCameraManager()->getActiveCamera();
-            if (activeCamera)
+            Camera* activeCamera = CameraManager::getInstance().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"
@@ -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

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

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

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

@@ -46 +46 @@
 #include "tools/BulletConversions.h"
 #include "Radar.h"
-#include "CameraManager.h"
 #include "worldentities/WorldEntity.h"
 
@@ -67 +66 @@
 
             this->radar_ = new Radar();
-            this->cameraManager_ = new CameraManager(this);
         }
         else
@@ -76 +74 @@
 
             this->radar_ = 0;
-            this->cameraManager_ = 0;
         }
 
@@ -98 +95 @@
         {
             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_;
@@ -109 +101 @@
             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(); }
@@ -100 +97 @@
             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 "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_);
     }