Added FPS histogram

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141128 ]
+    * Added FPS Histogram Debug UI
+
     [ 20141127 ]
     * Started work on loading the object texture mapping, with debug UI
     * Textiles debug UI also draws triangles “properly”

include/RunTime.h

@@ -9,6 +9,7 @@
 #define _RUNTIME_H_
 
 #include <string>
+#include <vector>
 
 /*!
  * \brief Main Game Singleton
@@ -33,8 +34,12 @@ class RunTime {
     bool isRunning();
     void setRunning(bool run);
 
-    bool getFPS();
-    void setFPS(bool fps);
+    bool getShowFPS();
+    void setShowFPS(bool fps);
+
+    void updateFPS();
+    unsigned long getFPS();
+    const std::vector<float>& getHistoryFPS();
 
   private:
     std::string baseDir;
@@ -45,6 +50,12 @@ class RunTime {
     KeyboardButton keyBindings[ActionEventCount];
     bool gameIsRunning;
     bool showFPS;
+
+    unsigned long lastTime;
+    unsigned long frameCount, frameCount2;
+    unsigned long frameTimeSum, frameTimeSum2;
+    unsigned long fps;
+    std::vector<float> history;
 };
 
 RunTime& getRunTime();

src/RunTime.cpp

@@ -7,6 +7,7 @@
 
 #include "global.h"
 #include "utils/strings.h"
+#include "utils/time.h"
 #include "RunTime.h"
 
 RunTime::RunTime()
@@ -33,6 +34,13 @@ RunTime::RunTime()
     keyBindings[backwardAction] = sKey;
     keyBindings[leftAction] = aKey;
     keyBindings[rightAction] = dKey;
+
+    lastTime = 0;
+    frameCount = 0;
+    frameCount2 = 0;
+    frameTimeSum = 0;
+    frameTimeSum2 = 0;
+    fps = 0;
 }
 
 std::string RunTime::getBaseDir() {
@@ -85,11 +93,36 @@ void RunTime::setRunning(bool run) {
     gameIsRunning = run;
 }
 
-bool RunTime::getFPS() {
+bool RunTime::getShowFPS() {
     return showFPS;
 }
 
-void RunTime::setFPS(bool fps) {
+void RunTime::setShowFPS(bool fps) {
     showFPS = fps;
 }
 
+void RunTime::updateFPS() {
+    frameCount++;
+    frameTimeSum += (systemTimerGet() - lastTime);
+    frameTimeSum2 += (systemTimerGet() - lastTime);
+    lastTime = systemTimerGet();
+    if (frameTimeSum >= 200) {
+        fps = frameCount * (1000 / frameTimeSum);
+        frameCount = frameTimeSum = 0;
+    }
+
+    if (frameTimeSum2 >= 1000) {
+        history.push_back(frameCount2);
+        frameCount2 = frameTimeSum2 = 0;
+    }
+    frameCount2++;
+}
+
+unsigned long RunTime::getFPS() {
+    return fps;
+}
+
+const std::vector<float>& RunTime::getHistoryFPS() {
+    return history;
+}
+

src/UI.cpp

@@ -186,13 +186,30 @@ void UI::display() {
     Console::display();
 
     if (ImGui::Begin("Engine")) {
-        if (ImGui::CollapsingHeader("Info", NULL, true, true)) {
+        if (ImGui::CollapsingHeader("RunTime Info")) {
             ImGui::Text("Uptime: %lums", systemTimerGet());
+            ImGui::Text("Frames per Second: %luFPS", getRunTime().getFPS());
+            if (getRunTime().getHistoryFPS().size() > 1) {
+                static bool scroll = true;
+                if (scroll) {
+                    int offset = getRunTime().getHistoryFPS().size() - 1;
+                    if (offset > 15)
+                        offset = 15;
+                    ImGui::PlotLines("FPS", &getRunTime().getHistoryFPS()[1],
+                            getRunTime().getHistoryFPS().size() - 1,
+                            getRunTime().getHistoryFPS().size() - offset - 1);
+                } else {
+                    ImGui::PlotLines("FPS", &getRunTime().getHistoryFPS()[1],
+                            getRunTime().getHistoryFPS().size() - 1);
+                }
+                ImGui::SameLine();
+                ImGui::Checkbox("Scroll##fpsscroll", &scroll);
+            }
         }
 
         static bool visibleTex = false;
         static bool visibleTile = false;
-        if (ImGui::CollapsingHeader("Textures")) {
+        if (ImGui::CollapsingHeader("Texture Viewer")) {
             static bool game = getGame().isLoaded();
             static int index = 0;
             ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
@@ -244,7 +261,7 @@ void UI::display() {
             }
         }
 
-        if (ImGui::CollapsingHeader("Textiles")) {
+        if (ImGui::CollapsingHeader("Textile Viewer")) {
             if (getTextureManager().numTiles() > 0) {
                 static int index = 0;
                 ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
@@ -288,7 +305,7 @@ void UI::display() {
             }
         }
 
-        if (ImGui::CollapsingHeader("SoundSamples")) {
+        if (ImGui::CollapsingHeader("SoundSample Player")) {
             if (!getSound().getEnabled()) {
                 ImGui::Text("Please enable Sound before loading a level!");
                 if (ImGui::Button("Enable Sound!")) {

src/commands/CommandSet.cpp

@@ -117,7 +117,7 @@ int CommandSet::execute(std::istream& args) {
             getLog() << "set-fps-Error: Invalid value" << Log::endl;
             return -8;
         }
-        getRunTime().setFPS(fps);
+        getRunTime().setShowFPS(fps);
     } else if (var.compare("basedir") == 0) {
         std::string temp;
         args >> temp;
@@ -191,7 +191,7 @@ int CommandGet::execute(std::istream& args) {
     } else if (var.compare("mouse_y") == 0) {
         getLog() << OR_RAD_TO_DEG(getCamera().getSensitivityY()) << Log::endl;
     } else if (var.compare("fps") == 0) {
-        getLog() << getRunTime().getFPS() << Log::endl;
+        getLog() << getRunTime().getShowFPS() << Log::endl;
     } else if (var.compare("basedir") == 0) {
         getLog() << getRunTime().getBaseDir() << Log::endl;
     } else if (var.compare("pakdir") == 0) {

src/main.cpp

@@ -233,15 +233,9 @@ void renderFrame() {
     getMenu().display();
     UI::display();
 
-    const static unsigned long fpsUpdate = 250;
-    static unsigned long frameCount = 0;
-    static unsigned long lastTime = 0;
-    static unsigned long frameTimeSum = 0;
-    static unsigned long fps = 0;
-
-    if (getRunTime().getFPS()) {
+    if (getRunTime().getShowFPS()) {
         std::ostringstream s;
-        s << fps << "FPS";
+        s << getRunTime().getFPS() << "FPS";
         getWindow().glEnter2D();
         Font::drawText(10, getWindow().getHeight() - 25, 0.6f, BLUE, s.str());
         getWindow().glExit2D();
@@ -249,13 +243,7 @@ void renderFrame() {
 
     getWindow().swapBuffersGL();
 
-    frameCount++;
-    frameTimeSum += (systemTimerGet() - lastTime);
-    if (frameTimeSum >= fpsUpdate) {
-        fps = frameCount * (1000 / frameTimeSum);
-        frameCount = frameTimeSum = 0;
-    }
-    lastTime = systemTimerGet();
+    getRunTime().updateFPS();
 }
 
 #endif // UNIT_TEST