Fonts can be changed on-the-fly

ChangeLog.md

@@ -8,6 +8,9 @@
     * Fixed Bug in new GLUT implementation: Console now working properly
     * Fixed Bug where the debug overlay was flashing for a frame if it’s key is used in
       combination with a modifier (in this case CMD + Q to quit)
+    * All Font interfaces are now static-methods only
+    * The used Font can now be changed on the fly (even between different Font types)
+    * Removed FontManager, moved functionality into Font
 
     [ 20141007 ]
     * Set all RunTime vars to sensible defaults, so OpenRaider can try to start

include/Font.h

@@ -8,43 +8,34 @@
 #ifndef _FONT_H_
 #define _FONT_H_
 
-#include  <string>
+#include <string>
 
 /*!
  * \brief Font interface
  */
 class Font {
 public:
+    static void shutdown();
 
-    /*!
-     * \brief Deconstructs an object of Font
-     */
-    virtual ~Font();
+    static int initialize(std::string font);
 
-    virtual void setFont(std::string font);
+    static unsigned int widthText(float scale, std::string s);
 
-    virtual int initialize() = 0;
+    static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
 
-    virtual unsigned int widthText(float scale, std::string s) = 0;
+    static void drawText(unsigned int x, unsigned int y, float scale,
+            const unsigned char color[4], std::string s);
 
-    virtual void drawText(unsigned int x, unsigned int y, float scale,
-            const unsigned char color[4], std::string s) = 0;
+    static void drawTextWrapped(unsigned int x, unsigned int y, float scale,
+            const unsigned char color[4], unsigned int maxWidth, std::string s);
 
-    virtual unsigned int heightText(float scale, unsigned int maxWidth, std::string s) = 0;
-
-    virtual void drawTextWrapped(unsigned int x, unsigned int y, float scale,
-            const unsigned char color[4], unsigned int maxWidth, std::string s) = 0;
-
-    // Implemented in Font.cpp using widthText & drawText
-    virtual void drawTextCentered(unsigned int x, unsigned int y, float scale,
+    static void drawTextCentered(unsigned int x, unsigned int y, float scale,
             const unsigned char color[4], unsigned int width, std::string s);
 
-protected:
-    bool mFontInit;
-    std::string mFontName;
+private:
+    static bool isInit;
+    static std::string fontName;
 };
 
-Font &getFont();
-
 #endif
 

include/FontManager.h

@@ -1,50 +0,0 @@
-/*!
- * \file include/FontManager.h
- * \brief Font manager
- *
- * \author xythobuz
- */
-
-#ifndef _FONT_MANAGER_H_
-#define _FONT_MANAGER_H_
-
-#include <vector>
-
-#include "Font.h"
-
-class FontManager : public Font {
-public:
-
-    /*!
-     * \brief Constructs an object of FontManager
-     */
-    FontManager();
-
-    /*!
-     * \brief Deconstructs an object of FontManager
-     */
-    virtual ~FontManager();
-
-    virtual int initialize();
-
-    virtual unsigned int widthText(float scale, std::string s);
-
-    virtual void drawText(unsigned int x, unsigned int y, float scale,
-            const unsigned char color[4], std::string s);
-
-    virtual unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
-
-    virtual void drawTextWrapped(unsigned int x, unsigned int y, float scale,
-            const unsigned char color[4], unsigned int maxWidth, std::string s);
-
-private:
-
-    void add(Font *f, std::string e);
-
-    int font;
-    std::vector<Font *> fonts;
-    std::vector<std::string> extensions;
-};
-
-#endif
-

include/FontSDL.h

@@ -10,39 +10,29 @@
 
 #include "SDL_ttf.h"
 
-#include "Font.h"
-
 /*!
  * \brief SDL Font implementation
  */
-class FontSDL : public Font {
+class FontSDL {
 public:
+    static void shutdown();
 
-    /*!
-     * \brief Constructs an object of FontSDL
-     */
-    FontSDL();
-
-    /*!
-     * \brief Deconstructs an object of FontSDL
-     */
-    virtual ~FontSDL();
+    static int initialize(std::string font);
 
-    virtual int initialize();
+    static unsigned int widthText(float scale, std::string s);
 
-    virtual unsigned int widthText(float scale, std::string s);
+    static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
 
-    virtual void drawText(unsigned int x, unsigned int y, float scale,
+    static void drawText(unsigned int x, unsigned int y, float scale,
             const unsigned char color[4], std::string s);
 
-    virtual unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
-
-    virtual void drawTextWrapped(unsigned int x, unsigned int y, float scale,
+    static void drawTextWrapped(unsigned int x, unsigned int y, float scale,
             const unsigned char color[4], unsigned int maxWidth, std::string s);
 
 private:
-    TTF_Font *mFont;
-    unsigned int mFontTexture;
+    static bool mFontInit;
+    static TTF_Font *mFont;
+    static unsigned int mFontTexture;
 };
 
 #endif

include/FontTRLE.h

@@ -8,153 +8,37 @@
 #ifndef _FONT_TRLE_H_
 #define _FONT_TRLE_H_
 
-#include "Font.h"
-
 /*!
  * \brief Tomb Raider Level Editor Font loader
  */
-class FontTRLE : public Font {
+class FontTRLE {
 public:
+    static void shutdown();
 
-    /*!
-     * \brief Constructs an object of FontTRLE
-     */
-    FontTRLE();
-
-    /*!
-     * \brief Deconstructs an object of FontTRLE
-     */
-    virtual ~FontTRLE();
+    static int initialize(std::string font);
 
-    virtual int initialize();
+    static unsigned int widthText(float scale, std::string s);
 
-    virtual unsigned int widthText(float scale, std::string s);
+    static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
 
-    virtual void drawText(unsigned int x, unsigned int y, float scale,
+    static void drawText(unsigned int x, unsigned int y, float scale,
             const unsigned char color[4], std::string s);
 
-    virtual unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
-
-    virtual void drawTextWrapped(unsigned int x, unsigned int y, float scale,
+    static void drawTextWrapped(unsigned int x, unsigned int y, float scale,
             const unsigned char color[4], unsigned int maxWidth, std::string s);
 
 private:
-
-    void loadLPS(std::string f);
-    void writeChar(unsigned int index, unsigned int xDraw, unsigned int yDraw,
+    static void setDefaultOffsets();
+    static void loadLPS(std::string f);
+    static void writeChar(unsigned int index, unsigned int xDraw, unsigned int yDraw,
             float scale, const unsigned char color[4]);
 
-    unsigned int mFontTexture;
+    static bool mFontInit;
+    static unsigned int mFontTexture;
 
     // 106 entries: (x, y, w, h, offset)
-    int offsets[106][5] = {
-        { 174,  52,   3,  12, -11 },
-        {  98,  58,   6,   4, -10 },
-        {  82,  26,  13,  11, -10 },
-        {  78,  38,   9,  13, -10 },
-        { 214,  13,  14,  11, -9  },
-        {  40,  26,  13,  11, -10 },
-        { 157,  57,   5,   6, -11 },
-        { 204,  39,   5,  15, -12 },
-        {  34,  40,   5,  15, -12 },
-        { 184,  59,   4,   4, -11 },
-        {  22,  40,  10,  10, -9  },
-        { 178,  59,   4,   4, -2  },
-        { 106,  60,   7,   2, -4  },
-        { 114,  60,   4,   3, -2  },
-        { 212,  38,   8,  14, -12 },
-        {  88,  49,   9,   9, -8  },
-        { 200,  55,   5,   9, -8  },
-        {  46,  52,   8,   9, -8  },
-        {  88,  38,   7,  10, -8  },
-        {  62,  40,  10,  10, -8  },
-        { 142,  48,   8,  11, -9  },
-        { 232,  50,   8,  10, -9  },
-        { 120,  47,   8,  11, -9  },
-        {  22,  51,   8,  10, -9  },
-        { 110,  49,   8,  10, -8  },
-        { 152,  57,   4,   7, -7  },
-        { 136,  57,   4,   9, -7  },
-        { 178,  40,  11,   9, -8  },
-        { 210,  53,  10,   6, -7  },
-        { 240,  40,  11,   9, -7  },
-        {  12,  39,   9,  12, -11 },
-        {  66,  13,  15,  13, -10 },
-        { 130,  13,  13,  12, -11 },
-        { 214,  25,  12,  12, -11 },
-        { 132,  35,  10,  12, -11 },
-        {   0,  26,  12,  12, -11 },
-        {  14,  26,  12,  12, -11 },
-        {  66,  27,  11,  12, -11 },
-        { 182,  27,  11,  12, -11 },
-        { 200,  13,  13,  12, -11 },
-        { 222,  54,   4,  12, -11 },
-        {  56,  52,   4,  15, -11 },
-        { 230,  15,  12,  12, -11 },
-        { 144,  35,  10,  12, -11 },
-        {  48,  13,  17,  12, -11 },
-        { 144,  13,  13,  12, -11 },
-        {  54,  26,  11,  12, -11 },
-        { 200,  26,  11,  12, -11 },
-        { 240,   0,  13,  14, -11 },
-        { 158,  13,  13,  12, -11 },
-        { 156,  35,  10,  12, -11 },
-        { 172,  13,  13,  12, -11 },
-        {  98,  13,  14,  12, -11 },
-        {  82,  13,  14,  12, -11 },
-        {  24,  13,  22,  12, -11 },
-        { 186,  13,  12,  13, -11 },
-        { 114,  13,  14,  12, -11 },
-        { 228,  28,  11,  12, -11 },
-        {  62,  60,   5,   3, -4  },
-        { 248,  59,   5,   3, -4  },
-        {  88,  59,   7,   3, -4  },
-        { 142,  60,   6,   2, -3  },
-        { 120,  59,   7,   3, -4  },
-        { 242,  59,   4,   4, -11 },
-        {  98,  49,  10,   8, -7  },
-        {  96,  35,  10,  13, -12 },
-        {  72,  52,   8,   8, -7  },
-        {   0,  39,  10,  11, -10 },
-        { 164,  52,   8,   8, -7  },
-        { 168,  38,   9,  13, -12 },
-        { 120,  35,  11,  11, -7  },
-        { 108,  35,  10,  13, -12 },
-        { 194,  27,   5,  11, -10 },
-        {  40,  51,   5,  15, -10 },
-        {  28,  26,  11,  13, -12 },
-        {  82,  52,   5,  12, -11 },
-        {  96,  26,  17,   8, -7  },
-        { 152,  48,  11,   8, -7  },
-        {  62,  51,   9,   8, -7  },
-        { 244,  15,  10,  12, -7  },
-        {  52,  39,   9,  12, -7  },
-        {  10,  52,   9,   8, -7  },
-        { 190,  52,   8,   8, -7  },
-        {   0,  51,   8,  10, -9  },
-        { 178,  50,  10,   8, -7  },
-        { 130,  48,  11,   8, -7  },
-        { 132,  26,  17,   8, -7  },
-        { 242,  50,  10,   8, -7  },
-        {  40,  38,  10,  12, -7  },
-        { 232,  41,   7,   8, -7  },
-        { 222,  41,   8,  12, -7  },
-        { 130,  57,   5,   8, -7  },
-        { 194,  39,   9,  12, -10 },
-        {  32,  56,   4,  11, -10 },
-        {   1,  14,  22,  11, -10 },
-        { 192,   0,  23,  13, -10 },
-        { 168,   0,  23,  12, -10 },
-        { 216,   0,  23,  12, -10 },
-        { 150,  26,  17,   8, -8  },
-        { 168,  26,  11,  11, -9  },
-        { 114,  26,  17,   8, -8  },
-        { 240,  28,  12,  11, -9  },
-        {   0,   0,  40,  12, -10 },
-        {  84,   0,  39,  11, -10 },
-        {  42,   0,  39,  11, -10 },
-        { 126,   0,  39,  11, -10 },
-    };
+    static int offsets[106][5];
+    static int defaultOffsets[106][5];
 };
 
 #endif

include/RunTime.h

@@ -10,6 +10,12 @@
 
 #include <string>
 
+// Defaults
+#define DEFAULT_CONFIG_PATH "~/.OpenRaider"
+#define DEFAULT_CONFIG_FILE "OpenRaider.ini"
+#define DEFAULT_WIDTH 1280
+#define DEFAULT_HEIGHT 720
+
 /*!
  * \brief Main Game Singleton
  */

include/global.h

@@ -9,12 +9,6 @@
 
 #include "config.h"
 
-// Defaults
-#define DEFAULT_CONFIG_PATH "~/.OpenRaider"
-#define DEFAULT_CONFIG_FILE "OpenRaider.ini"
-#define DEFAULT_WIDTH 640
-#define DEFAULT_HEIGHT 480
-
 void renderFrame();
 
 // Supported pixelmap color formats

src/CMakeLists.txt

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

src/Font.cpp

@@ -6,16 +6,84 @@
  */
 
 #include "global.h"
+#include "Log.h"
 #include "utils/strings.h"
 #include "Window.h"
 #include "Font.h"
+#include "FontTRLE.h"
 
-Font::~Font() {
+#ifdef USING_SDL_FONT
+#include "FontSDL.h"
+#endif
+
+bool Font::isInit = false;
+std::string Font::fontName;
+
+void Font::shutdown() {
+    FontTRLE::shutdown();
+#ifdef USING_SDL_FONT
+    FontSDL::shutdown();
+#endif
+}
+
+int Font::initialize(std::string font) {
+    fontName = font;
+    if (stringEndsWith(fontName, ".pc")) {
+        return FontTRLE::initialize(fontName);
+#ifdef USING_SDL_FONT
+    } else if (stringEndsWith(fontName, ".ttf")) {
+        return FontSDL::initialize(fontName);
+#endif
+    }
+
+    getLog() << "Unknown font file format: " << font << Log::endl;
+    return -1;
+}
+
+unsigned int Font::widthText(float scale, std::string s) {
+    if (stringEndsWith(fontName, ".pc")) {
+        return FontTRLE::widthText(scale, s);
+#ifdef USING_SDL_FONT
+    } else if (stringEndsWith(fontName, ".ttf")) {
+        return FontSDL::widthText(scale, s);
+#endif
+    }
+
+    return 0;
+}
+
+unsigned int Font::heightText(float scale, unsigned int maxWidth, std::string s) {
+    if (stringEndsWith(fontName, ".pc")) {
+        return FontTRLE::heightText(scale, maxWidth, s);
+#ifdef USING_SDL_FONT
+    } else if (stringEndsWith(fontName, ".ttf")) {
+        return FontSDL::heightText(scale, maxWidth, s);
+#endif
+    }
+
+    return 0;
+}
+
+void Font::drawText(unsigned int x, unsigned int y, float scale,
+        const unsigned char color[4], std::string s) {
+    if (stringEndsWith(fontName, ".pc")) {
+        FontTRLE::drawText(x, y, scale, color, s);
+#ifdef USING_SDL_FONT
+    } else if (stringEndsWith(fontName, ".ttf")) {
+        FontSDL::drawText(x, y, scale, color, s);
+#endif
+    }
 }
 
-void Font::setFont(std::string font) {
-    assert(mFontInit == false);
-    mFontName = font;
+void Font::drawTextWrapped(unsigned int x, unsigned int y, float scale,
+        const unsigned char color[4], unsigned int maxWidth, std::string s) {
+    if (stringEndsWith(fontName, ".pc")) {
+        FontTRLE::drawTextWrapped(x, y, scale, color, maxWidth, s);
+#ifdef USING_SDL_FONT
+    } else if (stringEndsWith(fontName, ".ttf")) {
+        FontSDL::drawTextWrapped(x, y, scale, color, maxWidth, s);
+#endif
+    }
 }
 
 void Font::drawTextCentered(unsigned int x, unsigned int y, float scale,

src/FontManager.cpp

@@ -1,86 +0,0 @@
-/*!
- * \file src/FontManager.cpp
- * \brief Font Manager
- *
- * \author xythobuz
- */
-
-#include "global.h"
-#include "utils/strings.h"
-#include "RunTime.h"
-#include "FontManager.h"
-#include "Font.h"
-#include "FontTRLE.h"
-
-#ifdef USING_SDL_FONT
-#include "FontSDL.h"
-#endif
-
-FontManager::FontManager() {
-    add(new FontTRLE(), ".pc");
-
-#ifdef USING_SDL_FONT
-    add(new FontSDL(), ".ttf");
-#endif
-
-    mFontInit = false;
-    font = -1;
-
-    // Default font path
-#ifdef USING_SDL_FONT
-    setFont(getRunTime().getDataDir() + "/test.ttf");
-#else
-    setFont(getRunTime().getDataDir() + "/font.pc");
-#endif
-}
-
-FontManager::~FontManager() {
-    while (!fonts.empty()) {
-        delete fonts.back();
-        fonts.pop_back();
-    }
-}
-
-void FontManager::add(Font *f, std::string e) {
-    fonts.push_back(f);
-    extensions.push_back(e);
-}
-
-int FontManager::initialize() {
-    for (unsigned int i = 0; i < fonts.size(); i++) {
-        if (stringEndsWith(mFontName, extensions.at(i))) {
-            font = i;
-            break;
-        }
-    }
-
-    if (font == -1)
-        return -1;
-
-    mFontInit = true;
-    fonts.at(font)->setFont(mFontName);
-    return fonts.at(font)->initialize();
-}
-
-unsigned int FontManager::widthText(float scale, std::string s) {
-    assert(font != -1);
-    return fonts.at(font)->widthText(scale, s);
-}
-
-void FontManager::drawText(unsigned int x, unsigned int y, float scale,
-        const unsigned char color[4], std::string s) {
-    assert(font != -1);
-    fonts.at(font)->drawText(x, y, scale, color, s);
-}
-
-unsigned int FontManager::heightText(float scale, unsigned int maxWidth, std::string s) {
-    assert(font != -1);
-    return fonts.at(font)->heightText(scale, maxWidth, s);
-}
-
-void FontManager::drawTextWrapped(unsigned int x, unsigned int y, float scale,
-        const unsigned char color[4], unsigned int maxWidth, std::string s) {
-    assert(font != -1);
-    fonts.at(font)->drawTextWrapped(x, y, scale, color, maxWidth, s);
-}
-

src/FontSDL.cpp

@@ -5,53 +5,57 @@
  * \author xythobuz
  */
 
-#include <stdio.h>
+#include <iostream>
 
 #include "global.h"
 #include "FontSDL.h"
 
-FontSDL::FontSDL() {
-    mFont = NULL;
-    mFontInit = false;
-    mFontTexture = 0;
-}
+bool FontSDL::mFontInit = false;
+TTF_Font* FontSDL::mFont = nullptr;
+unsigned int FontSDL::mFontTexture = 0;
 
-FontSDL::~FontSDL() {
-    if (mFont)
+void FontSDL::shutdown() {
+    if (mFont != nullptr)
         TTF_CloseFont(mFont);
+    mFont = nullptr;
 
     if (mFontInit) {
         TTF_Quit();
         glDeleteTextures(1, &mFontTexture);
+        mFontInit = false;
     }
 }
 
-int FontSDL::initialize() {
-    assert(mFontInit == false);
+int FontSDL::initialize(std::string font) {
+    if (!mFontInit) {
+        if (TTF_Init() != 0) {
+            std::cout << "Could not initialize SDL-TTF!" << std::endl;
+            return -1;
+        }
 
-    if (TTF_Init() != 0) {
-        printf("Could not initialize SDL-TTF!\n");
-        return -1;
+        glGenTextures(1, &mFontTexture);
+        mFontInit = true;
     }
 
-    mFont = TTF_OpenFont(mFontName.c_str(), 24);
-    if (mFont == NULL) {
-        printf("TTF_OpenFont Error: %s\n", TTF_GetError());
+    if (mFont != nullptr)
+        TTF_CloseFont(mFont);
+
+    mFont = TTF_OpenFont(font.c_str(), 24);
+    if (mFont == nullptr) {
+        std::cout << "TTF_OpenFont Error: " << TTF_GetError() << std::endl;
         return -2;
     }
 
-    glGenTextures(1, &mFontTexture);
-
-    mFontInit = true;
     return 0;
 }
 
 unsigned int FontSDL::widthText(float scale, std::string s) {
     assert(mFontInit == true);
+    assert(mFont != nullptr);
 
     int w;
-    if (TTF_SizeUTF8(mFont, s.c_str(), &w, NULL) != 0) {
-        printf("TTF_SizeUTF8 Error: %s\n", TTF_GetError());
+    if (TTF_SizeUTF8(mFont, s.c_str(), &w, nullptr) != 0) {
+        std::cout << "TTF_SizeUTF8 Error: " << TTF_GetError() << std::endl;
         return s.length() * 15 * scale;
     }
     return w * scale;
@@ -60,6 +64,7 @@ unsigned int FontSDL::widthText(float scale, std::string s) {
 void FontSDL::drawText(unsigned int x, unsigned int y, float scale,
         const unsigned char color[4], std::string s) {
     assert(mFontInit == true);
+    assert(mFont != nullptr);
     assert(s.length() > 0);
 
     SDL_Color col;
@@ -69,8 +74,8 @@ void FontSDL::drawText(unsigned int x, unsigned int y, float scale,
     col.a = color[3];
 
     SDL_Surface *surface = TTF_RenderUTF8_Blended(mFont, s.c_str(), col);
-    if (surface == NULL) {
-        printf("TTF_RenderUTF8_Blended Error: %s\n", TTF_GetError());
+    if (surface == nullptr) {
+        std::cout << "TTF_RenderUTF8_Blended Error: " << TTF_GetError() << std::endl;
         return;
     }
 
@@ -120,13 +125,14 @@ void FontSDL::drawText(unsigned int x, unsigned int y, float scale,
 
 unsigned int FontSDL::heightText(float scale, unsigned int maxWidth, std::string s) {
     assert(mFontInit == true);
+    assert(mFont != nullptr);
     assert(s.length() > 0);
     assert(maxWidth > 0);
 
     SDL_Color col;
     SDL_Surface *surface = TTF_RenderUTF8_Blended_Wrapped(mFont, s.c_str(), col, maxWidth);
-    if (surface == NULL) {
-        printf("TTF_RenderUTF8_Blended_Wrapped Error: %s\n", TTF_GetError());
+    if (surface == nullptr) {
+        std::cout << "TTF_RenderUTF8_Blended_Wrapped Error: " << TTF_GetError() << std::endl;
         return 0;
     }
     int h = surface->h * scale;
@@ -137,6 +143,7 @@ unsigned int FontSDL::heightText(float scale, unsigned int maxWidth, std::string
 void FontSDL::drawTextWrapped(unsigned int x, unsigned int y, float scale,
         const unsigned char color[4], unsigned int maxWidth, std::string s) {
     assert(mFontInit == true);
+    assert(mFont != nullptr);
     assert(s.length() > 0);
     assert(maxWidth > 0);
 
@@ -147,8 +154,8 @@ void FontSDL::drawTextWrapped(unsigned int x, unsigned int y, float scale,
     col.a = color[3];
 
     SDL_Surface *surface = TTF_RenderUTF8_Blended_Wrapped(mFont, s.c_str(), col, maxWidth);
-    if (surface == NULL) {
-        printf("TTF_RenderUTF8_Blended_Wrapped Error: %s\n", TTF_GetError());
+    if (surface == nullptr) {
+        std::cout << "TTF_RenderUTF8_Blended_Wrapped Error: " << TTF_GetError() << std::endl;
         return;
     }
 

src/FontTRLE.cpp

@@ -5,6 +5,7 @@
  * \author xythobuz
  */
 
+#include <algorithm>
 #include <fstream>
 #include <sstream>
 #include <stdexcept>
@@ -13,20 +14,24 @@
 #include "utils/strings.h"
 #include "FontTRLE.h"
 
-FontTRLE::FontTRLE() {
-    mFontInit = false;
-    mFontTexture = 0;
-}
+#define SCALING 2.0f
 
-FontTRLE::~FontTRLE() {
+bool FontTRLE::mFontInit = false;
+unsigned int FontTRLE::mFontTexture = 0;
+int FontTRLE::offsets[106][5];
+
+void FontTRLE::shutdown() {
+    if (mFontInit)
+        glDeleteTextures(1, &mFontTexture);
 }
 
-int FontTRLE::initialize() {
-    assert(mFontInit == false);
-    assert(stringEndsWith(mFontName, ".pc") == true);
+int FontTRLE::initialize(std::string font) {
+    assert(stringEndsWith(font, ".pc") == true);
+
+    shutdown();
 
     // Load .pc file...
-    std::ifstream file(mFontName, std::ios::in | std::ios::binary);
+    std::ifstream file(font, std::ios::in | std::ios::binary);
     unsigned char *pixels = new unsigned char[256 * 256 * 4];
     if (!file.read((char *)pixels, 256 * 256 * 4)) {
         delete [] pixels;
@@ -49,8 +54,8 @@ int FontTRLE::initialize() {
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 256, 256, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, pixels);
     delete [] pixels;
 
-    // Try to load .lps file, overwriting default glyph positions
-    std::string lpsFile = findAndReplace(mFontName, ".pc", ".lps");
+    // Try to load .lps file or use default glyph positions
+    std::string lpsFile = findAndReplace(font, ".pc", ".lps");
     loadLPS(lpsFile);
 
     mFontInit = true;
@@ -59,12 +64,12 @@ int FontTRLE::initialize() {
 
 void FontTRLE::loadLPS(std::string f) {
     std::ifstream file(f);
-    if (!file)
+    if (!file) {
+        std::copy(&defaultOffsets[0][0], &defaultOffsets[0][0] + (106 * 5), &offsets[0][0]);
         return;
+    }
 
-    /*!
-     * \todo This is probably the worlds most unreliable parser...
-     */
+    //! \todo This is probably the worlds most unreliable parser...
 
     for (std::string line; std::getline(file, line);) {
         std::istringstream stream(line);
@@ -88,8 +93,6 @@ void FontTRLE::loadLPS(std::string f) {
     }
 }
 
-#define SCALING 2.0f
-
 void FontTRLE::writeChar(unsigned int index, unsigned int xDraw, unsigned int yDraw,
         float scale, const unsigned char color[4]) {
     assert(mFontInit == true);
@@ -235,3 +238,112 @@ void FontTRLE::drawTextWrapped(unsigned int x, unsigned int y, float scale,
     }
 }
 
+int FontTRLE::defaultOffsets[106][5] = {
+    { 174,  52,   3,  12, -11 },
+    {  98,  58,   6,   4, -10 },
+    {  82,  26,  13,  11, -10 },
+    {  78,  38,   9,  13, -10 },
+    { 214,  13,  14,  11, -9  },
+    {  40,  26,  13,  11, -10 },
+    { 157,  57,   5,   6, -11 },
+    { 204,  39,   5,  15, -12 },
+    {  34,  40,   5,  15, -12 },
+    { 184,  59,   4,   4, -11 },
+    {  22,  40,  10,  10, -9  },
+    { 178,  59,   4,   4, -2  },
+    { 106,  60,   7,   2, -4  },
+    { 114,  60,   4,   3, -2  },
+    { 212,  38,   8,  14, -12 },
+    {  88,  49,   9,   9, -8  },
+    { 200,  55,   5,   9, -8  },
+    {  46,  52,   8,   9, -8  },
+    {  88,  38,   7,  10, -8  },
+    {  62,  40,  10,  10, -8  },
+    { 142,  48,   8,  11, -9  },
+    { 232,  50,   8,  10, -9  },
+    { 120,  47,   8,  11, -9  },
+    {  22,  51,   8,  10, -9  },
+    { 110,  49,   8,  10, -8  },
+    { 152,  57,   4,   7, -7  },
+    { 136,  57,   4,   9, -7  },
+    { 178,  40,  11,   9, -8  },
+    { 210,  53,  10,   6, -7  },
+    { 240,  40,  11,   9, -7  },
+    {  12,  39,   9,  12, -11 },
+    {  66,  13,  15,  13, -10 },
+    { 130,  13,  13,  12, -11 },
+    { 214,  25,  12,  12, -11 },
+    { 132,  35,  10,  12, -11 },
+    {   0,  26,  12,  12, -11 },
+    {  14,  26,  12,  12, -11 },
+    {  66,  27,  11,  12, -11 },
+    { 182,  27,  11,  12, -11 },
+    { 200,  13,  13,  12, -11 },
+    { 222,  54,   4,  12, -11 },
+    {  56,  52,   4,  15, -11 },
+    { 230,  15,  12,  12, -11 },
+    { 144,  35,  10,  12, -11 },
+    {  48,  13,  17,  12, -11 },
+    { 144,  13,  13,  12, -11 },
+    {  54,  26,  11,  12, -11 },
+    { 200,  26,  11,  12, -11 },
+    { 240,   0,  13,  14, -11 },
+    { 158,  13,  13,  12, -11 },
+    { 156,  35,  10,  12, -11 },
+    { 172,  13,  13,  12, -11 },
+    {  98,  13,  14,  12, -11 },
+    {  82,  13,  14,  12, -11 },
+    {  24,  13,  22,  12, -11 },
+    { 186,  13,  12,  13, -11 },
+    { 114,  13,  14,  12, -11 },
+    { 228,  28,  11,  12, -11 },
+    {  62,  60,   5,   3, -4  },
+    { 248,  59,   5,   3, -4  },
+    {  88,  59,   7,   3, -4  },
+    { 142,  60,   6,   2, -3  },
+    { 120,  59,   7,   3, -4  },
+    { 242,  59,   4,   4, -11 },
+    {  98,  49,  10,   8, -7  },
+    {  96,  35,  10,  13, -12 },
+    {  72,  52,   8,   8, -7  },
+    {   0,  39,  10,  11, -10 },
+    { 164,  52,   8,   8, -7  },
+    { 168,  38,   9,  13, -12 },
+    { 120,  35,  11,  11, -7  },
+    { 108,  35,  10,  13, -12 },
+    { 194,  27,   5,  11, -10 },
+    {  40,  51,   5,  15, -10 },
+    {  28,  26,  11,  13, -12 },
+    {  82,  52,   5,  12, -11 },
+    {  96,  26,  17,   8, -7  },
+    { 152,  48,  11,   8, -7  },
+    {  62,  51,   9,   8, -7  },
+    { 244,  15,  10,  12, -7  },
+    {  52,  39,   9,  12, -7  },
+    {  10,  52,   9,   8, -7  },
+    { 190,  52,   8,   8, -7  },
+    {   0,  51,   8,  10, -9  },
+    { 178,  50,  10,   8, -7  },
+    { 130,  48,  11,   8, -7  },
+    { 132,  26,  17,   8, -7  },
+    { 242,  50,  10,   8, -7  },
+    {  40,  38,  10,  12, -7  },
+    { 232,  41,   7,   8, -7  },
+    { 222,  41,   8,  12, -7  },
+    { 130,  57,   5,   8, -7  },
+    { 194,  39,   9,  12, -10 },
+    {  32,  56,   4,  11, -10 },
+    {   1,  14,  22,  11, -10 },
+    { 192,   0,  23,  13, -10 },
+    { 168,   0,  23,  12, -10 },
+    { 216,   0,  23,  12, -10 },
+    { 150,  26,  17,   8, -8  },
+    { 168,  26,  11,  11, -9  },
+    { 114,  26,  17,   8, -8  },
+    { 240,  28,  12,  11, -9  },
+    {   0,   0,  40,  12, -10 },
+    {  84,   0,  39,  11, -10 },
+    {  42,   0,  39,  11, -10 },
+    { 126,   0,  39,  11, -10 },
+};
+

src/Menu.cpp

@@ -89,25 +89,25 @@ void Menu::displayDialog() {
     if (dialogText.length() > 0) {
         unsigned int wMax = ((unsigned int)(::getWindow().getWidth() * 0.66f));
 
-        unsigned int w0 = getFont().widthText(1.0f, dialogText) + 20;
+        unsigned int w0 = Font::widthText(1.0f, dialogText) + 20;
         if (w0 > wMax)
             w0 = wMax;
-        unsigned int h0 =  getFont().heightText(1.0f, w0, dialogText) + 10;
+        unsigned int h0 =  Font::heightText(1.0f, w0, dialogText) + 10;
 
         assert(dialogButton1.length() > 0);
-        unsigned int w1 = getFont().widthText(1.0f, dialogButton1) + 20;
+        unsigned int w1 = Font::widthText(1.0f, dialogButton1) + 20;
         if (w1 > wMax)
             w1 = wMax;
-        unsigned int h1 = getFont().heightText(1.0f, w1, dialogButton1) + 10;
+        unsigned int h1 = Font::heightText(1.0f, w1, dialogButton1) + 10;
 
         unsigned int wOverlay = wMax, hOverlay, w2 = 0, h2 = 0;
 
         if (dialogButton2.length() > 0) {
             // Show text and two buttons
-            w2 = getFont().widthText(1.0f, dialogButton2) + 20;
+            w2 = Font::widthText(1.0f, dialogButton2) + 20;
             if (w2 > wMax)
                 w2 = wMax;
-            h2 = getFont().heightText(1.0f, w2, dialogButton2) + 10;
+            h2 = Font::heightText(1.0f, w2, dialogButton2) + 10;
 
             if (w0 > (w1 + w2)) {
                 if (w0 < wMax) {
@@ -147,21 +147,21 @@ void Menu::displayDialog() {
         glRecti(xOverlay, yOverlay, xOverlay + wOverlay, yOverlay + hOverlay);
         glEnable(GL_TEXTURE_2D);
 
-        getFont().drawTextWrapped(xOverlay + 10, yOverlay + 5, 1.0f, BLUE, w0, dialogText);
+        Font::drawTextWrapped(xOverlay + 10, yOverlay + 5, 1.0f, BLUE, w0, dialogText);
         if (dialogButton2.length() > 0) {
             if ((w1 + w2) <= wMax) {
-                getFont().drawTextWrapped(xOverlay + 10, yOverlay + 10 + h0, 1.0f,
+                Font::drawTextWrapped(xOverlay + 10, yOverlay + 10 + h0, 1.0f,
                     dialogState ? BLUE : RED, w1, dialogButton1);
-                getFont().drawTextWrapped(xOverlay + 10 + w1, yOverlay + 10 + h0,
+                Font::drawTextWrapped(xOverlay + 10 + w1, yOverlay + 10 + h0,
                     1.0f, dialogState ? RED : BLUE, w2, dialogButton2);
             } else {
-                getFont().drawTextWrapped((::getWindow().getWidth() - w1) / 2,
+                Font::drawTextWrapped((::getWindow().getWidth() - w1) / 2,
                     yOverlay + 10 + h0, 1.0f, dialogState ? BLUE : RED, w1, dialogButton1);
-                getFont().drawTextWrapped((::getWindow().getWidth() - w2) / 2,
+                Font::drawTextWrapped((::getWindow().getWidth() - w2) / 2,
                     yOverlay + 10 + h0 + h1, 1.0f, dialogState ? RED : BLUE, w2, dialogButton2);
             }
         } else {
-            getFont().drawTextWrapped((::getWindow().getWidth() - w1) / 2,
+            Font::drawTextWrapped((::getWindow().getWidth() - w1) / 2,
                     yOverlay + 10 + h0, 1.0f, RED, w1, dialogButton1);
         }
     }

src/MenuFolder.cpp

@@ -85,7 +85,7 @@ void MenuFolder::display() {
     glEnable(GL_TEXTURE_2D);
 
     // Draw heading
-    getFont().drawTextCentered(0, 10, 1.2f, BLUE, ::getWindow().getWidth(), VERSION);
+    Font::drawTextCentered(0, 10, 1.2f, BLUE, ::getWindow().getWidth(), VERSION);
 
     // Estimate displayable number of items
     int items = (::getWindow().getHeight() - 60) / 25;
@@ -94,9 +94,9 @@ void MenuFolder::display() {
     for (long i = mMin; (i < (mMin + items))
                 && (i < (mapFolder->folderCount() + mapFolder->fileCount() + 1)); i++) {
         if (i == 0) {
-            getFont().drawText(25, 50, 0.75f, (mCursor == i) ? RED : BLUE, "..");
+            Font::drawText(25, 50, 0.75f, (mCursor == i) ? RED : BLUE, "..");
         } else {
-            getFont().drawText(25, (unsigned int)(50 + (25 * (i - mMin))), 0.75f,
+            Font::drawText(25, (unsigned int)(50 + (25 * (i - mMin))), 0.75f,
                 (mCursor == i) ? RED : BLUE,
                 ((i - 1) < mapFolder->folderCount()) ?
                     (mapFolder->getFolder(i - 1).getName() + "/")

src/commands/CommandSet.cpp

@@ -137,7 +137,9 @@ int CommandSet::execute(std::istream& args) {
     } else if (var.compare("font") == 0) {
         std::string temp;
         args >> temp;
-        getFont().setFont(expandNames(temp).c_str());
+        int error = Font::initialize(expandNames(temp));
+        if (error != 0)
+            getLog() << "Error initializing font: " << expandNames(temp) << "(" << error << ")" << Log::endl;
     } else {
         getLog() << "set-Error: Unknown variable (" << var.c_str() << ")" << Log::endl;
         return -1;

src/main.cpp

@@ -18,7 +18,7 @@
 #ifndef UNIT_TEST
 
 #include "Camera.h"
-#include "FontManager.h"
+#include "Font.h"
 #include "Game.h"
 #include "Log.h"
 #include "MenuFolder.h"
@@ -46,7 +46,6 @@
 static std::string configFileToUse;
 
 static std::shared_ptr<Camera> gCamera;
-static std::shared_ptr<FontManager> gFont;
 static std::shared_ptr<Game> gGame;
 static std::shared_ptr<Log> gLog;
 static std::shared_ptr<MenuFolder> gMenu;
@@ -61,10 +60,6 @@ Camera &getCamera() {
     return *gCamera;
 }
 
-Font &getFont() {
-    return *gFont;
-}
-
 Game &getGame() {
     return *gGame;
 }
@@ -115,7 +110,6 @@ int main(int argc, char* argv[]) {
     gRunTime.reset(new RunTime());
 
     gCamera.reset(new Camera());
-    gFont.reset(new FontManager());
     gGame.reset(new Game());
     gLog.reset(new Log());
     gMenu.reset(new MenuFolder());
@@ -137,14 +131,6 @@ int main(int argc, char* argv[]) {
 
     Command::fillCommandList();
 
-    if (configFileToUse == "") {
-        if (Command::executeFile(DEFAULT_CONFIG_FILE) != 0) {
-            Command::executeFile(DEFAULT_CONFIG_PATH "/" DEFAULT_CONFIG_FILE);
-        }
-    } else {
-        Command::executeFile(configFileToUse);
-    }
-
     getLog() << "Initializing " << VERSION << Log::endl;
 
     // Initialize Windowing
@@ -161,8 +147,22 @@ 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
+    if (configFileToUse == "") {
+        if (Command::executeFile(DEFAULT_CONFIG_FILE) != 0) {
+            Command::executeFile(DEFAULT_CONFIG_PATH "/" DEFAULT_CONFIG_FILE);
+        }
+    } else {
+        Command::executeFile(configFileToUse);
+    }
+
     // Initialize Font
-    error = getFont().initialize();
+#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;
@@ -214,6 +214,7 @@ int main(int argc, char* argv[]) {
     }
 
     UI::shutdown();
+    Font::shutdown();
 
 #ifdef DEBUG
     std::cout << std::endl;
@@ -242,7 +243,7 @@ void renderFrame() {
         std::ostringstream s;
         s << fps << "FPS";
         getWindow().glEnter2D();
-        getFont().drawText(10, getWindow().getHeight() - 25, 0.6f, BLUE, s.str());
+        Font::drawText(10, getWindow().getHeight() - 25, 0.6f, BLUE, s.str());
         getWindow().glExit2D();
     }
 

test/CMakeLists.txt

@@ -15,17 +15,6 @@ add_test (NAME test_binary COMMAND tester_binary)
 
 #################################################################
 
-add_executable (tester_folder EXCLUDE_FROM_ALL
-    "Folder.cpp" "../src/utils/filesystem.cpp"
-    "../src/utils/Folder.cpp" "../src/utils/File.cpp"
-    "../src/Exception.cpp" "../src/main.cpp"
-)
-
-add_dependencies (check tester_folder)
-#add_test (NAME test_folder COMMAND tester_folder)
-
-#################################################################
-
 add_executable (tester_script EXCLUDE_FROM_ALL
     "Script.cpp" "../src/Script.cpp" "../src/main.cpp"
     "../src/utils/binary.cpp" "../src/Exception.cpp"

test/Folder.cpp

@@ -1,27 +0,0 @@
-/*!
- * \file test/Folder.cpp
- * \brief File system utils unit test
- *
- * \author xythobuz
- */
-
-#include <iostream>
-
-#include "global.h"
-#include "utils/File.h"
-#include "utils/Folder.h"
-
-int main() {
-    Folder f(".");
-
-    std::cout << f.folderCount() << " folders:" << std::endl;
-    for (unsigned long i = 0; i < f.folderCount(); i++)
-        std::cout << "\t" << f.getFolder(i).getName() << std::endl;
-
-    std::cout << f.fileCount() << " files:" << std::endl;
-    for (unsigned long i = 0; i < f.fileCount(); i++)
-        std::cout << "\t" << f.getFile(i).getName() << std::endl;
-
-    return 0;
-}
-

test/Script.cpp

@@ -206,7 +206,8 @@ int main(int argc, char *argv[]) {
                 printData = false;
             }
             assert(testPayloadCount < 10);
-            if ((argv[2][0] >= '0') && ((unsigned int)argv[2][0] <= (testPayloadCount + '0'))) {
+            if ((argv[2][0] >= '0')
+                    && (static_cast<unsigned int>(argv[2][0]) <= (testPayloadCount + '0'))) {
                 whichFile = argv[2][0] - '0';
             }
         } else {
@@ -231,7 +232,7 @@ int main(int argc, char *argv[]) {
             return printDataScript(s, printData);
         } else {
             // From payload
-            return runForPayload((unsigned int)whichFile, true, printData);
+            return runForPayload(static_cast<unsigned int>(whichFile), true, printData);
         }
     } else {
         // Run test on all scripts in payload