Fixed TRLE colors and SDL heading

ChangeLog.md

@@ -5,6 +5,9 @@
     [ 20140615 ]
     * Added FontManager, selecting Font library to use depending on
       the file extension of the font file specified in the config.
+    * Fixed menu heading not visible when using FontSDL
+    * Font::drawText now only implemented in Font
+    * TRLE Fonts can now be properly colored
 
     [ 20140614 ]
     * Implemented TRLE Font loader

TODO.md

@@ -26,10 +26,6 @@ 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

@@ -41,7 +41,6 @@ public:
 protected:
     bool mFontInit;
     char *mFontName;
-    FontString tempText;
 };
 
 Font &getFont();

src/Font.cpp

@@ -12,9 +12,6 @@
 Font::~Font() {
     delete [] mFontName;
     mFontName = NULL;
-
-    delete [] tempText.text;
-    tempText.text = NULL;
 }
 
 void Font::setFont(const char *font) {
@@ -26,21 +23,26 @@ void Font::setFont(const char *font) {
 }
 
 void Font::drawText(unsigned int x, unsigned int y, float scale, const float color[4], const char *s, ...) {
+    FontString tempText;
     va_list args;
     va_start(args, s);
-    vsnprintf(tempText.text, 256, s, args);
-    tempText.text[255] = '\0';
-    va_end(args);
 
+    tempText.text = new char[256];
     tempText.scale = scale;
+    tempText.w = 0;
+    tempText.h = 0;
     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];
-    }
+    tempText.color[0] = color[0];
+    tempText.color[1] = color[1];
+    tempText.color[2] = color[2];
+    tempText.color[3] = color[3];
+
+    vsnprintf(tempText.text, 256, s, args);
+    tempText.text[255] = '\0';
     writeString(tempText);
+
+    delete [] tempText.text;
+    va_end(args);
 }
 

src/FontManager.cpp

@@ -1,6 +1,6 @@
 /*!
  * \file src/FontManager.cpp
- * \brief SDL Font implementation
+ * \brief Font Manager
  *
  * \author xythobuz
  */
@@ -20,15 +20,6 @@ FontManager::FontManager() {
 #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() {

src/FontSDL.cpp

@@ -13,15 +13,6 @@ FontSDL::FontSDL() {
     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() {

src/FontTRLE.cpp

@@ -16,15 +16,6 @@ FontTRLE::FontTRLE() {
     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;
 }
 
 FontTRLE::~FontTRLE() {
@@ -46,6 +37,14 @@ int FontTRLE::initialize() {
         return -1;
     }
 
+    // Fix coloring
+    for (unsigned int i = 0; i < (256 * 256 * 4); i += 4) {
+        float y = (0.2126f * pixels[i + 2]);
+        y += (0.7152f * pixels[i + 1]);
+        y += (0.0722f * pixels[i]);
+        pixels[i] = pixels[i + 1] = pixels[i + 2] = (unsigned char)y;
+    }
+
     // ...into GL texture
     glGenTextures(1, &mFontTexture);
     glBindTexture(GL_TEXTURE_2D, mFontTexture);
@@ -142,6 +141,7 @@ void FontTRLE::writeString(FontString &s) {
     assert(s.text != NULL);
 
     unsigned int x = s.x;
+    unsigned int y = 0;
 
     for (unsigned int i = 0; s.text[i] != '\0'; i++) {
         // index into offset table
@@ -155,13 +155,12 @@ void FontTRLE::writeString(FontString &s) {
 
         writeChar((unsigned int)index, x, s);
         x += (int)((vec_t)(offsets[index][2] + 1) * s.scale * SCALING); // width
+
+        if (y < (unsigned int)(((vec_t)offsets[index][3]) * s.scale * SCALING))
+            y = (unsigned int)(((vec_t)offsets[index][3]) * s.scale * SCALING);
     }
 
-    // TODO scaling?!
-    s.w = x;
-/*
-    s.w = (int)((float)surface->w * s.scale * SCALING);
-    s.h = (int)((float)surface->h * s.scale * SCALING);
-*/
+    s.w = x - s.x;
+    s.h = y;
 }
 

src/Menu.cpp

@@ -30,10 +30,10 @@ Menu::Menu() {
     mMin = 0;
 
     mainText.text = bufferString(VERSION);
-    mainText.color[0] = 0xFF;
-    mainText.color[1] = 0xFF;
-    mainText.color[2] = 0xFF;
-    mainText.color[3] = 0xFF;
+    mainText.color[0] = OR_BLUE[0];
+    mainText.color[1] = OR_BLUE[1];
+    mainText.color[2] = OR_BLUE[2];
+    mainText.color[3] = OR_BLUE[3];
     mainText.scale = 1.2f;
     mainText.y = 10;
     mainText.w = 0;