Changeset 8423 for code/trunk/src/libraries/core/GraphicsManager.cc

Timestamp:

May 9, 2011, 5:06:49 AM (13 years ago)

Author:

rgrieder

Message:

Added and incorporated new class DestructionHelper: instead of doing the destruction of certain singletons implicitly via scoped_ptrs and ScopeGuards, use a method named destroy() that essentially achieves the same, but makes the destruction sequence obvious.

File:

• code/trunk/src/libraries/core/GraphicsManager.cc (modified) (7 diffs)

code/trunk/src/libraries/core/GraphicsManager.cc

@@ -94 +94 @@
     GraphicsManager* GraphicsManager::singletonPtr_s = 0;
 
-    /**
-    @brief
-        Non-initialising constructor.
-    */
     GraphicsManager::GraphicsManager(bool bLoadRenderer)
         : ogreWindowEventListener_(new OgreWindowEventListener())
@@ -104 +100 @@
         , lastFrameStartTime_(0.0f)
         , lastFrameEndTime_(0.0f)
+        , destructionHelper_(this)
     {
         RegisterObject(GraphicsManager);
@@ -134 +131 @@
     }
 
-    /**
-    @brief
-        Destruction is done by the member scoped_ptrs.
-    */
-    GraphicsManager::~GraphicsManager()
+    void GraphicsManager::destroy()
     {
         Loader::unload(debugOverlay_.get());
 
-        Ogre::WindowEventUtilities::removeWindowEventListener(renderWindow_, ogreWindowEventListener_.get());
+        Ogre::WindowEventUtilities::removeWindowEventListener(renderWindow_, ogreWindowEventListener_);
         ModifyConsoleCommand(__CC_printScreen_name).resetFunction();
         ModifyConsoleCommand(__CC_GraphicsManager_group, __CC_setScreenResolution_name).resetFunction();
@@ -151 +144 @@
         Loader::unload(resources_.get());
         Loader::unload(extResources_.get());
+
+        safeObjectDelete(&ogreRoot_);
+        safeObjectDelete(&ogreLogger_);
+        safeObjectDelete(&ogreWindowEventListener_);
     }
 
@@ -218 +215 @@
         // create a new logManager
         // Ogre::Root will detect that we've already created a Log
-        ogreLogger_.reset(new Ogre::LogManager());
+        ogreLogger_ = new Ogre::LogManager();
         COUT(4) << "Ogre LogManager created" << std::endl;
 
@@ -241 +238 @@
 
         // Leave plugins file empty. We're going to do that part manually later
-        ogreRoot_.reset(new Ogre::Root("", ogreConfigFilepath.string(), ogreLogFilepath.string()));
+        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.string(), ogreLogFilepath.string());
 
         COUT(3) << "Ogre set up done." << std::endl;
@@ -300 +297 @@
         this->ogreWindowEventListener_->windowResized(renderWindow_);
 
-        Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get());
+        Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_);
 
         // create a full screen default viewport