Changeset 1696

Timestamp:

Sep 3, 2008, 8:45:12 PM (16 years ago)

Author:

rgrieder

Message:

• Actually set the Settings::showsGraphics and Settings::hasServer.
• Forgot the timer calls in GSGraphics

Location:

code/branches/gui/src/orxonox

Files:

• Settings.h (modified) (2 diffs)
• gamestates/GSDedicated.cc (modified) (2 diffs)
• gamestates/GSGraphics.cc (modified) (2 diffs)
• gamestates/GSLevel.cc (modified) (2 diffs)
• gamestates/GSServer.cc (modified) (3 diffs)

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

@@ -51 +51 @@
         friend class ClassIdentifier<Settings>;
         friend class GSRoot;
+        friend class GSGraphics;
+        friend class GSServer;
+        friend class GSDedicated;
 
     public:
@@ -61 +64 @@
         static bool showsGraphics() { assert(singletonRef_s); return singletonRef_s->bShowsGraphics_; }
         static bool hasServer()     { assert(singletonRef_s); return singletonRef_s->bHasServer_; }
-
 
     private:

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

@@ -55 +55 @@
     void GSDedicated::enter()
     {
+        Settings::_getInstance().bHasServer_ = true;
+
         // create Ogre SceneManager for the level
         this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC, "LevelSceneManager");
@@ -92 +94 @@
 
         Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
+
+        Settings::_getInstance().bHasServer_ = false;
     }
 

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

@@ -83 +83 @@
     void GSGraphics::enter()
     {
+        Settings::_getInstance().bShowsGraphics_ = true;
+
         setConfigValues();
 
@@ -139 +141 @@
         //this->ogreRoot_->shutdown
         // TODO: destroy render window
+
+        Settings::_getInstance().bShowsGraphics_ = false;
     }
 

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

@@ -38 +38 @@
 #include "objects/Backlight.h"
 #include "objects/Tickable.h"
+#include "tools/Timer.h"
 #include "tools/ParticleInterface.h"
 #include "Settings.h"
@@ -115 +116 @@
         for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
             it->tick(time.getDeltaTime() * this->timeFactor_);
+
+        for (Iterator<TimerBase> it = ObjectList<TimerBase>::start(); it; ++it)
+            it->tick(time);
     }
 

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

@@ -34 +34 @@
 #include "core/CommandLine.h"
 #include "network/Server.h"
+#include "Settings.h"
 
 namespace orxonox
@@ -51 +52 @@
     void GSServer::enter()
     {
+        Settings::_getInstance().bHasServer_ = true;
+
         GSLevel::enter();
 
@@ -81 +84 @@
 
         GSLevel::leave();
+
+        Settings::_getInstance().bHasServer_ = false;
     }