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

Timestamp:

Oct 4, 2009, 12:02:28 AM (15 years ago)

Author:

rgrieder

Message:

Modified Scoped Singleton concept: Derive from Singleton normally, but place an important pre-main() instruction in the source file: ManageScopedSingleton(className, scope) (it's a macro).
This causes the Singleton to be created and destroyed with the Scope. Thus if a Singleton c'tor throws, it is much easier to react accordingly.

Location:

code/branches/core5/src/orxonox/overlays

Files:

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

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

@@ -48 +48 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/ConsoleCommand.h"
+#include "core/ScopedSingletonManager.h"
 #include "core/input/InputManager.h"
 #include "core/input/InputState.h"
@@ -61 +62 @@
 
     InGameConsole* InGameConsole::singletonPtr_s = 0;
+    ManageScopedSingleton(InGameConsole, ScopeID::Graphics);
 
     /**

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

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