Split Font subsystem from Window

ChangeLog.md

@@ -3,6 +3,9 @@
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
     [ 20140605 ]
+    * Split Font/Text-Rendering Subsystem from Windowing System
+    * Slight improvements on Window Interface/Implementation differences
+    * Window width/height finally private too
     * Created methods to convert strings of names to ActionEvents
       and KeyboardButtons.
     * Simplified bind commands

README.md

@@ -10,8 +10,6 @@ It seems as if OpenRaider will currently only work on Little-Endian platforms. T
 
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=xythobuz&url=https://github.com/xythobuz/OpenRaider&title=OpenRaider&language=&tags=github&category=software)
 
-<script data-gittip-username="xythobuz" data-gittip-widget="button" src="//gttp.co/v1.js"></script>
-
 ## Configuration
 
 OpenRaider needs some configuration files, and level data and assets from custom levels or the Tomb Raider games.

TODO.md

@@ -11,11 +11,9 @@ There are these DebugModel, DebugMap flags...?
     * Use shared_ptr, should make memory handling/segfaults much less of a problem
         * Don't even new ... the data structures but use std::make_shared or allocate_shared?
         * Pass object references to all other objects that need it, completely remove gOpenRaider
-    * Use streams for (file) I/O
-        * Does not need strtok() anymore
     * Use std::strings
+    * Rewrite Console and use operator << to write to the console
 * SDL_TTF 2.0.12+ can do line breaks, use it: http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688
-* Rewrite Console using std::strings and use operator << to write to the console
 
 ## Changes
 
@@ -30,8 +28,7 @@ There are these DebugModel, DebugMap flags...?
 
 ## Future Features
 
-* Use only assets from old TR games?
-* [PCX image reading](http://bespin.org/~qz/pc-gpe/pcx.txt) for eg. TR2 built-in menu background
-    * Cut TGA image reader, currently only used for menu background?!
+* Use only assets from old TR games, not even depending on a font file?
+* Cut TGA image reader, currently only used for menu background?!
 * When cutscene rendering is working, use TR4/5 style menu?
 

include/Font.h

@@ -0,0 +1,49 @@
+/*!
+ * \file include/Font.h
+ * \brief Font interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _FONT_H_
+#define _FONT_H_
+
+typedef struct {
+    char *text;
+    unsigned int x;
+    unsigned int y;
+    int w;
+    int h;
+    float scale;
+    float color[4];
+} FontString;
+
+/*!
+ * \brief Font interface
+ */
+class Font {
+public:
+
+    /*!
+     * \brief Deconstructs an object of Font
+     */
+    virtual ~Font();
+
+    virtual void setFont(const char *font);
+
+    virtual int initialize() = 0;
+
+    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;
+
+protected:
+    bool mFontInit;
+    char *mFontName;
+};
+
+Font &getFont();
+
+#endif
+

include/FontSDL.h

@@ -0,0 +1,46 @@
+/*!
+ * \file include/FontSDL.h
+ * \brief SDL windowing implementation
+ *
+ * \author xythobuz
+ */
+
+#ifndef _FONT_SDL_H_
+#define _FONT_SDL_H_
+
+#include "SDL_ttf.h"
+
+#include "Font.h"
+
+/*!
+ * \brief SDL windowing implementation
+ */
+class FontSDL : public Font {
+public:
+
+    /*!
+     * \brief Constructs an object of FontSDL
+     */
+    FontSDL();
+
+    /*!
+     * \brief Deconstructs an object of FontSDL
+     */
+    virtual ~FontSDL();
+
+    virtual int initialize();
+
+    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/Menu.h

@@ -8,7 +8,7 @@
 #ifndef _MENU_H_
 #define _MENU_H_
 
-#include "Window.h"
+#include "Font.h"
 
 /*!
  * \brief Menu 'overlay'
@@ -50,7 +50,7 @@ private:
     unsigned int mCursor;
     unsigned int mMin;
 
-    WindowString mainText;
+    FontString mainText;
 
     bool mMapListFilled;
     bool mFirstPass;

include/OpenRaider.h

@@ -13,10 +13,10 @@
 #include <vector>
 
 #include "Console.h"
+#include "Font.h"
 #include "Game.h"
 #include "Menu.h"
 #include "Sound.h"
-#include "Window.h"
 
 /*!
  * \brief Main Game Singleton

include/Window.h

@@ -10,16 +10,6 @@
 
 #include <ctime>
 
-typedef struct {
-    char *text;
-    unsigned int x;
-    unsigned int y;
-    int w;
-    int h;
-    float scale;
-    float color[4];
-} WindowString;
-
 /*!
  * \brief Windowing interface
  */
@@ -31,8 +21,6 @@ public:
      */
     virtual ~Window();
 
-    virtual void setDriver(const char *driver) = 0;
-
     virtual void setSize(unsigned int width, unsigned int height) = 0;
 
     virtual void setFullscreen(bool fullscreen) = 0;
@@ -49,6 +37,12 @@ public:
 
     virtual void swapBuffersGL() = 0;
 
+    virtual void setDriver(const char *driver);
+
+    virtual unsigned int getWidth();
+
+    virtual unsigned int getHeight();
+
     virtual int initializeGL();
 
     virtual void resizeGL();
@@ -57,29 +51,16 @@ public:
 
     virtual void glExit2D();
 
-    virtual void setFont(const char *font) = 0;
-
-    virtual int initializeFont() = 0;
-
-    virtual void writeString(WindowString &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;
-
-    //! \fixme should be private
-    unsigned int mWidth;
-    unsigned int mHeight;
-
 protected:
     bool mInit;
     char *mDriver;
     bool mFullscreen;
     bool mMousegrab;
-
-    bool mFontInit;
-    char *mFontName;
+    unsigned int mWidth;
+    unsigned int mHeight;
 };
 
 Window &getWindow();
 
 #endif
+

include/WindowSDL.h

@@ -29,8 +29,6 @@ public:
      */
     virtual ~WindowSDL();
 
-    virtual void setDriver(const char *driver);
-
     virtual void setSize(unsigned int width, unsigned int height);
 
     virtual void setFullscreen(bool fullscreen);
@@ -47,26 +45,12 @@ public:
 
     virtual void swapBuffersGL();
 
-    virtual void setFont(const char *font);
-
-    virtual int initializeFont();
-
-    virtual void writeString(WindowString &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:
-
     SDL_Window *mWindow;      //!< This is the pointer to the SDL surface
     SDL_GLContext mGLContext; //!< The OpenGL Context
 
-    TTF_Font *mFont;
-    unsigned int mFontTexture;
-
     bool mTextInput;
-
-    WindowString tempText;
 };
 
 #endif
+

src/CMakeLists.txt

@@ -43,6 +43,7 @@ set (SRCS ${SRCS} "Camera.cpp")
 set (SRCS ${SRCS} "Command.cpp")
 set (SRCS ${SRCS} "Console.cpp")
 set (SRCS ${SRCS} "Entity.cpp")
+set (SRCS ${SRCS} "Font.cpp")
 set (SRCS ${SRCS} "Game.cpp")
 set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "Menu.cpp")
@@ -74,6 +75,7 @@ endif (OPENAL_FOUND AND ALUT_FOUND AND ENABLE_AUDIO)
 # Select available Windowing library
 if (SDL2_FOUND AND SDL2TTF_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)
     # Currently only SDL2 support

src/Command.cpp

@@ -12,6 +12,7 @@
 #include "global.h"
 #include "Console.h"
 #include "Entity.h"
+#include "Font.h"
 #include "Game.h"
 #include "math/math.h"
 #include "Menu.h"
@@ -682,7 +683,7 @@ int OpenRaider::set(std::istream &command) {
         const char *value = temp.c_str();
         char *quotes = stringReplace(value, "\"", "");
         char *tmp = expandDirectoryNames(quotes);
-        getWindow().setFont(tmp);
+        getFont().setFont(tmp);
         delete [] tmp;
         delete [] quotes;
     } else {

src/Console.cpp

@@ -8,10 +8,12 @@
 #include <iostream>
 
 #include "global.h"
-#include "Console.h"
+#include "Font.h"
 #include "OpenRaider.h"
 #include "utils/strings.h"
 #include "utils/time.h"
+#include "Window.h"
+#include "Console.h"
 
 #define INPUT_BUFFER_SIZE 255
 
@@ -75,8 +77,8 @@ void Console::print(const char *s, ...) {
 }
 
 #define LINE_GEOMETRY(window) unsigned int firstLine = 35; \
-        unsigned int lastLine = (window.mHeight / 2) - 55; \
-        unsigned int inputLine = (window.mHeight / 2) - 30; \
+        unsigned int lastLine = (window.getHeight() / 2) - 55; \
+        unsigned int inputLine = (window.getHeight() / 2) - 30; \
         unsigned int lineSteps = 20; \
         unsigned int lineCount = (lastLine - firstLine + lineSteps) / lineSteps; \
         while (((lineCount * lineSteps) + firstLine) < inputLine) { \
@@ -93,7 +95,7 @@ void Console::display() {
         // Draw half-transparent *overlay*
         glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
         glDisable(GL_TEXTURE_2D);
-        glRecti(0, 0, getWindow().mWidth, getWindow().mHeight / 2);
+        glRecti(0, 0, getWindow().getWidth(), getWindow().getHeight() / 2);
         glEnable(GL_TEXTURE_2D);
 
         int scrollIndicator;
@@ -103,7 +105,7 @@ void Console::display() {
             scrollIndicator = 100;
         }
 
-        getWindow().drawText(10, 10, 0.70f, OR_BLUE,
+        getFont().drawText(10, 10, 0.70f, OR_BLUE,
                 "%s uptime %lus scroll %d%%", VERSION, systemTimerGet() / 1000, scrollIndicator);
 
         // Draw output log
@@ -117,15 +119,15 @@ void Console::display() {
             historyOffset = mHistory.size() - lineCount;
         }
         for (int i = 0; i < end; i++) {
-            getWindow().drawText(10, ((i + drawOffset) * lineSteps) + firstLine,
+            getFont().drawText(10, ((i + drawOffset) * lineSteps) + firstLine,
                     0.75f, OR_BLUE, "%s", mHistory[i + historyOffset - mLineOffset]);
         }
 
         // Draw current input
         if ((mInputBufferPointer > 0) && (mInputBuffer[0] != '\0')) {
-            getWindow().drawText(10, inputLine, 0.75f, OR_BLUE, "> %s", mInputBuffer);
+            getFont().drawText(10, inputLine, 0.75f, OR_BLUE, "> %s", mInputBuffer);
         } else {
-            getWindow().drawText(10, inputLine, 0.75f, OR_BLUE, ">");
+            getFont().drawText(10, inputLine, 0.75f, OR_BLUE, ">");
         }
 
         //! \todo display the current mPartialInput. The UTF-8 segfaults SDL-TTF, somehow?

src/Font.cpp

@@ -0,0 +1,24 @@
+/*!
+ * \file src/Font.cpp
+ * \brief Font implementation
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "utils/strings.h"
+#include "Font.h"
+
+Font::~Font() {
+    if (mFontName)
+        delete [] mFontName;
+}
+
+void Font::setFont(const char *font) {
+    assert(font != NULL);
+    assert(font[0] != '\0');
+    assert(mFontInit == false);
+
+    mFontName = fullPath(font, 0);
+}
+

src/FontSDL.cpp

@@ -0,0 +1,138 @@
+/*!
+ * \file src/FontSDL.cpp
+ * \brief SDL Font implementation
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "FontSDL.h"
+
+FontSDL::FontSDL() {
+    mFont = NULL;
+    mFontInit = false;
+    mFontName = NULL;
+    mFontTexture = 0;
+
+    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;
+}
+
+FontSDL::~FontSDL() {
+    if (mFont)
+        TTF_CloseFont(mFont);
+
+    if (mFontInit)
+        TTF_Quit();
+
+    if (tempText.text)
+        delete [] tempText.text;
+}
+
+int FontSDL::initialize() {
+    assert(mFontInit == false);
+    assert(mFontName != NULL);
+    assert(mFontName[0] != '\0');
+
+    if (TTF_Init() != 0) {
+        printf("Could not initialize SDL-TTF!\n");
+        return -1;
+    }
+
+    mFont = TTF_OpenFont(mFontName, 24);
+    if (mFont == NULL) {
+        printf("TTF_OpenFont Error: %s\n", TTF_GetError());
+        return -2;
+    }
+
+    glGenTextures(1, &mFontTexture);
+
+    mFontInit = true;
+    return 0;
+}
+
+void FontSDL::writeString(FontString &s) {
+    assert(s.text != NULL);
+
+    SDL_Color color;
+    color.r = (unsigned char)(s.color[0] * 255.0f);
+    color.g = (unsigned char)(s.color[1] * 255.0f);
+    color.b = (unsigned char)(s.color[2] * 255.0f);
+    color.a = (unsigned char)(s.color[3] * 255.0f);
+
+    SDL_Surface *surface = TTF_RenderUTF8_Blended(mFont, s.text, color);
+    if (surface == NULL) {
+        printf("TTF_RenderUTF8_Blended Error: %s\n", TTF_GetError());
+        return;
+    }
+
+    s.w = (int)((float)surface->w * s.scale);
+    s.h = (int)((float)surface->h * s.scale);
+
+    GLenum textureFormat;
+    if (surface->format->BytesPerPixel == 4) {
+        if (surface->format->Rmask == 0x000000FF)
+            textureFormat = GL_RGBA;
+        else
+            textureFormat = GL_BGRA_EXT;
+    } else {
+        if (surface->format->Rmask == 0x000000FF)
+            textureFormat = GL_RGB;
+        else
+            textureFormat = GL_BGR_EXT;
+    }
+
+    glBindTexture(GL_TEXTURE_2D, mFontTexture);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexImage2D(GL_TEXTURE_2D, 0, surface->format->BytesPerPixel, surface->w, surface->h, 0, textureFormat, GL_UNSIGNED_BYTE, surface->pixels);
+
+    GLuint xMin = s.x;
+    GLuint yMin = s.y;
+    GLuint xMax = xMin + s.w;
+    GLuint yMax = yMin + s.h;
+
+    glColor4f(color.r / 256.0f, color.g / 256.0f, color.b / 256.0f, color.a / 256.0f);
+
+    glBegin(GL_QUADS);
+    glTexCoord2f(0.0f, 0.0f);
+    glVertex2i(xMin, yMin);
+
+    glTexCoord2f(0.0f, 1.0f);
+    glVertex2i(xMin, yMax);
+
+    glTexCoord2f(1.0f, 1.0f);
+    glVertex2i(xMax, yMax);
+
+    glTexCoord2f(1.0f, 0.0f);
+    glVertex2i(xMax, yMin);
+    glEnd();
+
+    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/Menu.cpp

@@ -9,9 +9,10 @@
 
 #include "global.h"
 #include "Console.h"
-#include "Menu.h"
 #include "OpenRaider.h"
 #include "utils/strings.h"
+#include "Window.h"
+#include "Menu.h"
 
 #if defined(HAVE_DIRENT_H) && defined(HAVE_OPENDIR) && defined(HAVE_READDIR_R) && defined(HAVE_CLOSEDIR) && defined(HAVE_DT_DIR)
 #include <dirent.h>
@@ -162,7 +163,7 @@ void Menu::fillMapList() {
 
 void Menu::displayMapList() {
     // Estimate displayable number of items
-    int items = (getWindow().mHeight - 110) / 25;
+    int items = (getWindow().getHeight() - 110) / 25;
 
     // Select which part of the list to show
     int min, max;
@@ -190,9 +191,9 @@ void Menu::displayMapList() {
     for (int i = 0; i < (max - min); i++) {
         char *map = mMapList[i + min];
         if ((i + min) == (int)mCursor)
-            getWindow().drawText(25, 100 + (25 * i), 0.75f, RED, "%s", map);
+            getFont().drawText(25, 100 + (25 * i), 0.75f, RED, "%s", map);
         else
-            getWindow().drawText(25, 100 + (25 * i), 0.75f, OR_BLUE, "%s", map);
+            getFont().drawText(25, 100 + (25 * i), 0.75f, OR_BLUE, "%s", map);
     }
 }
 
@@ -201,26 +202,26 @@ void Menu::display() {
         // Draw half-transparent *overlay*
         glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
         glDisable(GL_TEXTURE_2D);
-        glRecti(0, 0, getWindow().mWidth, getWindow().mHeight);
+        glRecti(0, 0, getWindow().getWidth(), getWindow().getHeight());
         glEnable(GL_TEXTURE_2D);
 
-        // Draw heading text, using WindowString so we can get the
+        // Draw heading text, using FontString so we can get the
         // width of the drawn text to center it
-        mainText.x = (getWindow().mWidth / 2) - (mainText.w / 2);
-        getWindow().writeString(mainText);
+        mainText.x = (getWindow().getWidth() / 2) - (mainText.w / 2);
+        getFont().writeString(mainText);
 
         if (!mMapListFilled) {
-            getWindow().drawText(25, (getWindow().mHeight / 2) - 20, 0.75f, OR_BLUE, "Generating map list...");
+            getFont().drawText(25, (getWindow().getHeight() / 2) - 20, 0.75f, OR_BLUE, "Generating map list...");
         } else {
             if (mMapList.size() == 0) {
-                getWindow().drawText(25, (getWindow().mHeight / 2) - 20, 0.75f, RED, "No maps found! See README.md");
+                getFont().drawText(25, (getWindow().getHeight() / 2) - 20, 0.75f, RED, "No maps found! See README.md");
             } else {
                 // draw *play button* above list
                 glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
                 glDisable(GL_TEXTURE_2D);
                 glRecti(25, 25, 100, 75);
                 glEnable(GL_TEXTURE_2D);
-                getWindow().drawText(40, 35, 0.75f, BLACK, "Play");
+                getFont().drawText(40, 35, 0.75f, BLACK, "Play");
 
                 displayMapList();
             }
@@ -280,7 +281,7 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
 }
 
 void Menu::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) {
-    int items = (getWindow().mHeight - 110) / 25;
+    int items = (getWindow().getHeight() - 110) / 25;
 
     if (released || (button != leftmouseKey))
         return;

src/OpenRaider.cpp

@@ -17,6 +17,7 @@
 #include "TombRaider.h"
 #include "utils/strings.h"
 #include "utils/time.h"
+#include "Window.h"
 #include "OpenRaider.h"
 
 OpenRaider::OpenRaider() {
@@ -60,12 +61,14 @@ int OpenRaider::initialize() {
         return -2;
     }
 
-    error = getWindow().initializeFont();
+    // Initialize Font
+    error = getFont().initialize();
     if (error != 0) {
         printf("Could not initialize Font (%d)!\n", error);
         return -3;
     }
 
+    // Initialize Sound
     error = getSound().initialize();
     if (error != 0) {
         printf("Could not initialize Sound (%d)!\n", error);
@@ -117,13 +120,13 @@ void OpenRaider::frame() {
 
     // Draw FPS counter
     if (mFPS)
-        getWindow().drawText(10, getWindow().mHeight - 20, 0.5f, OR_BLUE, "%dFPS", fps);
+        getFont().drawText(10, getWindow().getHeight() - 20, 0.5f, OR_BLUE, "%dFPS", fps);
 
 #ifdef DEBUG
     // Draw debug infos
     if (getGame().isLoaded() && (!getMenu().isVisible())) {
         for (int i = 0; i < 3; i++) {
-            getWindow().drawText(10, getWindow().mHeight - ((4 - i) * 20), 0.5f, OR_BLUE, "%.2f (%.2f)",
+            getFont().drawText(10, getWindow().getHeight() - ((4 - i) * 20), 0.5f, OR_BLUE, "%.2f (%.2f)",
                 getGame().getLara().getPos(i) / 256.0f, getGame().getLara().getAngle(i));
         }
     }

src/Render.cpp

@@ -18,6 +18,7 @@
 #include "Render.h"
 #include "utils/strings.h"
 #include "utils/tga.h"
+#include "Window.h"
 
 Render::Render() {
     mSkyMesh = -1;
@@ -37,7 +38,7 @@ Render::~Render() {
 
 void Render::screenShot(char *filenameBase)
 {
-    int sz = getWindow().mWidth * getWindow().mHeight;
+    int sz = getWindow().getWidth() * getWindow().getHeight();
     unsigned char *image = new unsigned char[sz * 3];
     char *filename = NULL;
     static int count = 0;
@@ -58,9 +59,9 @@ void Render::screenShot(char *filenameBase)
     }
 
     // Capture frame buffer
-    glReadPixels(0, 0, getWindow().mWidth, getWindow().mHeight, GL_BGR_EXT, GL_UNSIGNED_BYTE, image);
+    glReadPixels(0, 0, getWindow().getWidth(), getWindow().getHeight(), GL_BGR_EXT, GL_UNSIGNED_BYTE, image);
 
-    tgaSaveFilename(image, getWindow().mWidth, getWindow().mHeight, 0, "%s", filename);
+    tgaSaveFilename(image, getWindow().getWidth(), getWindow().getHeight(), 0, "%s", filename);
     printf("Took screenshot '%s'.\n", filename);
 
     delete [] filename;
@@ -488,10 +489,10 @@ void Render::drawLoadScreen()
     float x = 0.0f, y = 0.0f, z = -160.0f;
     float w, h;
 
-    if (getWindow().mWidth < getWindow().mHeight)
-        w = h = (float)getWindow().mWidth;
+    if (getWindow().getWidth() < getWindow().getHeight())
+        w = h = (float)getWindow().getWidth();
     else
-        w = h = (float)getWindow().mHeight;
+        w = h = (float)getWindow().getHeight();
 
 
     if (mTexture.getTextureCount() <= 0)

src/Window.cpp

@@ -11,9 +11,28 @@
 
 #include "global.h"
 #include "math/math.h"
+#include "utils/strings.h"
 #include "Window.h"
 
 Window::~Window() {
+    if (mDriver)
+        delete [] mDriver;
+}
+
+unsigned int Window::getWidth() {
+    return mWidth;
+}
+
+unsigned int Window::getHeight() {
+    return mHeight;
+}
+
+void Window::setDriver(const char *driver) {
+    assert(driver != NULL);
+    assert(driver[0] != '\0');
+    assert(mInit == false);
+
+    mDriver = bufferString("%s", driver);
 }
 
 int Window::initializeGL() {

src/WindowSDL.cpp

@@ -24,25 +24,12 @@ WindowSDL::WindowSDL() {
     mTextInput = false;
     mWindow = NULL;
     mGLContext = NULL;
-    mFontInit = false;
-    mFontName = NULL;
-    mFont = NULL;
-    mFontTexture = 0;
 
 #ifdef WIN32
     setDriver("libGL32.dll");
 #elif !defined(__APPLE__)
     setDriver("/usr/lib/libGL.so.1");
 #endif
-
-    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;
 }
 
 WindowSDL::~WindowSDL() {
@@ -50,29 +37,6 @@ WindowSDL::~WindowSDL() {
         SDL_QuitSubSystem(SUBSYSTEMS_USED);
         SDL_Quit();
     }
-
-    if (mFont)
-        TTF_CloseFont(mFont);
-
-    if (mFontInit)
-        TTF_Quit();
-
-    if (mDriver)
-        delete [] mDriver;
-
-    if (mFontName)
-        delete [] mFontName;
-
-    if (tempText.text)
-        delete [] tempText.text;
-}
-
-void WindowSDL::setDriver(const char *driver) {
-    assert(driver != NULL);
-    assert(driver[0] != '\0');
-    assert(mInit == false);
-
-    mDriver = bufferString("%s", driver);
 }
 
 void WindowSDL::setSize(unsigned int width, unsigned int height) {
@@ -510,113 +474,3 @@ void WindowSDL::swapBuffersGL() {
     SDL_GL_SwapWindow(mWindow);
 }
 
-void WindowSDL::setFont(const char *font) {
-    assert(font != NULL);
-    assert(font[0] != '\0');
-    assert(mFontInit == false);
-
-    mFontName = fullPath(font, 0);
-}
-
-int WindowSDL::initializeFont() {
-    assert(mFontInit == false);
-    assert(mFontName != NULL);
-    assert(mFontName[0] != '\0');
-
-    if (TTF_Init() != 0) {
-        printf("Could not initialize SDL-TTF!\n");
-        return -1;
-    }
-
-    mFont = TTF_OpenFont(mFontName, 24);
-    if (mFont == NULL) {
-        printf("TTF_OpenFont Error: %s\n", TTF_GetError());
-        return -2;
-    }
-
-    glGenTextures(1, &mFontTexture);
-
-    mFontInit = true;
-    return 0;
-}
-
-void WindowSDL::writeString(WindowString &s) {
-    assert(s.text != NULL);
-    assert(mInit == true);
-
-    SDL_Color color;
-    color.r = (unsigned char)(s.color[0] * 255.0f);
-    color.g = (unsigned char)(s.color[1] * 255.0f);
-    color.b = (unsigned char)(s.color[2] * 255.0f);
-    color.a = (unsigned char)(s.color[3] * 255.0f);
-
-    SDL_Surface *surface = TTF_RenderUTF8_Blended(mFont, s.text, color);
-    if (surface == NULL) {
-        printf("TTF_RenderUTF8_Blended Error: %s\n", TTF_GetError());
-        return;
-    }
-
-    s.w = (int)((float)surface->w * s.scale);
-    s.h = (int)((float)surface->h * s.scale);
-
-    GLenum textureFormat;
-    if (surface->format->BytesPerPixel == 4) {
-        if (surface->format->Rmask == 0x000000FF)
-            textureFormat = GL_RGBA;
-        else
-            textureFormat = GL_BGRA_EXT;
-    } else {
-        if (surface->format->Rmask == 0x000000FF)
-            textureFormat = GL_RGB;
-        else
-            textureFormat = GL_BGR_EXT;
-    }
-
-    glBindTexture(GL_TEXTURE_2D, mFontTexture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexImage2D(GL_TEXTURE_2D, 0, surface->format->BytesPerPixel, surface->w, surface->h, 0, textureFormat, GL_UNSIGNED_BYTE, surface->pixels);
-
-    GLuint xMin = s.x;
-    GLuint yMin = s.y;
-    GLuint xMax = xMin + s.w;
-    GLuint yMax = yMin + s.h;
-
-    glColor4f(color.r / 256.0f, color.g / 256.0f, color.b / 256.0f, color.a / 256.0f);
-
-    glBegin(GL_QUADS);
-        glTexCoord2f(0.0f, 0.0f);
-        glVertex2i(xMin, yMin);
-
-        glTexCoord2f(0.0f, 1.0f);
-        glVertex2i(xMin, yMax);
-
-        glTexCoord2f(1.0f, 1.0f);
-        glVertex2i(xMax, yMax);
-
-        glTexCoord2f(1.0f, 0.0f);
-        glVertex2i(xMax, yMin);
-    glEnd();
-
-    SDL_FreeSurface(surface);
-}
-
-void WindowSDL::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

@@ -28,6 +28,7 @@
 
 #ifdef USING_SDL
 #include "WindowSDL.h"
+#include "FontSDL.h"
 #else
 #error No Windowing Library selected!
 #endif
@@ -48,6 +49,7 @@ SoundNull gSound;
 
 #ifdef USING_SDL
 WindowSDL gWindow;
+FontSDL gFont;
 #endif
 
 Camera &getCamera() {
@@ -58,6 +60,10 @@ Console &getConsole() {
     return gConsole;
 }
 
+Font &getFont() {
+    return gFont;
+}
+
 Game &getGame() {
     return gGame;
 }