More ttf code

include/Window.h

@@ -46,6 +46,10 @@ public:
 
     virtual void resizeGL(unsigned int w, unsigned int h);
 
+    virtual void glEnter2D(unsigned int width, unsigned int height);
+
+    virtual void glExit2D();
+
     virtual void setFont(const char *font) = 0;
 
     virtual int initializeFont() = 0;

src/Window.cpp

@@ -42,3 +42,40 @@ void Window::resizeGL(unsigned int w, unsigned int h) {
     glLoadIdentity();
 }
 
+void Window::glEnter2D(unsigned int width, unsigned int height) {
+    glPushAttrib(GL_ENABLE_BIT);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_CULL_FACE);
+    glEnable(GL_TEXTURE_2D);
+
+    /* This allows alpha blending of 2D textures with the scene */
+    glEnable(GL_BLEND);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    glViewport(0, 0, width, height);
+
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
+
+    glOrtho(0.0, (GLdouble)width, (GLdouble)height, 0.0, 0.0, 1.0);
+
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
+
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+}
+
+void Window::glExit2D() {
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+
+    glPopAttrib();
+
+    glMatrixMode(GL_MODELVIEW);
+}
+

src/WindowSDL.cpp

@@ -8,6 +8,16 @@
 #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"
@@ -39,8 +49,14 @@ WindowSDL::~WindowSDL() {
         SDL_Quit();
     }
 
+    if (mFontInit)
+        TTF_Quit();
+
     if (mDriver)
         delete [] mDriver;
+
+    if (mFont)
+        delete [] mFont;
 }
 
 void WindowSDL::setDriver(const char *driver) {
@@ -207,6 +223,11 @@ int WindowSDL::initializeFont() {
     assert(mFont != NULL);
     assert(mFont[0] != '\0');
 
+    if (TTF_Init() != 0) {
+        printf("Could not initialize SDL-TTF!\n");
+        return -1;
+    }
+
     mFontInit = true;
     return 0;
 }