Changeset 1949 for code/branches/objecthierarchy

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

Files:

• core/Core.cc (modified) (2 diffs)
• core/Core.h (modified) (2 diffs)
• network/ClientConnectionListener.cc (modified) (2 diffs)
• orxonox/Settings.cc (modified) (1 diff)
• orxonox/Settings.h (modified) (3 diffs)
• orxonox/gamestates/GSClient.cc (modified) (3 diffs)
• orxonox/gamestates/GSDedicated.cc (modified) (3 diffs)
• orxonox/gamestates/GSGraphics.cc (modified) (3 diffs)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• orxonox/gamestates/GSServer.cc (modified) (3 diffs)
• orxonox/gamestates/GSStandalone.cc (modified) (3 diffs)
• orxonox/objects/infos/LevelInfo.cc (modified) (3 diffs)
• orxonox/objects/infos/PlayerInfo.cc (modified) (5 diffs)
• orxonox/tools/Mesh.cc (modified) (3 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;
     };
 }

code/branches/objecthierarchy/src/network/ClientConnectionListener.cc

@@ -1 +1 @@
 #include "ClientConnectionListener.h"
 #include "core/CoreIncludes.h"
-#include "Settings.h"
+#include "core/Core.h"
 
 namespace network{
@@ -11 +11 @@
 
   void ClientConnectionListener::getConnectedClients(){
-    if(orxonox::Settings::showsGraphics())
+    if(orxonox::Core::showsGraphics())
       this->clientConnected(0); //server client id
     ClientInformation *client = ClientInformation::getBegin();

code/branches/objecthierarchy/src/orxonox/Settings.cc

@@ -49 +49 @@
     */
     Settings::Settings()
-        : bShowsGraphics_(false)
-        , bHasServer_(false)
-        , bIsClient_(false)
-        , bIsStandalone_(false)
-        , bIsMaster_(false)
     {
         RegisterRootObject(Settings);

code/branches/objecthierarchy/src/orxonox/Settings.h

@@ -50 +50 @@
         friend class ClassIdentifier<Settings>;
         friend class GSRoot;
-        friend class GSGraphics;
-        friend class GSServer;
-        friend class GSClient;
-        friend class GSDedicated;
-        friend class GSStandalone;
 
     public:
@@ -62 +57 @@
         { assert(singletonRef_s); singletonRef_s->_tsetDataPath(path); }
 
-        // an alternative to a global game mode variable
-        static bool showsGraphics() { assert(singletonRef_s); return singletonRef_s->bShowsGraphics_; }
-        static bool hasServer()     { assert(singletonRef_s); return singletonRef_s->bHasServer_; }
-        static bool isClient()      { assert(singletonRef_s); return singletonRef_s->bIsClient_; }
-        static bool isStandalone()  { assert(singletonRef_s); return singletonRef_s->bIsStandalone_; }
-        static bool isMaster()      { assert(singletonRef_s); return singletonRef_s->bIsMaster_; }
-
     private:
-        // GSRoot has access to these
-        static void setShowsGraphics(bool val) { assert(singletonRef_s); singletonRef_s->bShowsGraphics_ = val; singletonRef_s->updateIsMaster(); }
-        static void setHasServer    (bool val) { assert(singletonRef_s); singletonRef_s->bHasServer_     = val; singletonRef_s->updateIsMaster(); }
-        static void setIsClient     (bool val) { assert(singletonRef_s); singletonRef_s->bIsClient_      = val; singletonRef_s->updateIsMaster(); }
-        static void setIsStandalone (bool val) { assert(singletonRef_s); singletonRef_s->bIsStandalone_  = val; singletonRef_s->updateIsMaster(); }
-        static void updateIsMaster  ()         { assert(singletonRef_s); singletonRef_s->bIsMaster_ = (singletonRef_s->bHasServer_ || singletonRef_s->bIsStandalone_); }
-
         Settings();
         Settings(const Settings& instance);
@@ -87 +68 @@
         void setConfigValues();
 
-        bool bShowsGraphics_;                                  //!< global variable that tells whether to show graphics
-        bool bHasServer_;                                      //!< global variable that tells whether this is a server
-        bool bIsClient_;
-        bool bIsStandalone_;
-        bool bIsMaster_;
-
         std::string dataPath_;                                 //!< Path to the game data
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSClient.cc

@@ -32 +32 @@
 #include "core/input/InputManager.h"
 #include "core/CommandLine.h"
+#include "core/Core.h"
 #include "network/Client.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -51 +51 @@
     void GSClient::enter()
     {
-        Settings::_getInstance().setIsClient(true);
+        Core::setIsClient(true);
 
         GSLevel::enter();
@@ -81 +81 @@
         GSLevel::leave();
 
-        Settings::_getInstance().setIsClient(false);
+        Core::setIsClient(false);
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSDedicated.cc

@@ -35 +35 @@
 #include "core/CommandLine.h"
 #include "core/Loader.h"
+#include "core/Core.h"
 #include "network/Server.h"
 #include "objects/Tickable.h"
+#include "Settings.h"
 #include "GraphicsEngine.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -57 +58 @@
     void GSDedicated::enter()
     {
-        Settings::_getInstance().setHasServer(true);
+        Core::setHasServer(true);
 
         // create Ogre SceneManager for the level
@@ -97 +98 @@
         Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
 
-        Settings::_getInstance().setHasServer(false);
+        Core::setHasServer(false);
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSGraphics.cc

@@ -47 +47 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
+#include "core/Core.h"
 #include "core/input/InputManager.h"
 #include "core/input/KeyBinder.h"
@@ -101 +102 @@
     void GSGraphics::enter()
     {
-        Settings::_getInstance().setShowsGraphics(true);
+        Core::setShowsGraphics(true);
 
         // initialise graphics engine. Doesn't load the render window yet!
@@ -196 +197 @@
         delete graphicsEngine_;
 
-        Settings::_getInstance().setShowsGraphics(false);
+        Core::setShowsGraphics(false);
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -44 +44 @@
 #include "objects/Radar.h"
 //#include "tools/ParticleInterface.h"
+#include "GraphicsEngine.h"
 #include "Settings.h"
-#include "GraphicsEngine.h"
 
 namespace orxonox

code/branches/objecthierarchy/src/orxonox/gamestates/GSServer.cc

@@ -33 +33 @@
 #include "core/input/InputManager.h"
 #include "core/CommandLine.h"
+#include "core/Core.h"
 #include "network/Server.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -52 +52 @@
     void GSServer::enter()
     {
-        Settings::_getInstance().setHasServer(true);
+        Core::setHasServer(true);
 
         GSLevel::enter();
@@ -86 +86 @@
         GSLevel::leave();
 
-        Settings::_getInstance().setHasServer(false);
+        Core::setHasServer(false);
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSStandalone.cc

@@ -32 +32 @@
 #include "core/input/InputManager.h"
 #include "core/ConsoleCommand.h"
-#include "Settings.h"
+#include "core/Core.h"
 
 namespace orxonox
@@ -59 +59 @@
         InputManager::getInstance().requestEnterState("game");
 
-        Settings::_getInstance().setIsStandalone(true);
+        Core::setIsStandalone(true);
     }
 
@@ -72 +72 @@
         GSLevel::leave();
 
-        Settings::_getInstance().setIsStandalone(false);
+        Core::setIsStandalone(false);
     }
 

code/branches/objecthierarchy/src/orxonox/objects/infos/LevelInfo.cc

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "core/Core.h"
 
-#include "Settings.h"
 #include "GraphicsEngine.h"
 
@@ -72 +72 @@
     void LevelInfo::setSkybox(const std::string& skybox)
     {
-        if (Settings::showsGraphics())
+        if (Core::showsGraphics())
             if (GraphicsEngine::getInstance().getLevelSceneManager())
                 GraphicsEngine::getInstance().getLevelSceneManager()->setSkyBox(true, skybox);
@@ -81 +81 @@
     void LevelInfo::setAmbientLight(const ColourValue& colour)
     {
-        if (Settings::showsGraphics())
+        if (Core::showsGraphics())
             GraphicsEngine::getInstance().getLevelSceneManager()->setAmbientLight(colour);
 

code/branches/objecthierarchy/src/orxonox/objects/infos/PlayerInfo.cc

@@ -35 +35 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/XMLPort.h"
+#include "core/Core.h"
 
 #include "network/Host.h"
 
-#include "Settings.h"
 #include "GraphicsEngine.h"
 #include "objects/gametypes/Gametype.h"
@@ -51 +51 @@
 
         this->ping_ = -1;
-        this->bLocalPlayer_ = Settings::isStandalone();
+        this->bLocalPlayer_ = Core::isStandalone();
         this->bLocalPlayer_ = false;
         this->bHumanPlayer_ = false;
@@ -78 +78 @@
     {
 std::cout << "# PI(" << this->getObjectID() << "): checkName: " << this->bLocalPlayer_ << std::endl;
-        if (this->bLocalPlayer_ && Settings::isMaster())
+        if (this->bLocalPlayer_ && Core::isMaster())
             this->setName(this->playerName_);
     }
@@ -114 +114 @@
 //std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): name: " << this->getName() << std::endl;
 
-            if (Settings::isClient())
+            if (Core::isClient())
             {
 std::cout << "# PI(" << this->getObjectID() << "): checkClientID(): we're on a client: set object mode to bidirectional" << std::endl;
@@ -134 +134 @@
     {
 std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): " << this->bFinishedSetup_ << std::endl;
-        if (Settings::isClient())
+        if (Core::isClient())
         {
 std::cout << "# PI(" << this->getObjectID() << "): finishedSetup(): we're a client: finish setup" << std::endl;

code/branches/objecthierarchy/src/orxonox/tools/Mesh.cc

@@ -32 +32 @@
 #include <sstream>
 #include <OgreSceneManager.h>
+#include "core/Core.h"
 #include "GraphicsEngine.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -48 +48 @@
         std::ostringstream name;
         name << (Mesh::meshCounter_s++);
-        if (Settings::showsGraphics())
+        if (Core::showsGraphics())
             this->entity_ = GraphicsEngine::getInstance().getLevelSceneManager()->createEntity("Mesh" + name.str(), file);
     }
@@ -54 +54 @@
     Mesh::~Mesh()
     {
-        if (this->entity_ && Settings::showsGraphics())
+        if (this->entity_ && Core::showsGraphics())
             GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
     }