Changeset 5850 for code/branches/core5/src/orxonox/overlays

Timestamp:

Oct 1, 2009, 11:44:53 AM (15 years ago)

Author:

rgrieder

Message:

Moved the singleton creation/destruction mess to the Core class by using just two possible Scopes:

• ScopeID::Root for singletons that may always persists
• ScopeID::Graphics for singletons that only work when graphics was loaded

Location:

code/branches/core5/src/orxonox/overlays

Files:

• InGameConsole.cc (modified) (1 diff)
• InGameConsole.h (modified) (2 diffs)

code/branches/core5/src/orxonox/overlays/InGameConsole.cc

@@ -85 +85 @@
 
         this->setConfigValues();
+        this->initialise();
     }
 

code/branches/core5/src/orxonox/overlays/InGameConsole.h

@@ -36 +36 @@
 
 #include "util/OgreForwardRefs.h"
-#include "util/Singleton.h"
+#include "util/ScopedSingleton.h"
 #include "core/Shell.h"
 #include "core/WindowEventListener.h"
@@ -42 +42 @@
 namespace orxonox
 {
-    class _OrxonoxExport InGameConsole : public Singleton<InGameConsole>, public ShellListener, public WindowEventListener
+    class _OrxonoxExport InGameConsole : public ScopedSingleton<InGameConsole, ScopeID::Graphics>, public ShellListener, public WindowEventListener
     {
-        friend class Singleton<InGameConsole>;
+        friend class ScopedSingleton<InGameConsole, ScopeID::Graphics>;
     public: // functions
         InGameConsole();