Changeset 5877 for code/branches/core5/src/orxonox

Timestamp:

Oct 5, 2009, 1:34:10 AM (15 years ago)

Author:

rgrieder

Message:

Added new an option for the ScopedSingletonManager that can allow the Singleton to fail (throw an exception).
Also improved exception-safety in Scope so that when for a Singleton fails, the Scope will deactivate all activated listeners and properly destroy itself.

Location:

code/branches/core5/src/orxonox

Files:

• CameraManager.cc (modified) (1 diff)
• LevelManager.cc (modified) (1 diff)
• PlayerManager.cc (modified) (1 diff)
• overlays/InGameConsole.cc (modified) (1 diff)
• sound/SoundManager.cc (modified) (1 diff)

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

@@ -45 +45 @@
 namespace orxonox
 {
-    ManageScopedSingleton(CameraManager, ScopeID::Graphics);
     CameraManager* CameraManager::singletonPtr_s = 0;
+    ManageScopedSingleton(CameraManager, ScopeID::Graphics, false);
 
     CameraManager::CameraManager()

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

@@ -44 +44 @@
     SetCommandLineArgument(level, "").shortcut("l").information("Default level file (overrides LevelManager::defaultLevelName_ configValue)");
 
-    ManageScopedSingleton(LevelManager, ScopeID::Root);
     LevelManager* LevelManager::singletonPtr_s = 0;
+    ManageScopedSingleton(LevelManager, ScopeID::Root, false);
 
     LevelManager::LevelManager()

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

@@ -39 +39 @@
 {
     PlayerManager* PlayerManager::singletonPtr_s = 0;
-    ManageScopedSingleton(PlayerManager, ScopeID::Root);
+    ManageScopedSingleton(PlayerManager, ScopeID::Root, false);
 
     PlayerManager::PlayerManager()

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

@@ -62 +62 @@
 
     InGameConsole* InGameConsole::singletonPtr_s = 0;
-    ManageScopedSingleton(InGameConsole, ScopeID::Graphics);
+    ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
 
     /**

code/branches/core5/src/orxonox/sound/SoundManager.cc

@@ -40 +40 @@
 {
     SoundManager* SoundManager::singletonPtr_s = NULL;
-    ManageScopedSingleton(SoundManager, ScopeID::Graphics);
+    ManageScopedSingleton(SoundManager, ScopeID::Graphics, true);
 
     /**