Changeset 2908 for code/branches/questsystem5/src/orxonox/overlays/debug

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/debug/DebugFPSText.cc (modified) (2 diffs)
• src/orxonox/overlays/debug/DebugRTRText.cc (modified) (2 diffs)

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

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

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

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