Improved imgui integration. Colors still seem wrong!

include/Debug.h

@@ -29,6 +29,8 @@ private:
     static void renderImGui(ImDrawList** const draw_lists, int count);
 
     static unsigned int fontTex;
+    std::string iniFilename;
+    std::string logFilename;
 };
 
 Debug &getDebug();

src/Debug.cpp

@@ -5,10 +5,9 @@
  * \author xythobuz
  */
 
-#include <algorithm>
-
 #include "global.h"
 #include "Debug.h"
+#include "RunTime.h"
 #include "TextureManager.h"
 #include "Window.h"
 
@@ -24,14 +23,22 @@ Debug::Debug() {
 }
 
 Debug::~Debug() {
+    // TODO Segfaults...?
+    //ImGui::Shutdown();
+
     UI::removeWindow(this);
 }
 
 int Debug::initialize() {
+    iniFilename = getRunTime().getBaseDir() + "/imgui.ini";
+    logFilename = getRunTime().getBaseDir() + "/imgui_log.txt";
+
     ImGuiIO& io = ImGui::GetIO();
     io.DisplaySize = ImVec2((float)getWindow().getWidth(), (float)getWindow().getHeight());
     io.DeltaTime = 1.0f/60.0f;
-    io.PixelCenterOffset = 0.0f;
+
+    io.IniFilename = iniFilename.c_str();
+    io.LogFilename = logFilename.c_str();
 
     io.KeyMap[ImGuiKey_Tab] = tabKey;
     io.KeyMap[ImGuiKey_LeftArrow] = leftKey;
@@ -75,6 +82,10 @@ void Debug::display() {
 }
 
 void Debug::eventsFinished() {
+    ImGuiIO& io = ImGui::GetIO();
+    io.DisplaySize = ImVec2((float)getWindow().getWidth(), (float)getWindow().getHeight());
+    io.DeltaTime = 1.0f / 60.0f; // TODO proper timing
+
     ImGui::NewFrame();
 }
 
@@ -125,19 +136,16 @@ void Debug::renderImGui(ImDrawList** const cmd_lists, int cmd_lists_count) {
 
     getWindow().glEnter2D();
 
-    glDisable(GL_CULL_FACE);
     glDisable(GL_DEPTH_TEST);
     glEnable(GL_SCISSOR_TEST);
-    //glEnableClientState(GL_VERTEX_ARRAY);
+
+    glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
     glEnableClientState(GL_COLOR_ARRAY);
 
     // Setup texture
     getTextureManager().bindTextureId(fontTex);
 
-    const float width = ImGui::GetIO().DisplaySize.x;
-    const float height = ImGui::GetIO().DisplaySize.y;
-
     // Render command lists
     for (int n = 0; n < cmd_lists_count; n++) {
         const ImDrawList* cmd_list = cmd_lists[n];
@@ -149,7 +157,7 @@ void Debug::renderImGui(ImDrawList** const cmd_lists, int cmd_lists_count) {
         int vtx_offset = 0;
         const ImDrawCmd* pcmd_end = cmd_list->commands.end();
         for (const ImDrawCmd* pcmd = cmd_list->commands.begin(); pcmd != pcmd_end; pcmd++) {
-            glScissor((int)pcmd->clip_rect.x, (int)(height - pcmd->clip_rect.w),
+            glScissor((int)pcmd->clip_rect.x, (int)(ImGui::GetIO().DisplaySize.y - pcmd->clip_rect.w),
                     (int)(pcmd->clip_rect.z - pcmd->clip_rect.x),
                     (int)(pcmd->clip_rect.w - pcmd->clip_rect.y));
             glDrawArrays(GL_TRIANGLES, vtx_offset, pcmd->vtx_count);
@@ -157,12 +165,12 @@ void Debug::renderImGui(ImDrawList** const cmd_lists, int cmd_lists_count) {
         }
     }
 
-    glEnable(GL_CULL_FACE);
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_SCISSOR_TEST);
-    glDisableClientState(GL_COLOR_ARRAY);
+
+    glDisableClientState(GL_VERTEX_ARRAY);
     glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-    //glDisableClientState(GL_VERTEX_ARRAY);
+    glDisableClientState(GL_COLOR_ARRAY);
 
     getWindow().glExit2D();
 }

src/Window.cpp

@@ -30,12 +30,12 @@ int Window::initializeGL() {
     //printf("GL Version : %s\n", glGetString(GL_VERSION));
 
     // Testing for goodies
-    const char *s = (const char *)glGetString(GL_EXTENSIONS);
-    if ((s != NULL) && (s[0] != '\0')) {
+    //const char *s = (const char *)glGetString(GL_EXTENSIONS);
+    //if ((s != NULL) && (s[0] != '\0')) {
         //! \todo MultiTexture flag
         //if (strstr(s, "GL_ARB_multitexture"))
             //mFlags |= Render::fMultiTexture;
-    }
+    //}
 
     // Set up Z buffer
     glEnable(GL_DEPTH_TEST);
@@ -84,10 +84,10 @@ int Window::initializeGL() {
 
     glDisable(GL_NORMALIZE);
 
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glDisableClientState(GL_EDGE_FLAG_ARRAY);
-    glDisableClientState(GL_COLOR_ARRAY);
-    glDisableClientState(GL_NORMAL_ARRAY);
+    //glEnableClientState(GL_VERTEX_ARRAY);
+    //glDisableClientState(GL_EDGE_FLAG_ARRAY);
+    //glDisableClientState(GL_COLOR_ARRAY);
+    //glDisableClientState(GL_NORMAL_ARRAY);
 
     glPolygonMode(GL_FRONT, GL_FILL);
 

src/main.cpp

@@ -217,9 +217,9 @@ void renderFrame() {
     // Get keyboard and mouse input
     getWindow().eventHandling();
 
-    ImGui::SetNewWindowDefaultPos(ImVec2(50, 50));
-    bool show_test_window = false;
-    ImGui::ShowTestWindow(&show_test_window);
+    ImGui::ShowTestWindow();
+    ImGui::ShowStyleEditor();
+    //ImGui::ShowUserGuide();
 
     // Render everything
     UI::passDisplay();