Changeset 2996 for code/branches/netp3/src/orxonox

Timestamp:

May 20, 2009, 4:13:26 PM (16 years ago)

Author:

rgrieder

Message:

Fixed tick-time issue: Not all tick times were being taken into account.
As of now, only GSRoot and GSGraphics manage the tick times themselves (marked with "AddGameState(GSRoot, "root", false)")

Location:

code/branches/netp3/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (3 diffs)
• GSGraphics.h (modified) (1 diff)
• GSRoot.cc (modified) (2 diffs)
• GSRoot.h (modified) (1 diff)

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

@@ -57 +57 @@
 namespace orxonox
 {
-    AddGameState(GSGraphics, "graphics");
-
-    GSGraphics::GSGraphics(const std::string& name)
-        : GameState(name)
+    AddGameState(GSGraphics, "graphics", false);
+
+    GSGraphics::GSGraphics(const std::string& name, bool countTickTime)
+        : GameState(name, countTickTime)
         , inputManager_(0)
         , console_(0)
@@ -213 +213 @@
         uint64_t timeBeforeTick = time.getRealMicroseconds();
 
-        this->inputManager_->update(time);        // tick console
+        this->inputManager_->update(time);
         this->console_->update(time);
-        this->guiManager_->update(time);
 
         uint64_t timeAfterTick = time.getRealMicroseconds();
@@ -222 +221 @@
         Game::getInstance().addTickTime(timeAfterTick - timeBeforeTick);
 
+        // Process gui events
+        this->guiManager_->update(time);
         // Render
         this->graphicsManager_->update(time);

code/branches/netp3/src/orxonox/gamestates/GSGraphics.h

@@ -51 +51 @@
     {
     public:
-        GSGraphics(const std::string& name);
+        GSGraphics(const std::string& name, bool countTickTime);
         ~GSGraphics();
         void setConfigValues();

code/branches/netp3/src/orxonox/gamestates/GSRoot.cc

@@ -43 +43 @@
 namespace orxonox
 {
-    AddGameState(GSRoot, "root");
+    AddGameState(GSRoot, "root", false);
     SetCommandLineSwitch(console);
     // Shortcuts for easy direct loading
@@ -51 +51 @@
     SetCommandLineSwitch(standalone);
 
-    GSRoot::GSRoot(const std::string& name)
-        : GameState(name)
+    GSRoot::GSRoot(const std::string& name, bool countTickTime)
+        : GameState(name, countTickTime)
         , timeFactor_(1.0f)
         , bPaused_(false)

code/branches/netp3/src/orxonox/gamestates/GSRoot.h

@@ -39 +39 @@
     {
     public:
-        GSRoot(const std::string& name);
+        GSRoot(const std::string& name, bool countTickTime);
         ~GSRoot();