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

Timestamp:

May 9, 2011, 5:06:49 AM (14 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.h (modified) (4 diffs)

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

@@ -48 +48 @@
 #include <string>
 #include <OgreLog.h>
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include "util/DestructionHelper.h"
 #include "util/Singleton.h"
 #include "OrxonoxClass.h"
@@ -68 +68 @@
     public:
         GraphicsManager(bool bLoadRenderer = true);
-        ~GraphicsManager();
+
+        //! Leave empty and use cleanup() instead
+        ~GraphicsManager() {}
+        /// Destructor that also executes when object fails to construct
+        void destroy();
 
         void setConfigValues();
@@ -113 +117 @@
         std::string setVSync(bool vsync);
 
-        scoped_ptr<OgreWindowEventListener> ogreWindowEventListener_; //!< Pimpl to hide OgreWindowUtilities.h
-        scoped_ptr<Ogre::LogManager>        ogreLogger_;
-        scoped_ptr<Ogre::Root>              ogreRoot_;                //!< Ogre's root
+        OgreWindowEventListener* ogreWindowEventListener_; //!< Pimpl to hide OgreWindowUtilities.h
+        Ogre::LogManager*        ogreLogger_;
+        Ogre::Root*              ogreRoot_;                //!< Ogre's root
         Ogre::RenderWindow* renderWindow_;             //!< the one and only render window
         Ogre::Viewport*     viewport_;                 //!< default full size viewport
@@ -134 +138 @@
         int                 ogreLogLevelCritical_;     //!< Corresponding Orxonox debug level for LL_CRITICAL
 
+        /// Helper object that executes the surrogate destructor destroy()
+        DestructionHelper<GraphicsManager> destructionHelper_;
+
         static GraphicsManager* singletonPtr_s;        //!< Pointer to the Singleton
 // tolua_begin