Changeset 10525 for code/branches/core7

Timestamp:

Jun 4, 2015, 11:09:40 PM (9 years ago)

Author:

landauf

Message:

unload debug overly while unloading graphics

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• GraphicsManager.cc (modified) (2 diffs)
• GraphicsManager.h (modified) (1 diff)

code/branches/core7/src/libraries/core/Core.cc

@@ -361 +361 @@
         orxout(internal_info) << "unloading graphics in Core" << endl;
 
+        if (this->graphicsManager_)
+            this->graphicsManager_->unloadDebugOverlay();
+
         safeObjectDelete(&graphicsScope_);
         safeObjectDelete(&guiManager_);

code/branches/core7/src/libraries/core/GraphicsManager.cc

@@ -141 +141 @@
         orxout(internal_status) << "destroying GraphicsManager..." << endl;
 
-        Loader::getInstance().unload(debugOverlay_.get());
-
         Ogre::WindowEventUtilities::removeWindowEventListener(renderWindow_, ogreWindowEventListener_);
         ModifyConsoleCommand(__CC_printScreen_name).resetFunction();
@@ -332 +330 @@
         debugOverlay_.reset(new XMLFile("debug.oxo"));
         Loader::getInstance().load(debugOverlay_.get(), ClassTreeMask(), false);
+    }
+
+    void GraphicsManager::unloadDebugOverlay()
+    {
+        Loader::getInstance().unload(debugOverlay_.get());
     }
 

code/branches/core7/src/libraries/core/GraphicsManager.h

@@ -95 +95 @@
         void upgradeToGraphics();
         void loadDebugOverlay();
+        void unloadDebugOverlay();
         bool rendererLoaded() const { return renderWindow_ != NULL; }