Can show font bounding box

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140118 ]
+    * Added ability to visualize font _outline_
+
     [ 20140117 ]
     * Updated imgui, fix for Logging to Clipboard included.
     * Sprites and SpriteSequences are now stored independently in World.

include/system/Font.h

@@ -34,9 +34,15 @@ class Font {
     static void drawTextCentered(unsigned int x, unsigned int y, float scale,
                                  const unsigned char color[4], unsigned int width, std::string s);
 
+    static void setShowFontBox(bool s) { showFontBox = s; }
+    static bool getShowFontBox() { return showFontBox; }
+
   private:
+    static void drawFontBox(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
+
     static bool isInit;
     static std::string fontName;
+    static bool showFontBox;
 };
 
 #endif

include/system/Shader.h

@@ -57,7 +57,8 @@ class Shader {
     static void set2DState(bool on);
 
     static void drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, glm::vec4 color, unsigned int texture,
-                       TextureStorage store = TextureStorage::SYSTEM, Shader& shader = textShader);
+                       TextureStorage store = TextureStorage::SYSTEM, unsigned int mode = GL_TRIANGLES,
+                       Shader& shader = textShader);
 
     static void drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, unsigned int texture, glm::mat4 MVP,
                        TextureStorage store = TextureStorage::GAME, Shader& shader = textureShader);

src/Console.cpp

@@ -79,7 +79,7 @@ void Console::display() {
             scrollToBottom = true;
         }
 
-        static bool visibleLogs[LOG_COUNT] = { true, true, true, true, false };
+        static bool visibleLogs[LOG_COUNT] = { true, true, true, true, true };
         ImGui::Checkbox("Error##log", &visibleLogs[1]);
         ImGui::SameLine();
         ImGui::Checkbox("Warning##log", &visibleLogs[2]);
@@ -125,7 +125,7 @@ void Console::display() {
             }
 
             ImGui::PushStyleColor(ImGuiCol_Text, col);
-            ImGui::TextUnformatted(entry.text.c_str());
+            ImGui::TextWrapped("%s", entry.text.c_str());
             ImGui::PopStyleColor();
         }
         if (logToTTY || logToClipboard || logToFile) {

src/Render.cpp

@@ -14,6 +14,7 @@
 #include "Log.h"
 #include "StaticMesh.h"
 #include "World.h"
+#include "system/Font.h"
 #include "system/Shader.h"
 #include "system/Window.h"
 #include "Render.h"
@@ -213,6 +214,11 @@ void Render::displayUI() {
         if (ImGui::Checkbox("StaticMesh##bbox", &showBoundingBox2)) {
             StaticMesh::setShowBoundingBox(showBoundingBox2);
         }
+        ImGui::SameLine();
+        bool showFontBox = Font::getShowFontBox();
+        if (ImGui::Checkbox("Font##bbox", &showFontBox)) {
+            Font::setShowFontBox(showFontBox);
+        }
 
         ImGui::Separator();
         ImGui::Text("Renderable Objects:");

src/system/Font.cpp

@@ -5,16 +5,20 @@
  * \author xythobuz
  */
 
+#include <vector>
+
 #include "global.h"
 #include "Log.h"
 #include "utils/strings.h"
 #include "system/FontImGui.h"
 #include "system/FontTRLE.h"
 #include "system/FontTTF.h"
+#include "system/Shader.h"
 #include "system/Font.h"
 
 bool Font::isInit = false;
 std::string Font::fontName;
+bool Font::showFontBox = false;
 
 void Font::shutdown() {
     FontTRLE::shutdown();
@@ -66,6 +70,12 @@ void Font::drawText(unsigned int x, unsigned int y, float scale,
     } else {
         FontImGui::drawText(x, y, scale, color, s);
     }
+
+    if (showFontBox) {
+        unsigned int w = widthText(scale, s);
+        unsigned int h = heightText(scale, w + 100, s); // Should always be one line
+        drawFontBox(x, y, w, h);
+    }
 }
 
 void Font::drawTextWrapped(unsigned int x, unsigned int y, float scale,
@@ -77,6 +87,14 @@ void Font::drawTextWrapped(unsigned int x, unsigned int y, float scale,
     } else {
         FontImGui::drawTextWrapped(x, y, scale, color, maxWidth, s);
     }
+
+    if (showFontBox) {
+        unsigned int w = widthText(scale, s);
+        if (w > maxWidth)
+            w = maxWidth;
+        unsigned int h = heightText(scale, w, s); // Should always be one line
+        drawFontBox(x, y, w, h);
+    }
 }
 
 void Font::drawTextCentered(unsigned int x, unsigned int y, float scale,
@@ -84,3 +102,26 @@ void Font::drawTextCentered(unsigned int x, unsigned int y, float scale,
     drawText(x + ((width / 2) - (widthText(scale, s) / 2)), y, scale, color, s);
 }
 
+void Font::drawFontBox(unsigned int x, unsigned int y, unsigned int w, unsigned int h) {
+    static ShaderBuffer vert, uv;
+    std::vector<glm::vec2> vertices, uvs;
+
+    vertices.emplace_back(x, y);
+    vertices.emplace_back(x + w, y);
+    vertices.emplace_back(x + w, y + h);
+    vertices.emplace_back(x, y + h);
+    vertices.emplace_back(x, y);
+
+    uvs.emplace_back(0.0f, 0.0f);
+    uvs.emplace_back(1.0f, 0.0f);
+    uvs.emplace_back(1.0f, 1.0f);
+    uvs.emplace_back(0.0f, 1.0f);
+    uvs.emplace_back(0.0f, 0.0f);
+
+    vert.bufferData(vertices);
+    uv.bufferData(uvs);
+
+    Shader::drawGL(vert, uv, glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), TEXTURE_WHITE,
+                   TextureStorage::SYSTEM, GL_LINE_STRIP);
+}
+

src/system/Shader.cpp

@@ -235,9 +235,11 @@ void Shader::set2DState(bool on) {
 }
 
 void Shader::drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, glm::vec4 color,
-                    unsigned int texture, TextureStorage store, Shader& shader) {
+                    unsigned int texture, TextureStorage store, unsigned int mode,
+                    Shader& shader) {
     assert(vertices.getSize() == uvs.getSize());
-    assert((vertices.getSize() % 3) == 0);
+    if (mode == GL_TRIANGLES)
+        assert((vertices.getSize() % 3) == 0)
 
     shader.use();
     shader.loadUniform(0, Window::getSize());
@@ -247,7 +249,7 @@ void Shader::drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, glm::vec4 color,
     uvs.bindBuffer(1, 2);
 
     set2DState(true);
-    glDrawArrays(GL_TRIANGLES, 0, vertices.getSize());
+    glDrawArrays(mode, 0, vertices.getSize());
     set2DState(false);
 
     vertices.unbind(0);