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

Timestamp:

May 25, 2015, 12:13:34 AM (10 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/modules

Files:

• designtools/ScreenshotManager.cc (modified) (1 diff)
• designtools/SkyboxGenerator.cc (modified) (1 diff)
• notifications/NotificationManager.cc (modified) (1 diff)
• pickup/PickupManager.cc (modified) (1 diff)
• questsystem/QuestManager.cc (modified) (1 diff)

code/branches/core7/src/modules/designtools/ScreenshotManager.cc

@@ -61 +61 @@
     SetConsoleCommand("printScreenHD", &ScreenshotManager::makeScreenshot_s);
     
-    ManageScopedSingleton(ScreenshotManager, ScopeID::Graphics, false);
+    ManageScopedSingleton(ScreenshotManager, ScopeID::GRAPHICS, false);
 
     RegisterAbstractClass(ScreenshotManager).inheritsFrom<Configurable>();

code/branches/core7/src/modules/designtools/SkyboxGenerator.cc

@@ -60 +60 @@
     SetConsoleCommand("SkyboxGenerator", "createSkybox", &SkyboxGenerator::createSkybox).addShortcut();
 
-    ManageScopedSingleton(SkyboxGenerator, ScopeID::Graphics, false);
+    ManageScopedSingleton(SkyboxGenerator, ScopeID::GRAPHICS, false);
 
     RegisterAbstractClass(SkyboxGenerator).inheritsFrom<Configurable>().inheritsFrom<Tickable>();

code/branches/core7/src/modules/notifications/NotificationManager.cc

@@ -47 +47 @@
 {
 
-    ManageScopedSingleton(NotificationManager, ScopeID::Root, false);
+    ManageScopedSingleton(NotificationManager, ScopeID::ROOT, false);
 
     RegisterAbstractClass(NotificationManager).inheritsFrom<NotificationListener>();

code/branches/core7/src/modules/pickup/PickupManager.cc

@@ -51 +51 @@
 namespace orxonox
 {
-    ManageScopedSingleton(PickupManager, ScopeID::Root, false);
+    ManageScopedSingleton(PickupManager, ScopeID::ROOT, false);
 
     // Initialization of the name of the PickupInventory GUI.

code/branches/core7/src/modules/questsystem/QuestManager.cc

@@ -49 +49 @@
 namespace orxonox
 {
-    ManageScopedSingleton(QuestManager, ScopeID::Root, false);
+    ManageScopedSingleton(QuestManager, ScopeID::ROOT, false);
 
     /**