imgui Console in own class

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140908 ]
+    * Moved imgui Console into own (static) class
+    * Added FPS display
+
     [ 20140905 ]
     * Recreated working console using imgui
 

TODO.md

@@ -13,6 +13,7 @@
 ## Bugs
 
 * Screenshots are sometimes not written, sometimes distorted?
+    * Seems to happen if OpenRaider.ini sets a resolution larger than the window can be
 
 ## Cmake
 

include/Console.h

@@ -0,0 +1,23 @@
+/*!
+ * \file include/Console.h
+ * \brief Console class
+ *
+ * \author xythobuz
+ */
+
+#ifndef _CONSOLE_H_
+#define _CONSOLE_H_
+
+class Console {
+public:
+    static void display();
+
+private:
+    const static int bufferLength = 256;
+    static char buffer[bufferLength];
+    static bool scrollToBottom;
+    static unsigned long lastLogLength;
+};
+
+#endif
+

include/UI.h

@@ -20,7 +20,6 @@ public:
     static int initialize();
     static void eventsFinished();
     static void display();
-    static void calculate();
     static void shutdown();
 
     static void setVisible(bool v);

src/CMakeLists.txt

@@ -48,6 +48,7 @@ endif (PNG_FOUND)
 
 # Set Source files
 set (SRCS ${SRCS} "Camera.cpp")
+set (SRCS ${SRCS} "Console.cpp")
 set (SRCS ${SRCS} "Entity.cpp")
 set (SRCS ${SRCS} "Exception.cpp")
 set (SRCS ${SRCS} "Font.cpp")

src/Console.cpp

@@ -0,0 +1,49 @@
+/*!
+ * \file src/Console.cpp
+ * \brief Console class
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "Log.h"
+#include "UI.h"
+#include "commands/Command.h"
+#include "Console.h"
+
+char Console::buffer[bufferLength] = "";
+bool Console::scrollToBottom = false;
+unsigned long Console::lastLogLength = 0;
+
+void Console::display() {
+    if (ImGui::Begin("Console", NULL, ImVec2(600, 400), -1.0f)) {
+        if (lastLogLength != getLog().size()) {
+            lastLogLength = getLog().size();
+            scrollToBottom = true;
+        }
+
+        ImGui::BeginChild("ConsoleText", ImVec2(ImGui::GetWindowWidth(), ImGui::GetWindowSize().y - 70));
+        for (unsigned long i = 0; i < getLog().size(); i++) {
+            ImGui::Text("%s", getLog().get(i).c_str());
+        }
+        if (scrollToBottom) {
+            ImGui::SetScrollPosHere();
+            scrollToBottom = false;
+        }
+        ImGui::EndChild();
+
+        bool enter = false;
+        ImGui::InputText("Command", buffer, bufferLength, ImGuiInputTextFlags_AutoSelectAll, &enter);
+        if (enter) {
+            getLog() << "> " << buffer << Log::endl;
+            int error = Command::command(buffer);
+            if (error != 0) {
+                getLog() << "Error code: " << error << Log::endl;
+            }
+            buffer[0] = '\0';
+            scrollToBottom = true;
+        }
+    }
+    ImGui::End();
+}
+

src/UI.cpp

@@ -8,6 +8,7 @@
 #include <algorithm>
 
 #include "global.h"
+#include "Console.h"
 #include "Game.h"
 #include "Log.h"
 #include "Menu.h"
@@ -138,6 +139,7 @@ void UI::eventsFinished() {
             if (std::get<1>(i)) {
                 if (getRunTime().getKeyBinding(menuAction) == std::get<0>(i)) {
                     getMenu().setVisible(!getMenu().isVisible());
+                    visible = false;
                 } else if (getRunTime().getKeyBinding(debugAction) == std::get<0>(i)) {
                     visible = !visible;
                 }
@@ -165,47 +167,23 @@ void UI::eventsFinished() {
 }
 
 void UI::display() {
-    if (visible)
-        ImGui::Render();
-}
+    if (!visible)
+        return;
 
-void UI::calculate() {
-    static char buffer[256];
-    static bool scrollToBottom = false;
+    Console::display();
 
-    ImGui::Begin("Console", NULL, ImVec2(600, 400), -1.0f);
-        ImGui::BeginChild("ConsoleText", ImVec2(ImGui::GetWindowWidth(), ImGui::GetWindowSize().y - 70));
-            for (int i = 0; i < getLog().size(); i++) {
-                ImGui::Text("%s", getLog().get(i).c_str());
-            }
-            if (scrollToBottom) {
-                ImGui::SetScrollPosHere();
-                scrollToBottom = false;
-            }
-        ImGui::EndChild();
-
-        bool enter = false;
-        ImGui::InputText("Command", buffer, 256, ImGuiInputTextFlags_AutoSelectAll, &enter);
-        if (enter) {
-            getLog() << "> " << buffer << Log::endl;
-            int error = Command::command(buffer);
-            if (error != 0) {
-                getLog() << "Error code: " << error << Log::endl;
-            }
-            buffer[0] = '\0';
-            scrollToBottom = true;
-        }
-    ImGui::End();
+    if (ImGui::Begin("Engine")) {
+        if (ImGui::CollapsingHeader("Debug", NULL, true, true)) {
 
-    //ImGui::Begin("UI Style");
-    //    ImGui::ShowStyleEditor();
-    //ImGui::End();
+        }
 
-    //ImGui::Begin("Help");
-    //    ImGui::ShowUserGuide();
-    //ImGui::End();
+        if (ImGui::CollapsingHeader("UI Help")) {
+            ImGui::ShowUserGuide();
+        }
+    }
+    ImGui::End();
 
-    //ImGui::ShowTestWindow();
+    ImGui::Render();
 }
 
 void UI::shutdown() {

src/main.cpp

@@ -7,6 +7,7 @@
 
 #include <iostream>
 #include <memory>
+#include <sstream>
 
 #include "global.h"
 #include "Exception.h"
@@ -203,7 +204,6 @@ int main(int argc, char* argv[]) {
 
     while (getRunTime().isRunning()) {
         getWindow().eventHandling();
-        UI::calculate();
         renderFrame();
     }
 
@@ -225,7 +225,30 @@ void renderFrame() {
     getGame().display();
     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()) {
+        std::ostringstream s;
+        s << fps << "FPS";
+        getWindow().glEnter2D();
+        getFont().drawText(10, getWindow().getHeight() - 25, 0.6f, BLUE, s.str());
+        getWindow().glExit2D();
+    }
+
     getWindow().swapBuffersGL();
+
+    frameCount++;
+    frameTimeSum += (systemTimerGet() - lastTime);
+    if (frameTimeSum >= fpsUpdate) {
+        fps = frameCount * (1000 / frameTimeSum);
+        frameCount = frameTimeSum = 0;
+    }
+    lastTime = systemTimerGet();
 }
 
 #endif // UNIT_TEST