Changeset 3366 for code/branches/resource/src/core/GraphicsManager.h

Timestamp:

Jul 29, 2009, 10:27:10 PM (15 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

File:

• code/branches/resource/src/core/GraphicsManager.h (modified) (4 diffs)

code/branches/resource/src/core/GraphicsManager.h

@@ -42 +42 @@
 #include <string>
 #include <OgreLog.h>
+#include "util/Singleton.h"
 #include "OrxonoxClass.h"
 
@@ -50 +51 @@
         Graphics engine manager class
     */
-    class _CoreExport GraphicsManager : public OrxonoxClass, public Ogre::LogListener
+    class _CoreExport GraphicsManager : public Singleton<GraphicsManager>, public OrxonoxClass, public Ogre::LogListener
     {
+        friend class Singleton<GraphicsManager>;
     public:
         GraphicsManager();
@@ -66 +68 @@
 
         void setCamera(Ogre::Camera* camera);
-
-        inline static GraphicsManager& getInstance()
-            { assert(singletonRef_s); return *singletonRef_s; }
 
     private:
@@ -107 +106 @@
         ConsoleCommand*     ccPrintScreen_;
 
-        static GraphicsManager* singletonRef_s;        //!< Pointer to the Singleton
+        static GraphicsManager* singletonPtr_s;        //!< Pointer to the Singleton
     };
 }