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

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.cc (modified) (3 diffs)

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

@@ -83 +83 @@
     };
 
-    GraphicsManager* GraphicsManager::singletonRef_s = 0;
+    GraphicsManager* GraphicsManager::singletonPtr_s = 0;
 
     /**
@@ -98 +98 @@
         RegisterObject(GraphicsManager);
 
-        assert(singletonRef_s == 0);
-        singletonRef_s = this;
-
         this->setConfigValues();
 
@@ -154 +151 @@
 
         delete this->ogreWindowEventListener_;
-
-        assert(singletonRef_s);
-        singletonRef_s = 0;
     }