Changeset 5911 for code/branches/core5/src/libraries/core

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/libraries/core

Files:

• GUIManager.cc (modified) (2 diffs)
• GUIManager.h (modified) (2 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