Changeset 3196 for code/trunk/src/orxonox/GraphicsManager.cc

Timestamp:

Jun 20, 2009, 9:20:47 AM (15 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/GraphicsManager.cc (modified) (4 diffs)

code/trunk/src/orxonox/GraphicsManager.cc

@@ -52 +52 @@
 
 #include "SpecialConfig.h"
-#include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/String.h"
@@ -63 +62 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "tools/WindowEventListener.h"
 #include "tools/ParticleInterface.h"
+#include "interfaces/WindowEventListener.h"
+
+// HACK!
+#include "overlays/map/Map.h"
 
 namespace orxonox
@@ -88 +90 @@
         , viewport_(0)
         , ogreWindowEventListener_(0)
-        , avgTickTime_(0.0f)
-        , avgFramesPerSecond_(0.0f)
     {
         RegisterObject(GraphicsManager);
@@ -144 +144 @@
 //            Ogre::RenderSystem* renderer = this->ogreRoot_->getRenderSystem();
 //            renderer->destroyRenderWindow("Orxonox");
+
+            // HACK! This fixes an exit crash
+            Map::hackDestroyMap();
 
             // unload all compositors