Added FontManager

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140615 ]
+    * Added FontManager, selecting Font library to use depending on
+      the file extension of the font file specified in the config.
+
     [ 20140614 ]
     * Implemented TRLE Font loader
 

README.md

@@ -117,9 +117,11 @@ Every available command should be listed in the in-game help. Just type `help` i
 
 ### Tomb Raider Level Editor Font support
 
-OpenRaider can read Font.pc files used by the TRLE. If the fonts glyph positions match the TR4 defaults, only a Font.pc file is required. If the positions differ, you also need a [Leikkuri/Cutter](http://trep.trlevel.de/en/downloads.html) preset file (.lps).
+OpenRaider can read Font.pc files used by the TRLE. If the fonts glyph positions match the TR4 defaults, only a Font.pc file is required. If the positions differ, you also need a [Leikkuri/Cutter](http://trep.trlevel.de/en/downloads.html) preset file (`.lps`).
 
-TRLE Font support will automatically be built if SDL2-TTF is not available. Just change the font file path in your config file.
+TRLE Font support will automatically be built and used when selecting a font in your config file ending with `.pc`.
+
+If a `.lps` is required, give it the same name as your font file.
 
 I’ve made [a small writeup on my website](http://xythobuz.de/2014_06_14_trle_font.html) about this.
 

TODO.md

@@ -26,6 +26,10 @@ There are these DebugModel, DebugMap flags...?
 * Support SSE with other compilers than Clang (src/CMakeLists.txt)
 * Visual C++ compiler flags? (CMakeLists.txt)
 
+## Bugs
+
+* Menu Header “OpenRaider” not visible when using FontSDL?
+
 ## Future Features
 
 * Use only assets from old TR games, not even depending on a font file?

include/Font.h

@@ -36,11 +36,12 @@ public:
     virtual void writeString(FontString &s) = 0;
 
     virtual void drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...)
-        __attribute__((format(printf, 6, 0))) = 0;
+        __attribute__((format(printf, 6, 0)));
 
 protected:
     bool mFontInit;
     char *mFontName;
+    FontString tempText;
 };
 
 Font &getFont();

include/FontManager.h

@@ -0,0 +1,42 @@
+/*!
+ * \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 void writeString(FontString &s);
+
+private:
+
+    void add(Font *f, const char *e);
+
+    int font;
+    std::vector<Font *> fonts;
+    std::vector<const char *> extensions;
+};
+
+#endif
+

include/FontSDL.h

@@ -32,14 +32,9 @@ public:
 
     virtual void writeString(FontString &s);
 
-    virtual void drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...)
-        __attribute__((format(printf, 6, 0)));
-
 private:
     TTF_Font *mFont;
     unsigned int mFontTexture;
-
-    FontString tempText;
 };
 
 #endif

include/FontTRLE.h

@@ -31,16 +31,12 @@ public:
 
     virtual void writeString(FontString &s);
 
-    virtual void drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...)
-        __attribute__((format(printf, 6, 0)));
-
 private:
 
     void loadLPS(const char *f);
     void writeChar(unsigned int index, unsigned int xDraw, FontString &s);
 
     unsigned int mFontTexture;
-    FontString tempText;
 
     // 106 entries: (x, y, w, h, offset)
     int offsets[106][5] = {

src/CMakeLists.txt

@@ -44,6 +44,8 @@ set (SRCS ${SRCS} "Command.cpp")
 set (SRCS ${SRCS} "Console.cpp")
 set (SRCS ${SRCS} "Entity.cpp")
 set (SRCS ${SRCS} "Font.cpp")
+set (SRCS ${SRCS} "FontManager.cpp")
+set (SRCS ${SRCS} "FontTRLE.cpp")
 set (SRCS ${SRCS} "Game.cpp")
 set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "Menu.cpp")
@@ -73,20 +75,16 @@ else (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
 endif (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
 
 # Select available Windowing library
-if (SDL2_FOUND AND SDL2TTF_FOUND)
+if (SDL2_FOUND)
     set (SRCS ${SRCS} "WindowSDL.cpp")
-    set (SRCS ${SRCS} "FontSDL.cpp")
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_SDL")
-else (SDL2_FOUND AND SDL2TTF_FOUND)
-    if (SDL2_FOUND)
-        set (SRCS ${SRCS} "WindowSDL.cpp")
-        set (SRCS ${SRCS} "FontTRLE.cpp")
-        set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_SDL")
-        set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_TRLE")
-    else (SDL2_FOUND)
-        message (FATAL_ERROR "SDL2 is required at the moment!")
-    endif (SDL2_FOUND)
-endif (SDL2_FOUND AND SDL2TTF_FOUND)
+    if (SDL2TTF_FOUND)
+        set (SRCS ${SRCS} "FontSDL.cpp")
+        set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_SDL_FONT")
+    endif (SDL2TTF_FOUND)
+else (SDL2_FOUND)
+    message (FATAL_ERROR "SDL2 is required at the moment!")
+endif (SDL2_FOUND)
 
 #################################################################
 

src/Font.cpp

@@ -12,6 +12,9 @@
 Font::~Font() {
     delete [] mFontName;
     mFontName = NULL;
+
+    delete [] tempText.text;
+    tempText.text = NULL;
 }
 
 void Font::setFont(const char *font) {
@@ -22,3 +25,22 @@ void Font::setFont(const char *font) {
     mFontName = fullPath(font, 0);
 }
 
+void Font::drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...) {
+    va_list args;
+    va_start(args, s);
+    vsnprintf(tempText.text, 256, s, args);
+    tempText.text[255] = '\0';
+    va_end(args);
+
+    tempText.scale = scale;
+    tempText.x = x;
+    tempText.y = y;
+    if (color) {
+        tempText.color[0] = color[0];
+        tempText.color[1] = color[1];
+        tempText.color[2] = color[2];
+        tempText.color[3] = color[3];
+    }
+    writeString(tempText);
+}
+

src/FontManager.cpp

@@ -0,0 +1,65 @@
+/*!
+ * \file src/FontManager.cpp
+ * \brief SDL Font implementation
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "utils/strings.h"
+#include "FontManager.h"
+#include "Font.h"
+#include "FontSDL.h"
+#include "FontTRLE.h"
+
+FontManager::FontManager() {
+    add(new FontTRLE(), ".pc");
+
+#ifdef USING_SDL_FONT
+    add(new FontSDL(), ".ttf");
+#endif
+
+    font = -1;
+
+    tempText.text = new char[256];
+    tempText.color[0] = 0xFF;
+    tempText.color[1] = 0xFF;
+    tempText.color[2] = 0xFF;
+    tempText.color[3] = 0xFF;
+    tempText.scale = 1.2f;
+    tempText.w = 0;
+    tempText.h = 0;
+}
+
+FontManager::~FontManager() {
+    while (!fonts.empty()) {
+        delete fonts.back();
+        fonts.pop_back();
+    }
+}
+
+void FontManager::add(Font *f, const char *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;
+
+    fonts.at(font)->setFont(mFontName);
+    return fonts.at(font)->initialize();
+}
+
+void FontManager::writeString(FontString &s) {
+    assert(font != -1);
+    fonts.at(font)->writeString(s);
+}
+

src/FontSDL.cpp

@@ -30,9 +30,6 @@ FontSDL::~FontSDL() {
 
     if (mFontInit)
         TTF_Quit();
-
-    delete [] tempText.text;
-    tempText.text = NULL;
 }
 
 int FontSDL::initialize() {
@@ -118,22 +115,3 @@ void FontSDL::writeString(FontString &s) {
     SDL_FreeSurface(surface);
 }
 
-void FontSDL::drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...) {
-    va_list args;
-    va_start(args, s);
-    vsnprintf(tempText.text, 256, s, args);
-    tempText.text[255] = '\0';
-    va_end(args);
-
-    tempText.scale = scale;
-    tempText.x = x;
-    tempText.y = y;
-    if (color) {
-        tempText.color[0] = color[0];
-        tempText.color[1] = color[1];
-        tempText.color[2] = color[2];
-        tempText.color[3] = color[3];
-    }
-    writeString(tempText);
-}
-

src/FontTRLE.cpp

@@ -28,8 +28,6 @@ FontTRLE::FontTRLE() {
 }
 
 FontTRLE::~FontTRLE() {
-    delete [] tempText.text;
-    tempText.text = NULL;
 }
 
 int FontTRLE::initialize() {
@@ -167,22 +165,3 @@ void FontTRLE::writeString(FontString &s) {
 */
 }
 
-void FontTRLE::drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...) {
-    va_list args;
-    va_start(args, s);
-    vsnprintf(tempText.text, 256, s, args);
-    tempText.text[255] = '\0';
-    va_end(args);
-
-    tempText.scale = scale;
-    tempText.x = x;
-    tempText.y = y;
-    if (color) {
-        tempText.color[0] = color[0];
-        tempText.color[1] = color[1];
-        tempText.color[2] = color[2];
-        tempText.color[3] = color[3];
-    }
-    writeString(tempText);
-}
-

src/main.cpp

@@ -12,6 +12,7 @@
 #include "global.h"
 #include "Camera.h"
 #include "Console.h"
+#include "FontManager.h"
 #include "Game.h"
 #include "Menu.h"
 #include "OpenRaider.h"
@@ -28,17 +29,13 @@
 
 #ifdef USING_SDL
 #include "WindowSDL.h"
-#ifdef USING_TRLE
-#include "FontTRLE.h"
-#else
-#include "FontSDL.h"
-#endif
 #else
 #error No Windowing Library selected!
 #endif
 
 Camera gCamera;
 Console gConsole;
+FontManager gFont;
 Game gGame;
 Menu gMenu;
 OpenRaider gOpenRaider;
@@ -53,11 +50,6 @@ SoundNull gSound;
 
 #ifdef USING_SDL
 WindowSDL gWindow;
-#ifdef USING_TRLE
-FontTRLE gFont;
-#else
-FontSDL gFont;
-#endif
 #endif
 
 Camera &getCamera() {