Changeset 5867 for code/branches/core5/src/orxonox/CameraManager.cc

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.

File:

• code/branches/core5/src/orxonox/CameraManager.cc (modified) (3 diffs)

code/branches/core5/src/orxonox/CameraManager.cc

@@ -26 +26 @@
  *
  */
+
 #include "CameraManager.h"
 
@@ -37 +38 @@
 #include "core/GUIManager.h"
 #include "core/ObjectList.h"
+#include "core/ScopedSingletonManager.h"
 #include "tools/Shader.h"
 #include "graphics/Camera.h"
@@ -43 +45 @@
 namespace orxonox
 {
+    ManageScopedSingleton(CameraManager, ScopeID::Graphics);
     CameraManager* CameraManager::singletonPtr_s = 0;