Changeset 3172 for code/branches

Timestamp:

Jun 14, 2009, 9:04:31 PM (15 years ago)

Author:

rgrieder

Message:

Hack-fixed exit crash: The Map stores a static MaterialPtr that gets destroyed after main and therefore after delete Ogre::Root.
This is no real solution because the Map destructor isn't even called at all, so I had to place a call in the GraphicsManager.

Location:

code/branches/pch/src/orxonox

Files:

• GraphicsManager.cc (modified) (2 diffs)
• overlays/map/Map.cc (modified) (1 diff)
• overlays/map/Map.h (modified) (1 diff)

code/branches/pch/src/orxonox/GraphicsManager.cc

@@ -66 +66 @@
 #include "tools/ParticleInterface.h"
 
+// HACK!
+#include "overlays/map/Map.h"
+
 namespace orxonox
 {
@@ -142 +145 @@
 //            Ogre::RenderSystem* renderer = this->ogreRoot_->getRenderSystem();
 //            renderer->destroyRenderWindow("Orxonox");
+
+            // HACK! This fixes an exit crash
+            Map::hackDestroyMap();
 
             // unload all compositors

code/branches/pch/src/orxonox/overlays/map/Map.cc

@@ -402 +402 @@
     }
 
+    // HACK!
+    void Map::hackDestroyMap()
+    {
+        Map::OverlayMaterial_.setNull();
+    }
+
     void Map::tick(float dt)
     {

code/branches/pch/src/orxonox/overlays/map/Map.h

@@ -52 +52 @@
 
         static void openMap();
+        // HACK!
+        static void hackDestroyMap();
 
 //Not yet implemented