Finished TRLE font support, loading lps files

ChangeLog.md

@@ -3,7 +3,7 @@
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
     [ 20140614 ]
-    * Started implementing TRLE Font loader
+    * Implemented TRLE Font loader
 
     [ 20140613 ]
     * Changed strange delete-guards

README.md

@@ -29,7 +29,8 @@ A more or less recent [Doxygen documentation](http://xythobuz.github.io/OpenRaid
 Basically, OpenRaider depends on the following:
 
 * OpenGL
-* SDL2 & SDL2-TTF
+* SDL2
+* SDL2-TTF (if you want to use TTF fonts)
 * OpenAL & ALUT
 * zlib
 * cmake as build system
@@ -114,6 +115,14 @@ OpenRaider tries to load a `MAIN.SFX` from the same folder as the selected level
 
 Every available command should be listed in the in-game help. Just type `help` in the OpenRaider console, which can be activated by default with the backquote key.
 
+### 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).
+
+TRLE Font support will automatically be built if SDL2-TTF is not available. Just change the font file path in your config file.
+
+I’ve made [a small writeup on my website](http://xythobuz.de/2014_06_14_trle_font.html) about this.
+
 ### Wireframe mode colors
 
 * Red (thick) lines are portal outlines
@@ -139,6 +148,8 @@ Forked in December 2013 by xythobuz.
 
 The included example Font, [Droid Sans Mono](http://www.droidfonts.com/licensing/), was created by Steve Matteson and is licensed under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0).
 
+The included TRLE Font is from [Laras Levelbase](http://laraslevelbase.org/stuff/index.asp?id=1967).
+
 There are some included cmake scripts:
 
 * [FindALUT](https://github.com/rpavlik/cmake-modules/blob/master/FindALUT.cmake)

cmake/setup.sh

@@ -9,4 +9,5 @@ mkdir -p ~/.OpenRaider/data
 mkdir -p ~/.OpenRaider/sshots
 cp data/*.tga ~/.OpenRaider/data
 cp data/*.ttf ~/.OpenRaider/data
+cp data/*.pc ~/.OpenRaider/data
 echo "DONE"

cmake/setup_mac.sh

@@ -10,6 +10,7 @@ if [ ! -d "${HOME}/.OpenRaider" ]; then
     mkdir -p ~/.OpenRaider/sshots
     cp ../Resources/defaults/*.tga ~/.OpenRaider/data
     cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
+    cp ../Resources/defaults/*.pc ~/.OpenRaider/data
     echo "DONE"
     osascript -e 'tell app "System Events" to display alert "Initial Configuration stored in ~/.OpenRaider\n\nView and edit OpenRaider.ini to your needs..."'
 fi

data/OpenRaider.ini

@@ -6,6 +6,7 @@ set pakdir     "$(basedir)/paks"
 set audiodir   "$(basedir)/music"
 set datadir    "$(basedir)/data"
 set font       "$(datadir)/test.ttf"
+# set font       "$(datadir)/font.pc"
 
 # Not needed for Mac OS X
 set gldriver   "/usr/lib/libGL.so.1"

include/FontTRLE.h

@@ -36,20 +36,12 @@ public:
 
 private:
 
-    void loadLPS(const char *file);
+    void loadLPS(const char *f);
     void writeChar(unsigned int index, unsigned int xDraw, FontString &s);
 
     unsigned int mFontTexture;
     FontString tempText;
 
-    unsigned int resolution1;
-    unsigned int resolution2;
-    int ruler1;
-    int ruler2;
-    int baselineAbs; // always zero?
-    vec_t spacing;
-    vec_t squashedTextFactor;
-
     // 106 entries: (x, y, w, h, offset)
     int offsets[106][5] = {
         { 174,  52,   3,  12, -11 },
@@ -131,7 +123,7 @@ private:
         {  96,  26,  17,   8, -7  },
         { 152,  48,  11,   8, -7  },
         {  62,  51,   9,   8, -7  },
-        { 244,  15,   0,  12, -7  },
+        { 244,  15,  10,  12, -7  },
         {  52,  39,   9,  12, -7  },
         {  10,  52,   9,   8, -7  },
         { 190,  52,   8,   8, -7  },

src/CMakeLists.txt

@@ -78,8 +78,14 @@ if (SDL2_FOUND AND SDL2TTF_FOUND)
     set (SRCS ${SRCS} "FontSDL.cpp")
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_SDL")
 else (SDL2_FOUND AND SDL2TTF_FOUND)
-    # Currently only SDL2 support
-    message (FATAL_ERROR "SDL2 and SDL2-TTF are required at the moment!")
+    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)
 
 #################################################################
@@ -135,7 +141,7 @@ if (APPLE)
     set (SRCS ${SRCS} ${MAC_ICON})
 
     # Copy Data
-    set (MAC_DATA "../data/OpenRaider.ini" "../data/test.ttf" "../data/splash.tga")
+    set (MAC_DATA "../data/font.pc" "../data/OpenRaider.ini" "../data/test.ttf" "../data/splash.tga")
     set_source_files_properties (${MAC_DATA} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/defaults)
     set (SRCS ${SRCS} ${MAC_DATA})
 endif (APPLE)

src/FontTRLE.cpp

@@ -6,6 +6,7 @@
  */
 
 #include <fstream>
+#include <sstream>
 
 #include "global.h"
 #include "utils/strings.h"
@@ -16,16 +17,6 @@ FontTRLE::FontTRLE() {
     mFontName = NULL;
     mFontTexture = 0;
 
-    // TRLE defaults
-    resolution1 = 240;
-    resolution2 = 512;
-    ruler1 = -16;
-    ruler2 = -40;
-    baselineAbs = 0; // always zero?
-    spacing = 0.075f;
-    squashedTextFactor = 0.75f;
-    // offset table default is set in header
-
     tempText.text = new char[256];
     tempText.color[0] = 0xFF;
     tempText.color[1] = 0xFF;
@@ -42,14 +33,7 @@ FontTRLE::~FontTRLE() {
 }
 
 int FontTRLE::initialize() {
-    // TODO font coloring not working when .pc has color?!?!
-
-
-    // tmp debug
-    delete [] mFontName;
-    mFontName = bufferString("/Users/thomas/Downloads/TR Fonts/TR4 Official/Font.pc");
-    //mFontName = bufferString("/Users/thomas/Downloads/TR Fonts/TR2 Web/Font.pc");
-
+    //! \todo Font coloring not working when .pc has color?!?!
 
     assert(mFontInit == false);
     assert(mFontName != NULL);
@@ -81,11 +65,44 @@ int FontTRLE::initialize() {
     return 0;
 }
 
-void FontTRLE::loadLPS(const char *file) {
-    // TODO load lps file
-
-    // if baselineAbs != 0
-    //     all offset[4] + baselineAbs;
+void FontTRLE::loadLPS(const char *f) {
+    std::ifstream file(f);
+    if (!file)
+        return;
+
+    /*!
+     * \todo This is probably the worlds most unreliable parser...
+     */
+
+    for (std::string line; std::getline(file, line);) {
+        std::istringstream stream(line);
+        std::string tok1, tok2;
+        std::getline(stream, tok1, '=');
+        std::getline(stream, tok2);
+
+        // we are only interested in lines starting with
+        // xxx=
+        // Where xxx is a 3 digit number
+        try {
+            int index = std::stoi(tok1);
+            if ((index >= 0) && (index <= 105)) {
+                std::istringstream row(tok2);
+                std::string a, b, c, d, e;
+                std::getline(row, a, ',');
+                std::getline(row, b, ',');
+                std::getline(row, c, ',');
+                std::getline(row, d, ',');
+                std::getline(row, e);
+                offsets[index][0] = std::stoi(a);
+                offsets[index][1] = std::stoi(b);
+                offsets[index][2] = std::stoi(c);
+                offsets[index][3] = std::stoi(d);
+                offsets[index][4] = std::stoi(e);
+            }
+        } catch (std::invalid_argument) {
+
+        }
+    }
 }
 
 #define SCALING 2.0f

src/main.cpp

@@ -28,7 +28,11 @@
 
 #ifdef USING_SDL
 #include "WindowSDL.h"
+#ifdef USING_TRLE
+#include "FontTRLE.h"
+#else
 #include "FontSDL.h"
+#endif
 #else
 #error No Windowing Library selected!
 #endif
@@ -49,8 +53,12 @@ SoundNull gSound;
 
 #ifdef USING_SDL
 WindowSDL gWindow;
+#ifdef USING_TRLE
+FontTRLE gFont;
+#else
 FontSDL gFont;
 #endif
+#endif
 
 Camera &getCamera() {
     return gCamera;