Changeset 10464

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

Files:

• src/libraries/core/Core.cc (modified) (2 diffs)
• src/libraries/core/Core.h (modified) (1 diff)
• src/libraries/core/CorePrereqs.h (modified) (1 diff)
• src/libraries/core/input/KeyBinderManager.cc (modified) (1 diff)
• src/libraries/core/input/KeyDetector.cc (modified) (1 diff)
• src/libraries/core/object/DestroyLaterManager.cc (modified) (1 diff)
• src/libraries/network/Client.cc (modified) (1 diff)
• src/libraries/network/LANDiscovery.cc (modified) (1 diff)
• src/modules/designtools/ScreenshotManager.cc (modified) (1 diff)
• src/modules/designtools/SkyboxGenerator.cc (modified) (1 diff)
• src/modules/notifications/NotificationManager.cc (modified) (1 diff)
• src/modules/pickup/PickupManager.cc (modified) (1 diff)
• src/modules/questsystem/QuestManager.cc (modified) (1 diff)
• src/orxonox/CameraManager.cc (modified) (1 diff)
• src/orxonox/LevelManager.cc (modified) (1 diff)
• src/orxonox/MoodManager.cc (modified) (1 diff)
• src/orxonox/PlayerManager.cc (modified) (1 diff)
• src/orxonox/chat/ChatHistory.cc (modified) (1 diff)
• src/orxonox/chat/ChatInputHandler.cc (modified) (1 diff)
• src/orxonox/chat/ChatManager.cc (modified) (1 diff)
• src/orxonox/overlays/InGameConsole.cc (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (1 diff)
• test/core/singleton/ScopeTest.cc (modified) (5 diffs)

code/branches/core7/src/libraries/core/Core.cc

@@ -225 +225 @@
         // Create singletons that always exist (in other libraries)
         orxout(internal_info) << "creating root scope:" << endl;
-        this->rootScope_ = new Scope<ScopeID::Root>();
+        this->rootScope_ = new Scope<ScopeID::ROOT>();
 
         // Generate documentation instead of normal run?
@@ -398 +398 @@
         // Create singletons associated with graphics (in other libraries)
         orxout(internal_info) << "creating graphics scope:" << endl;
-        graphicsScope_ = new Scope<ScopeID::Graphics>();
+        graphicsScope_ = new Scope<ScopeID::GRAPHICS>();
 
         unloader.Dismiss();

code/branches/core7/src/libraries/core/Core.h

@@ -129 +129 @@
             TclBind*                  tclBind_;
             TclThreadManager*         tclThreadManager_;
-            Scope<ScopeID::Root>*     rootScope_;
+            Scope<ScopeID::ROOT>*     rootScope_;
             // graphical
             GraphicsManager*          graphicsManager_;            //!< Interface to OGRE
             InputManager*             inputManager_;               //!< Interface to OIS
             GUIManager*               guiManager_;                 //!< Interface to GUI
-            Scope<ScopeID::Graphics>* graphicsScope_;
+            Scope<ScopeID::GRAPHICS>* graphicsScope_;
 
             bool                      bGraphicsLoaded_;

code/branches/core7/src/libraries/core/CorePrereqs.h

@@ -79 +79 @@
     namespace ScopeID
     {
+        typedef int Value;
+
         //!A list of available scopes for the Scope template.
-        enum Value
-        {
-            Root,
-            Graphics
-        };
+        static const Value ROOT = 1;
+        static const Value GRAPHICS = 2;
     }
 

code/branches/core7/src/libraries/core/input/KeyBinderManager.cc

@@ -41 +41 @@
 namespace orxonox
 {
-    ManageScopedSingleton(KeyBinderManager, ScopeID::Graphics, false);
+    ManageScopedSingleton(KeyBinderManager, ScopeID::GRAPHICS, false);
 
     static const std::string __CC_keybind_name = "keybind";

code/branches/core7/src/libraries/core/input/KeyDetector.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    ManageScopedSingleton(KeyDetector, ScopeID::Graphics, false);
+    ManageScopedSingleton(KeyDetector, ScopeID::GRAPHICS, false);
 
     static const std::string __CC_KeyDetector_callback_name = "KeyDetectorKeyPressed";

code/branches/core7/src/libraries/core/object/DestroyLaterManager.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    ManageScopedSingleton(DestroyLaterManager, ScopeID::Root, false);
+    ManageScopedSingleton(DestroyLaterManager, ScopeID::ROOT, false);
 
     RegisterAbstractClass(DestroyLaterManager).inheritsFrom<UpdateListener>();

code/branches/core7/src/libraries/network/Client.cc

@@ -57 +57 @@
 {
 
-  ManageScopedSingleton( Client, ScopeID::Root, false );
+  ManageScopedSingleton( Client, ScopeID::ROOT, false );
 
   /**

code/branches/core7/src/libraries/network/LANDiscovery.cc

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

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);
 
     /**

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)

code/branches/core7/test/core/singleton/ScopeTest.cc

@@ -18 +18 @@
         };
 
-        ManageScopedSingleton(TestSingletonRoot, ScopeID::Root, false);
-        ManageScopedSingleton(TestSingletonGraphics, ScopeID::Graphics, false);
+        ManageScopedSingleton(TestSingletonRoot, ScopeID::ROOT, false);
+        ManageScopedSingleton(TestSingletonGraphics, ScopeID::GRAPHICS, false);
 
         // Fixture
@@ -39 +39 @@
     TEST_F(ScopeTest, ScopesDoNotExist)
     {
-        EXPECT_FALSE(Scope<ScopeID::Root>::isActive());
-        EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
+        EXPECT_FALSE(Scope<ScopeID::ROOT>::isActive());
+        EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
     }
 
@@ -51 +51 @@
     TEST_F(ScopeTest, RootScope)
     {
-        EXPECT_FALSE(Scope<ScopeID::Root>::isActive());
+        EXPECT_FALSE(Scope<ScopeID::ROOT>::isActive());
         {   // create root scope
-            Scope<ScopeID::Root> scope;
-            EXPECT_TRUE(Scope<ScopeID::Root>::isActive());
+            Scope<ScopeID::ROOT> scope;
+            EXPECT_TRUE(Scope<ScopeID::ROOT>::isActive());
         }   // destroy root scope
-        EXPECT_FALSE(Scope<ScopeID::Root>::isActive());
+        EXPECT_FALSE(Scope<ScopeID::ROOT>::isActive());
     }
 
     TEST_F(ScopeTest, DISABLED_RootAndGraphicsScope)
     {
-        EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
+        EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
         {   // create root scope
-            Scope<ScopeID::Root> scope;
-            EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
+            Scope<ScopeID::ROOT> scope;
+            EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
             {   // create graphics scope
-                Scope<ScopeID::Graphics> scope;
-                EXPECT_TRUE(Scope<ScopeID::Graphics>::isActive());
+                Scope<ScopeID::GRAPHICS> scope;
+                EXPECT_TRUE(Scope<ScopeID::GRAPHICS>::isActive());
             }   // destroy graphics scope
-            EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
+            EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
         }   // destroy root scope
-        EXPECT_FALSE(Scope<ScopeID::Graphics>::isActive());
+        EXPECT_FALSE(Scope<ScopeID::GRAPHICS>::isActive());
     }
 
@@ -78 +78 @@
         EXPECT_FALSE(TestSingletonRoot::exists());
         {   // create root scope
-            Scope<ScopeID::Root> scope;
+            Scope<ScopeID::ROOT> scope;
             EXPECT_TRUE(TestSingletonRoot::exists());
         }   // destroy root scope
@@ -88 +88 @@
         EXPECT_FALSE(TestSingletonGraphics::exists());
         {   // create root scope
-            Scope<ScopeID::Root> scope;
+            Scope<ScopeID::ROOT> scope;
             EXPECT_FALSE(TestSingletonGraphics::exists());
             {   // create graphics scope
-                Scope<ScopeID::Graphics> scope;
+                Scope<ScopeID::GRAPHICS> scope;
                 EXPECT_TRUE(TestSingletonGraphics::exists());
             }   // destroy graphics scope