Changeset 7879 for code/trunk/src/orxonox

Timestamp:

Feb 13, 2011, 9:35:47 PM (14 years ago)

Author:

landauf

Message:

moved compositor unloading to avoid crashes in rare cases
disabled compositor unloading for Ogre 1.7.0+ which fixes some issues with shaders

I'm unsure if this belongs into GSLevel anyway, since it's resource related and removeAll() requires quite some attention to be called in the right place.

Location:

code/trunk/src/orxonox

Files:

• CameraManager.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)

code/trunk/src/orxonox/CameraManager.cc

@@ -107 +107 @@
         // Last known Ogre version needing this workaround:
         // 1.4.8
+        // 1.7.2
 
         // deactivate all compositors

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -111 +111 @@
     {
         if (GameMode::showsGraphics())
-        {
+            InputManager::getInstance().leaveState("game");
+
+        // disconnect all HumanPlayers
+        PlayerManager::getInstance().disconnectAllClients();
+
+        if (GameMode::isMaster())
+            this->unloadLevel();
+
+        if (GameMode::showsGraphics())
+        {
+#if OGRE_VERSION < 0x010700
             // unload all compositors (this is only necessary because we don't yet destroy all resources!)
             Ogre::CompositorManager::getSingleton().removeAll();
-
-            InputManager::getInstance().leaveState("game");
-        }
-
-        // disconnect all HumanPlayers
-        PlayerManager::getInstance().disconnectAllClients();
-
-        if (GameMode::isMaster())
-            this->unloadLevel();
-
-        if (GameMode::showsGraphics())
-        {
+#endif
+
             gameInputState_->setHandler(0);
             guiMouseOnlyInputState_->setHandler(0);