Changeset 10464 for code/branches/core7/src/orxonox

Timestamp:

May 25, 2015, 12:13:34 AM (9 years ago)

Author:

landauf

Message:

define ScopeID as integer constants instead of an enum. this allows to extend it and add new scopes outside of core.

Location:

code/branches/core7/src/orxonox

Files:

• CameraManager.cc (modified) (1 diff)
• LevelManager.cc (modified) (1 diff)
• MoodManager.cc (modified) (1 diff)
• PlayerManager.cc (modified) (1 diff)
• chat/ChatHistory.cc (modified) (1 diff)
• chat/ChatInputHandler.cc (modified) (1 diff)
• chat/ChatManager.cc (modified) (1 diff)
• overlays/InGameConsole.cc (modified) (1 diff)
• sound/SoundManager.cc (modified) (1 diff)

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

@@ -44 +44 @@
 namespace orxonox
 {
-    ManageScopedSingleton(CameraManager, ScopeID::Graphics, false);
+    ManageScopedSingleton(CameraManager, ScopeID::GRAPHICS, false);
 
     CameraManager::CameraManager()

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

@@ -51 +51 @@
     SetCommandLineArgument(level, "").shortcut("l").information("Default level file (overrides LevelManager::defaultLevelName_ configValue)");
 
-    ManageScopedSingleton(LevelManager, ScopeID::Root, false);
+    ManageScopedSingleton(LevelManager, ScopeID::ROOT, false);
 
     RegisterAbstractClass(LevelManager).inheritsFrom<Configurable>();

code/branches/core7/src/orxonox/MoodManager.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    ManageScopedSingleton(MoodManager, ScopeID::Root, false);
+    ManageScopedSingleton(MoodManager, ScopeID::ROOT, false);
 
     // Note: I'm (Kevin Young) not entirely sure whether that's good code style:

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

@@ -39 +39 @@
 namespace orxonox
 {
-    ManageScopedSingleton(PlayerManager, ScopeID::Root, false);
+    ManageScopedSingleton(PlayerManager, ScopeID::ROOT, false);
 
     RegisterAbstractClass(PlayerManager).inheritsFrom<ClientConnectionListener>();

code/branches/core7/src/orxonox/chat/ChatHistory.cc

@@ -34 +34 @@
 {
   /* singleton */
-  ManageScopedSingleton( ChatHistory, ScopeID::Root, false );
+  ManageScopedSingleton( ChatHistory, ScopeID::ROOT, false );
 
   RegisterAbstractClass(ChatHistory).inheritsFrom<ChatListener>();

code/branches/core7/src/orxonox/chat/ChatInputHandler.cc

@@ -62 +62 @@
 {
   /* singleton */
-  ManageScopedSingleton( ChatInputHandler, ScopeID::Graphics, false );
+  ManageScopedSingleton( ChatInputHandler, ScopeID::GRAPHICS, false );
 
   /* add commands to console */

code/branches/core7/src/orxonox/chat/ChatManager.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    ManageScopedSingleton(ChatManager, ScopeID::Root, false);
+    ManageScopedSingleton(ChatManager, ScopeID::ROOT, false);
 
     SetConsoleCommand("chat", &ChatManager::chat).defaultValue(1, NETWORK_PEER_ID_BROADCAST);

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

@@ -65 +65 @@
     SetConsoleCommand("InGameConsole", "closeConsole", &InGameConsole::closeConsole);
 
-    ManageScopedSingleton(InGameConsole, ScopeID::Graphics, false);
+    ManageScopedSingleton(InGameConsole, ScopeID::GRAPHICS, false);
 
     RegisterAbstractClass(InGameConsole).inheritsFrom<WindowEventListener>().inheritsFrom<UpdateListener>();

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

@@ -50 +50 @@
 namespace orxonox
 {
-    ManageScopedSingleton(SoundManager, ScopeID::Graphics, true);
+    ManageScopedSingleton(SoundManager, ScopeID::GRAPHICS, true);
 
     std::string SoundManager::getALErrorString(ALenum code)