Changeset 5924 for code/branches/core5/src/libraries

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

Files:

• GUIManager.h (modified) (1 diff)
• GraphicsManager.cc (modified) (1 diff)

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();