Changeset 1949 for code/branches/objecthierarchy/src/core

Timestamp:

Oct 19, 2008, 2:24:33 PM (16 years ago)

Author:

rgrieder

Message:

Moved all showsGraphics, hasServer, etc. functions from Settings class to Core class.
This was necessary to avoid circular dependencies.

Location:

code/branches/objecthierarchy/src/core

Files:

• Core.cc (modified) (2 diffs)
• Core.h (modified) (2 diffs)

code/branches/objecthierarchy/src/core/Core.cc

@@ -37 +37 @@
 #include "CoreIncludes.h"
 #include "ConfigValueIncludes.h"
-//#include "input/InputManager.h"
-//#include "TclThreadManager.h"
 
 namespace orxonox
 {
+    bool Core::bShowsGraphics_s = false;
+    bool Core::bHasServer_s     = false;
+    bool Core::bIsClient_s      = false;
+    bool Core::bIsStandalone_s  = false;
+    bool Core::bIsMaster_s      = false;
+
     /**
         @brief Constructor: Registers the object and sets the config-values.
@@ -205 +209 @@
         ResetConfigValue(language_);
     }
-
-    ///**
-    //    @brief Ticks every core class in a specified sequence. Has to be called
-    //           every Orxonox tick!
-    //    @param dt Delta Time
-    //*/
-    //void Core::tick(float dt)
-    //{
-    //    TclThreadManager::getInstance().tick(dt);
-    //    InputManager::getInstance().tick(dt);
-    //}
 }

code/branches/objecthierarchy/src/core/Core.h

@@ -60 +60 @@
             static void resetLanguage();
 
-            //static void tick(float dt);
+            // fast access global variables.
+            static bool showsGraphics() { return bShowsGraphics_s; }
+            static bool hasServer()     { return bHasServer_s; }
+            static bool isClient()      { return bIsClient_s; }
+            static bool isStandalone()  { return bIsStandalone_s; }
+            static bool isMaster()      { return bIsMaster_s; }
+            static void setShowsGraphics(bool val) { bShowsGraphics_s = val; updateIsMaster(); }
+            static void setHasServer    (bool val) { bHasServer_s     = val; updateIsMaster(); }
+            static void setIsClient     (bool val) { bIsClient_s      = val; updateIsMaster(); }
+            static void setIsStandalone (bool val) { bIsStandalone_s  = val; updateIsMaster(); }
+            static void updateIsMaster  ()         { bIsMaster_s      = (bHasServer_s || bIsStandalone_s); }
 
         private:
@@ -74 +84 @@
             int softDebugLevelShell_;                       //!< The debug level for the ingame shell
             std::string language_;                          //!< The language
+
+            static bool bShowsGraphics_s;                   //!< global variable that tells whether to show graphics
+            static bool bHasServer_s;                       //!< global variable that tells whether this is a server
+            static bool bIsClient_s;
+            static bool bIsStandalone_s;
+            static bool bIsMaster_s;
     };
 }