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

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/libraries

Files:

• core/Core.cc (modified) (2 diffs)
• core/Core.h (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• core/input/KeyBinderManager.cc (modified) (1 diff)
• core/input/KeyDetector.cc (modified) (1 diff)
• core/object/DestroyLaterManager.cc (modified) (1 diff)
• network/Client.cc (modified) (1 diff)
• network/LANDiscovery.cc (modified) (1 diff)

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()