Fixed imgui rendering

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140904 ]
+    * Fixed imgui colors
+
     [ 20140903 ]
     * Finishing imgui integration, but now as UI layer and not on top of everything
     * All global objects are now explicitly allocated in main and stored in shared_ptrs

include/TextureManager.h

@@ -73,12 +73,13 @@ public:
      * \param mode mode of image
      * \param bpp bits per pixel of image
      * \param slot slot (ID) of image
+     * \param filter if the texture should be mipmap filtered
      * \returns texture ID or < 0 on error
      */
     int loadBufferSlot(unsigned char *image,
                         unsigned int width, unsigned int height,
                         ColorMode mode, unsigned int bpp,
-                        unsigned int slot);
+                        unsigned int slot, bool filter = true);
 
     int loadImage(const char *filename);
 

src/Debug.cpp

@@ -61,17 +61,14 @@ int Debug::initialize() {
     io.RenderDrawListsFn = Debug::renderImGui;
 
     // Load font texture
-    //glGenTextures(1, &fontTex);
-    //glBindTexture(GL_TEXTURE_2D, fontTex);
-    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     const void* png_data;
     unsigned int png_size;
     ImGui::GetDefaultFontData(NULL, NULL, &png_data, &png_size);
     int tex_x, tex_y, tex_comp;
-    void* tex_data = stbi_load_from_memory((const unsigned char*)png_data, (int)png_size, &tex_x, &tex_y, &tex_comp, 0);
-    //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex_x, tex_y, 0, GL_RGBA, GL_UNSIGNED_BYTE, tex_data);
-    fontTex = getTextureManager().loadBufferSlot((unsigned char *)tex_data, tex_x, tex_y, RGBA, 32, 0);
+    void* tex_data = stbi_load_from_memory((const unsigned char*)png_data,
+            (int)png_size, &tex_x, &tex_y, &tex_comp, 0);
+    fontTex = getTextureManager().loadBufferSlot((unsigned char *)tex_data,
+            tex_x, tex_y, RGBA, 32, 0, false); // TODO use proper slot!
     stbi_image_free(tex_data);
 
     return 0;

src/TextureManager.cpp

@@ -111,7 +111,7 @@ void TextureManager::bindMultiTexture(int texture0, int texture1) {
 int TextureManager::loadBufferSlot(unsigned char *image,
         unsigned int width, unsigned int height,
         ColorMode mode, unsigned int bpp,
-        unsigned int slot) {
+        unsigned int slot, bool filter) {
     assert(image != NULL);
     assert(width > 0);
     assert(height > 0);
@@ -163,17 +163,19 @@ int TextureManager::loadBufferSlot(unsigned char *image,
 
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
-    glBindTexture(GL_TEXTURE_2D, mTextureIds[slot]);
+    glBindTexture(GL_TEXTURE_2D, mTextureIds.at(slot));
 
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-    //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    if (filter) {
+        glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+    } else {
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    }
 
-    glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
     glTexImage2D(GL_TEXTURE_2D, 0, bpp / 8, width, height, 0, glcMode, GL_UNSIGNED_BYTE, image);
 
     //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);