Changeset 2817 for code/branches/gui/src/orxonox/overlays/debug

Timestamp:

Mar 21, 2009, 10:17:59 PM (16 years ago)

Author:

rgrieder

Message:

Removed GameState template and renamed GameStateBase to GameState.
Moved statistics stuff (fps and tick time) to Game and removed the remaining hacks in GSGraphics and GSRoot.

Location:

code/branches/gui/src/orxonox/overlays/debug

Files:

• DebugFPSText.cc (modified) (2 diffs)
• DebugRTRText.cc (modified) (2 diffs)

code/branches/gui/src/orxonox/overlays/debug/DebugFPSText.cc

@@ -30 +30 @@
 #include "DebugFPSText.h"
 #include <OgreTextAreaOverlayElement.h>
+#include "util/Convert.h"
 #include "core/CoreIncludes.h"
-#include "GraphicsManager.h"
-#include "util/Convert.h"
+#include "Game.h"
 
 namespace orxonox
@@ -51 +51 @@
         SUPER(DebugFPSText, tick, dt);
 
-        float fps = GraphicsManager::getInstance().getAverageFramesPerSecond();
+        float fps = Game::getInstance().getAvgFPS();
         this->setCaption(convertToString(fps));
     }

code/branches/gui/src/orxonox/overlays/debug/DebugRTRText.cc

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"
-#include "GraphicsManager.h"
+#include "Game.h"
 
 namespace orxonox
@@ -51 +51 @@
         SUPER(DebugRTRText, tick, dt);
 
-        float rtr = GraphicsManager::getInstance().getAverageTickTime();
+        float rtr = Game::getInstance().getAvgTickTime();
         this->setCaption(convertToString(rtr));
     }