Wrote TTF string rendering

include/Window.h

@@ -15,6 +15,7 @@ typedef struct {
     unsigned int x;
     unsigned int y;
     float scale;
+    unsigned char color[3];
 } WindowString;
 
 /*!

include/WindowSDL.h

@@ -9,6 +9,7 @@
 #define _WINDOW_SDL_H_
 
 #include "SDL.h"
+#include "SDL_ttf.h"
 
 #include "Window.h"
 
@@ -57,11 +58,12 @@ private:
     unsigned int mHeight;
     bool mFullscreen;
     bool mMousegrab;
-    char *mFont;
-    bool mFontInit;
-
     SDL_Window *mWindow;      //!< This is the pointer to the SDL surface
     SDL_GLContext mGLContext; //!< The OpenGL Context
+
+    bool mFontInit;
+    char *mFontName;
+    TTF_Font *mFont;
 };
 
 #endif

src/OpenRaider.cpp

@@ -47,6 +47,8 @@ int OpenRaider::initialize() {
     if (mWindow->initialize() != 0)
         return -1;
 
+    mWindow->setFont("~/.OpenRaider/data/test.ttf");
+
     // Initialize windows font
     if (mWindow->initializeFont() != 0)
         return -2;
@@ -66,6 +68,16 @@ void OpenRaider::run() {
 
         mWindow->eventHandling();
 
+        /*WindowString s;
+        s.text = bufferString("Hello World");
+        s.x = 100;
+        s.y = 100;
+        s.scale = 1.0;
+        s.color[0] = s.color[1] = s.color[2] = 0xFF;
+        mWindow->writeString(&s);*/
+
+        mWindow->swapBuffersGL();
+
         clock_t stopTime = systemTimerGet();
         if (MAX_MS_PER_FRAME > (stopTime - startTime))
             mWindow->delay(MAX_MS_PER_FRAME - (stopTime - startTime));

src/WindowSDL.cpp

@@ -8,16 +8,6 @@
 #include <cstdio>
 #include <assert.h>
 
-#include "SDL_ttf.h"
-
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif
-
 #include "config.h"
 #include "utils/strings.h"
 #include "WindowSDL.h"
@@ -31,10 +21,11 @@ WindowSDL::WindowSDL() {
     mHeight = DEFAULT_HEIGHT;
     mFullscreen = false;
     mMousegrab = false;
-    mFont = NULL;
-    mFontInit = false;
     mWindow = NULL;
     mGLContext = NULL;
+    mFontInit = false;
+    mFontName = NULL;
+    mFont = NULL;
 
 #ifdef WIN32
     setDriver("libGL32.dll");
@@ -49,14 +40,17 @@ WindowSDL::~WindowSDL() {
         SDL_Quit();
     }
 
+    if (mFont)
+        TTF_CloseFont(mFont);
+
     if (mFontInit)
         TTF_Quit();
 
     if (mDriver)
         delete [] mDriver;
 
-    if (mFont)
-        delete [] mFont;
+    if (mFontName)
+        delete [] mFontName;
 }
 
 void WindowSDL::setDriver(const char *driver) {
@@ -215,19 +209,25 @@ void WindowSDL::setFont(const char *font) {
     assert(font[0] != '\0');
     assert(mFontInit == false);
 
-    mFont = fullPath(font, 0);
+    mFontName = fullPath(font, 0);
 }
 
 int WindowSDL::initializeFont() {
     assert(mFontInit == false);
-    assert(mFont != NULL);
-    assert(mFont[0] != '\0');
+    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;
+    }
+
     mFontInit = true;
     return 0;
 }
@@ -237,6 +237,34 @@ void WindowSDL::writeString(WindowString *s) {
     assert(s->text != NULL);
     assert(mInit == true);
 
+    SDL_Color color;
+    color.r = s->color[0];
+    color.g = s->color[1];
+    color.b = s->color[2];
+
+    SDL_Surface *surface = TTF_RenderUTF8_Blended(mFont, s->text, color);
+    if (surface == NULL) {
+        printf("TTF_RenderUTF8_Blended Error: %s\n", TTF_GetError());
+        return;
+    }
+
+    SDL_Surface *window = SDL_GetWindowSurface(mWindow);
+    if (window == NULL) {
+        printf("SDL_GetWindowSurface Error: %s\n", SDL_GetError());
+        return;
+    }
+
+    SDL_Rect destination;
+    destination.x = s->x;
+    destination.y = s->y;
+    destination.w = (int)((float)surface->w * s->scale);
+    destination.h = (int)((float)surface->h * s->scale);
+
+    if (SDL_BlitScaled(surface, NULL, window, &destination) != 0) {
+        printf("SDL_BlitScaled Error: %s\n", SDL_GetError());
+        return;
+    }
 
+    SDL_FreeSurface(surface);
 }