Changeset 5677 for code/branches/resource3/src/orxonox/gamestates

Timestamp:

Aug 24, 2009, 3:03:44 PM (15 years ago)

Author:

rgrieder

Message:

Merged most of revision 5614 and its fixes from revisions 5628, 5658, 5662 and 5670:

• Creating Ogre::Root in non graphics mode as well. This allows to always make use of the ResourceGroupManager.
• Switched to smart pointers for the destruction code in GraphicsManager

File:

• code/branches/resource3/src/orxonox/gamestates/GSLevel.cc (modified) (2 diffs)

code/branches/resource3/src/orxonox/gamestates/GSLevel.cc

@@ -29 +29 @@
 
 #include "GSLevel.h"
+
+#include <OgreCompositorManager.h>
 
 #include "core/input/InputManager.h"
@@ -170 +172 @@
 */
 
+        if (GameMode::showsGraphics())
+        {
+            // unload all compositors (this is only necessary because we don't yet destroy all resources!)
+            Ogre::CompositorManager::getSingleton().removeAll();
+        }
 
         // this call will delete every BaseObject!