Default Font using ImGUI

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141016 ]
+    * ImGuis Font can now be used if no other is available
+
     [ 20141015 ]
     * Added rudimentary command history support for Console
 

include/Font.h

@@ -17,7 +17,7 @@ class Font {
 public:
     static void shutdown();
 
-    static int initialize(std::string font);
+    static int initialize(std::string font = "");
 
     static unsigned int widthText(float scale, std::string s);
 

include/FontImGui.h

@@ -0,0 +1,28 @@
+/*!
+ * \file include/FontImGui.h
+ * \brief Default Font implementation
+ *
+ * \author xythobuz
+ */
+
+#ifndef _FONT_IMGUI_H_
+#define _FONT_IMGUI_H_
+
+/*!
+ * \brief Default Font implementation
+ */
+class FontImGui {
+public:
+    static unsigned int widthText(float scale, std::string s);
+
+    static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
+
+    static void drawText(unsigned int x, unsigned int y, float scale,
+            const unsigned char color[4], std::string s);
+
+    static void drawTextWrapped(unsigned int x, unsigned int y, float scale,
+            const unsigned char color[4], unsigned int maxWidth, std::string s);
+};
+
+#endif
+

include/UI.h

@@ -31,9 +31,9 @@ public:
     static void handleMouseMotion(int xrel, int yrel, int xabs, int yabs);
     static void handleMouseScroll(int xrel, int yrel);
 
-private:
     static void renderImGui(ImDrawList** const draw_lists, int count);
 
+private:
     static bool visible;
     static unsigned int fontTex;
     static std::string iniFilename;

src/CMakeLists.txt

@@ -63,6 +63,7 @@ set (SRCS ${SRCS} "Console.cpp")
 set (SRCS ${SRCS} "Entity.cpp")
 set (SRCS ${SRCS} "Exception.cpp")
 set (SRCS ${SRCS} "Font.cpp")
+set (SRCS ${SRCS} "FontImGui.cpp")
 set (SRCS ${SRCS} "FontTRLE.cpp")
 set (SRCS ${SRCS} "Game.cpp")
 set (SRCS ${SRCS} "Log.cpp")

src/Font.cpp

@@ -10,6 +10,7 @@
 #include "utils/strings.h"
 #include "Window.h"
 #include "Font.h"
+#include "FontImGui.h"
 #include "FontTRLE.h"
 
 #ifdef USING_SDL_FONT
@@ -36,8 +37,12 @@ int Font::initialize(std::string font) {
 #endif
     }
 
-    getLog() << "Unknown font file format: " << font << Log::endl;
-    return -1;
+    if (font != "") {
+        getLog() << "Unknown font file format: " << font << Log::endl;
+        return -1;
+    } else {
+        return 0;
+    }
 }
 
 unsigned int Font::widthText(float scale, std::string s) {
@@ -47,9 +52,9 @@ unsigned int Font::widthText(float scale, std::string s) {
     } else if (stringEndsWith(fontName, ".ttf")) {
         return FontSDL::widthText(scale, s);
 #endif
+    } else {
+        return FontImGui::widthText(scale, s);
     }
-
-    return 0;
 }
 
 unsigned int Font::heightText(float scale, unsigned int maxWidth, std::string s) {
@@ -59,9 +64,9 @@ unsigned int Font::heightText(float scale, unsigned int maxWidth, std::string s)
     } else if (stringEndsWith(fontName, ".ttf")) {
         return FontSDL::heightText(scale, maxWidth, s);
 #endif
+    } else {
+        return FontImGui::heightText(scale, maxWidth, s);
     }
-
-    return 0;
 }
 
 void Font::drawText(unsigned int x, unsigned int y, float scale,
@@ -72,6 +77,8 @@ void Font::drawText(unsigned int x, unsigned int y, float scale,
     } else if (stringEndsWith(fontName, ".ttf")) {
         FontSDL::drawText(x, y, scale, color, s);
 #endif
+    } else {
+        FontImGui::drawText(x, y, scale, color, s);
     }
 }
 
@@ -83,6 +90,8 @@ void Font::drawTextWrapped(unsigned int x, unsigned int y, float scale,
     } else if (stringEndsWith(fontName, ".ttf")) {
         FontSDL::drawTextWrapped(x, y, scale, color, maxWidth, s);
 #endif
+    } else {
+        FontImGui::drawTextWrapped(x, y, scale, color, maxWidth, s);
     }
 }
 

src/FontImGui.cpp

@@ -0,0 +1,45 @@
+/*!
+ * \file src/FontImGui.cpp
+ * \brief Default Font implementation
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "UI.h"
+#include "FontImGui.h"
+
+#define SCALE_CALC 1.0f
+#define SCALE_DRAW 20.0f
+
+unsigned int FontImGui::widthText(float scale, std::string s) {
+    ImGuiIO& io = ImGui::GetIO();
+    ImVec2 size = io.Font->CalcTextSizeA(scale * SCALE_CALC, io.DisplaySize.y, s.c_str(), s.c_str() + s.length());
+    return size.y;
+}
+
+void FontImGui::drawText(unsigned int x, unsigned int y, float scale,
+        const unsigned char color[4], std::string s) {
+    ImGuiIO& io = ImGui::GetIO();
+    ImVec2 pos = ImVec2(x, y);
+    ImU32 col = color[0] | (color[1] << 8) | (color[2] << 16) | (color[3] << 24);
+
+    ImDrawList dl;
+    dl.PushClipRect(ImVec4(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y));
+    dl.AddText(io.Font, scale * SCALE_DRAW, pos, col, s.c_str(), s.c_str() + s.length());
+
+    ImDrawList* dlp = &dl;
+    UI::renderImGui(&dlp, 1);
+}
+
+unsigned int FontImGui::heightText(float scale, unsigned int maxWidth, std::string s) {
+    ImGuiIO& io = ImGui::GetIO();
+    ImVec2 size = io.Font->CalcTextSizeA(scale * SCALE_CALC, maxWidth, s.c_str(), s.c_str() + s.length());
+    return size.x;
+}
+
+void FontImGui::drawTextWrapped(unsigned int x, unsigned int y, float scale,
+        const unsigned char color[4], unsigned int maxWidth, std::string s) {
+    drawText(x, y, scale, color, s);
+}
+

src/UI.cpp

@@ -167,8 +167,6 @@ void UI::eventsFinished() {
                 || ((!io.WantCaptureMouse) && clicked)
             )) {
         visible = false;
-
-        getLog() << io.WantCaptureKeyboard << io.WantCaptureMouse << io.KeysDown[escapeKey] << Log::endl;
     }
 
     if (getWindow().getTextInput() != visible)

src/main.cpp

@@ -147,8 +147,13 @@ int main(int argc, char* argv[]) {
         return -2;
     }
 
-    // Font initialization requires GL context, but is called from config file
-    // So we need to initialize some things before executing the config
+    // Initialize Font
+    error = Font::initialize();
+    if (error != 0) {
+        std::cout << "Could not initialize Font (" << error << ")!" << std::endl;
+        return -3;
+    }
+
     if (configFileToUse == "") {
         if (Command::executeFile(DEFAULT_CONFIG_FILE) != 0) {
             if (Command::executeFile(std::string(DEFAULT_CONFIG_PATH) + "/" + DEFAULT_CONFIG_FILE) != 0) {
@@ -163,17 +168,6 @@ int main(int argc, char* argv[]) {
         Command::executeFile(configFileToUse);
     }
 
-    // Initialize Font
-#ifdef USING_SDL_FONT
-    error = Font::initialize(getRunTime().getDataDir() + "/test.ttf");
-#else
-    error = Font::initialize(getRunTime().getDataDir() + "/font.pc");
-#endif
-    if (error != 0) {
-        std::cout << "Could not initialize Font (" << error << ")!" << std::endl;
-        return -3;
-    }
-
     // Initialize Sound
     error = getSound().initialize();
     if (error != 0) {