Removed custom Font support

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.4) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20150330 ]
+    * Removed custom Font support
+
     [ 20150326 ]
     * No longer including gl.h globally, now only using gl33.h where needed.
     * No longer including all of glm globally, only the vec2/3/4 and mat4x4.

cmake/setup.sh

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

cmake/setup_mac.sh

@@ -9,8 +9,6 @@ if [ ! -d "${HOME}/.OpenRaider" ]; then
     mkdir -p ~/.OpenRaider/sshots
     cp ../Resources/defaults/OpenRaider.ini ~/.OpenRaider/
     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

cmake/setup_win.bat

@@ -9,8 +9,6 @@ if not exist "%UserProfile%\.OpenRaider" (
 	mkdir %UserProfile%\.OpenRaider\sshots
 	copy data\OpenRaider.ini %UserProfile%\.OpenRaider
 	copy data\*.tga %UserProfile%\.OpenRaider\data
-	copy data\*.ttf %UserProfile%\.OpenRaider\data
-	copy data\*.pc %UserProfile%\.OpenRaider\data
 	echo Done!
 ) else (
 	echo Already done

data/OpenRaider.ini

@@ -5,8 +5,6 @@ set basedir    "~/.OpenRaider"
 set pakdir     "$(basedir)/paks"
 set audiodir   "$(basedir)/music"
 set datadir    "$(basedir)/data"
-set font       "$(datadir)/test.ttf"
-# set font       "$(datadir)/font.pc"
 
 # Windowing
 set size       1280 720

data/Unix.in

@@ -5,8 +5,6 @@ set basedir    "@CMAKE_INSTALL_PREFIX@"
 set datadir    "$(basedir)/share/OpenRaider"
 set pakdir     "$(datadir)"
 set audiodir   "$(datadir)"
-set font       "$(datadir)/test.ttf"
-# set font       "$(datadir)/font.pc"
 
 # Windowing
 set size       1280 720

include/system/Font.h

@@ -1,49 +0,0 @@
-/*!
- * \file include/system/Font.h
- * \brief Font Interface
- *
- * \author xythobuz
- */
-
-#ifndef _FONT_H_
-#define _FONT_H_
-
-#include <string>
-
-/*!
- * \brief Font interface
- */
-class Font {
-  public:
-    static void shutdown();
-
-    static int initialize(std::string font = "");
-
-    static std::string getFontName() { return fontName; }
-
-    static unsigned int widthText(float scale, std::string s);
-
-    static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
-
-    static void drawText(unsigned int x, unsigned int y, float scale,
-                         glm::vec4 color, std::string s);
-
-    static void drawTextWrapped(unsigned int x, unsigned int y, float scale,
-                                glm::vec4 color, unsigned int maxWidth, std::string s);
-
-    static void drawTextCentered(unsigned int x, unsigned int y, float scale,
-                                 glm::vec4 color, unsigned int width, std::string s);
-
-    static void setShowFontBox(bool s) { showFontBox = s; }
-    static bool getShowFontBox() { return showFontBox; }
-
-  private:
-    static void drawFontBox(unsigned int x, unsigned int y, unsigned int w, unsigned int h);
-
-    static bool isInit;
-    static std::string fontName;
-    static bool showFontBox;
-};
-
-#endif
-

include/system/FontImGui.h

@@ -1,30 +0,0 @@
-/*!
- * \file include/system/FontImGui.h
- * \brief Default Font Implementation
- *
- * \author xythobuz
- */
-
-#ifndef _FONT_IMGUI_H_
-#define _FONT_IMGUI_H_
-
-#include <string>
-
-/*!
- * \brief Default Font implementation
- */
-class FontImGui {
-  public:
-    static unsigned int widthText(float scale, std::string s);
-
-    static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
-
-    static void drawText(unsigned int x, unsigned int y, float scale,
-                         glm::vec4 color, std::string s);
-
-    static void drawTextWrapped(unsigned int x, unsigned int y, float scale,
-                                glm::vec4 color, unsigned int maxWidth, std::string s);
-};
-
-#endif
-

include/system/FontTRLE.h

@@ -1,52 +0,0 @@
-/*!
- * \file include/system/FontTRLE.h
- * \brief Tomb Raider Level Editor Font loader
- *
- * \author xythobuz
- */
-
-#ifndef _FONT_TRLE_H_
-#define _FONT_TRLE_H_
-
-#include <vector>
-
-#include "system/Shader.h"
-
-/*!
- * \brief Tomb Raider Level Editor Font loader
- */
-class FontTRLE {
-  public:
-    static void shutdown();
-
-    static int initialize(std::string font);
-
-    static unsigned int widthText(float scale, std::string s);
-
-    static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
-
-    static void drawText(unsigned int x, unsigned int y, float scale,
-                         glm::vec4 color, std::string s);
-
-    static void drawTextWrapped(unsigned int x, unsigned int y, float scale,
-                                glm::vec4 color, unsigned int maxWidth, std::string s);
-
-  private:
-    static void setDefaultOffsets();
-    static void loadLPS(std::string f);
-    static void writeChar(unsigned int index, unsigned int xDraw, unsigned int yDraw, float scale,
-                          std::vector<glm::vec2>& vertices, std::vector<glm::vec2>& uvs);
-
-    static bool mFontInit;
-    static unsigned int mFontTexture;
-
-    // 106 entries: (x, y, w, h, offset)
-    static int offsets[106][5];
-    static int defaultOffsets[106][5];
-
-    static ShaderBuffer vertexBuffer;
-    static ShaderBuffer uvBuffer;
-};
-
-#endif
-

include/system/FontTTF.h

@@ -1,61 +0,0 @@
-/*!
- * \file include/system/FontTTF.h
- * \brief TrueType Font Implementation
- *
- * \author xythobuz
- */
-
-#ifndef _FONT_TTF_H_
-#define _FONT_TTF_H_
-
-#include <string>
-#include <vector>
-
-#include "stb/stb_truetype.h"
-#include "system/Shader.h"
-
-class FontMapTTF {
-  public:
-    FontMapTTF();
-    FontMapTTF(FontMapTTF&& other);
-    ~FontMapTTF();
-
-    int initialize(unsigned char* fontData, int firstChar);
-    bool contains(int c);
-    int getTexture() { return texture; }
-    void getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad* quad);
-
-  private:
-    int begin;
-    int texture;
-    stbtt_packedchar* charInfo;
-};
-
-class FontTTF {
-  public:
-    static int initialize(std::string f);
-    static void shutdown();
-
-    static unsigned int widthText(float scale, std::string s);
-    static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);
-
-    static void drawText(unsigned int x, unsigned int y, float scale,
-                         glm::vec4 color, std::string s);
-    static void drawTextWrapped(unsigned int x, unsigned int y, float scale,
-                                glm::vec4 color, unsigned int maxWidth, std::string s);
-
-  private:
-    static int charIsMapped(int c);
-    static int getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad* quad);
-    static void drawTextInternal(unsigned int x, unsigned int y, float scale,
-                                 glm::vec4 color, unsigned int maxWidth, std::string s,
-                                 bool drawWrapped);
-
-    static unsigned char* fontData;
-    static std::vector<FontMapTTF> maps;
-    static ShaderBuffer vertexBuffer;
-    static ShaderBuffer uvBuffer;
-};
-
-#endif
-

include/system/Shader.h

@@ -76,7 +76,7 @@ class Shader {
     static void set2DState(bool on, bool depth = true);
 
     static void drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, glm::vec4 color, unsigned int texture,
-                       TextureStorage store = TextureStorage::SYSTEM, gl::GLenum = gl::GL_TRIANGLES,
+                       TextureStorage store = TextureStorage::SYSTEM, gl::GLenum mode = gl::GL_TRIANGLES,
                        ShaderTexture* target = nullptr, Shader& shader = textShader);
 
     static void drawGL(ShaderBuffer& vertices, ShaderBuffer& uvs, unsigned int texture, glm::mat4 MVP,

src/CMakeLists.txt

@@ -152,7 +152,7 @@ if (APPLE)
     set (RESRCS ${RESRCS} ${MAC_ICON})
 
     # Copy Data
-    set (MAC_DATA "../data/font.pc" "../data/OpenRaider.ini" "../data/test.ttf" "../data/splash.tga")
+    set (MAC_DATA "../data/OpenRaider.ini" "../data/splash.tga")
     set_source_files_properties (${MAC_DATA} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/defaults)
     set (RESRCS ${RESRCS} ${MAC_DATA})
 endif (APPLE)
@@ -238,9 +238,7 @@ elseif (NOT WIN32)
         RENAME "OpenRaider.ini")
 
     # Data files
-    install (FILES "${PROJECT_SOURCE_DIR}/data/font.pc"
-                    "${PROJECT_SOURCE_DIR}/data/splash.tga"
-                    "${PROJECT_SOURCE_DIR}/data/test.ttf"
+    install (FILES "${PROJECT_SOURCE_DIR}/data/splash.tga"
         DESTINATION "share/OpenRaider")
 endif (APPLE)
 

src/Menu.cpp

@@ -14,7 +14,6 @@
 #include "RunTime.h"
 #include "UI.h"
 #include "TextureManager.h"
-#include "system/Font.h"
 #include "system/Window.h"
 #include "utils/random.h"
 #include "utils/strings.h"

src/Render.cpp

@@ -15,7 +15,6 @@
 #include "Menu.h"
 #include "StaticMesh.h"
 #include "World.h"
-#include "system/Font.h"
 #include "system/Shader.h"
 #include "system/Window.h"
 #include "Render.h"
@@ -239,11 +238,6 @@ void Render::displayUI() {
         if (ImGui::Checkbox("StaticMesh##bbox", &showBoundingBox2)) {
             StaticMesh::setShowBoundingBox(showBoundingBox2);
         }
-        ImGui::SameLine();
-        bool showFontBox = Font::getShowFontBox();
-        if (ImGui::Checkbox("Font##bbox", &showFontBox)) {
-            Font::setShowFontBox(showFontBox);
-        }
 
         ImGui::Separator();
         ImGui::Text("Renderable Objects:");

src/TextureManager.cpp

@@ -285,9 +285,19 @@ int TextureManager::getNextTileAnimation(int index, int tile) {
 
 BufferManager* TextureManager::getBufferManager(int tex, TextureStorage store) {
     auto& v = (store == TextureStorage::GAME) ? gameBuffers : systemBuffers;
-    while (v.size() <= (tex + 1)) {
+
+    /*! \fixme  Strange +2 needed, or else OpenRaider crashes hard.
+     * Normally, this should only be (tex). I had to increase it to
+     * (tex + 1) some time ago when OpenRaider crashed in relation to
+     * non-existing texture IDs. Now, after removing all custom Font
+     * support (one texture less loaded at startup), OR crashed again.
+     * Increasing this to (tex + 2) "fixed" the problem. Why?
+     */
+
+    while (v.size() <= (tex + 2)) {
         v.emplace_back(v.size(), store);
     }
+
     return &(v.at(tex));
 }
 

src/UI.cpp

@@ -140,7 +140,7 @@ int UI::initialize() {
     style.ItemSpacing                           = ImVec2(2, 2);
     style.ItemInnerSpacing                      = ImVec2(1, 1);
     style.TouchExtraPadding                     = ImVec2(0, 0);
-    style.IndentSpacing                       = 3;
+    style.IndentSpacing                         = 3;
     style.ScrollbarWidth                        = 10;
 
     return 0;

src/commands/CommandSet.cpp

@@ -9,7 +9,6 @@
 #include "Camera.h"
 #include "Log.h"
 #include "RunTime.h"
-#include "system/Font.h"
 #include "system/Sound.h"
 #include "system/Window.h"
 #include "utils/strings.h"
@@ -31,7 +30,6 @@ void CommandSet::printHelp() {
     Log::get(LOG_USER) << "  pakdir     STRING" << Log::endl;
     Log::get(LOG_USER) << "  audiodir   STRING" << Log::endl;
     Log::get(LOG_USER) << "  datadir    STRING" << Log::endl;
-    Log::get(LOG_USER) << "  font       STRING" << Log::endl;
     Log::get(LOG_USER) << "  size       INT INT" << Log::endl;
     Log::get(LOG_USER) << "  fullscreen BOOL" << Log::endl;
     Log::get(LOG_USER) << "  audio      BOOL" << Log::endl;
@@ -132,13 +130,6 @@ int CommandSet::execute(std::istream& args) {
         std::string temp;
         args >> temp;
         RunTime::setDataDir(expandNames(temp));
-    } else if (var.compare("font") == 0) {
-        std::string temp;
-        args >> temp;
-        int error = Font::initialize(expandNames(temp));
-        if (error != 0)
-            Log::get(LOG_USER) << "Error initializing font: " << expandNames(temp) << "(" << error << ")" <<
-                               Log::endl;
     } else {
         Log::get(LOG_USER) << "set-Error: Unknown variable (" << var.c_str() << ")" << Log::endl;
         return -1;
@@ -163,7 +154,6 @@ void CommandGet::printHelp() {
     Log::get(LOG_USER) << "  pakdir" << Log::endl;
     Log::get(LOG_USER) << "  audiodir" << Log::endl;
     Log::get(LOG_USER) << "  datadir" << Log::endl;
-    Log::get(LOG_USER) << "  font" << Log::endl;
     Log::get(LOG_USER) << "  size" << Log::endl;
     Log::get(LOG_USER) << "  fullscreen" << Log::endl;
     Log::get(LOG_USER) << "  audio" << Log::endl;
@@ -199,8 +189,6 @@ int CommandGet::execute(std::istream& args) {
         Log::get(LOG_USER) << RunTime::getAudioDir() << Log::endl;
     } else if (var.compare("datadir") == 0) {
         Log::get(LOG_USER) << RunTime::getDataDir() << Log::endl;
-    } else if (var.compare("font") == 0) {
-        Log::get(LOG_USER) << Font::getFontName() << Log::endl;
     } else {
         Log::get(LOG_USER) << "get-Error: Unknown variable (" << var << ")" << Log::endl;
         return -1;

src/deps/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Source files
 set (DEPS_SRCS ${DEPS_SRCS} "commander/commander.c" "commander/commander.h")
 set (DEPS_SRCS ${DEPS_SRCS} "imgui/imgui.cpp" "imgui/imgui.h" "imgui/imconfig.h" "imgui/stb_textedit.h")
-set (DEPS_SRCS ${DEPS_SRCS} "stb/stb.cpp" "stb/stb_image.h" "stb/stb_image_write.h" "stb/stb_truetype.h")
+set (DEPS_SRCS ${DEPS_SRCS} "stb/stb.cpp" "stb/stb_image.h" "stb/stb_image_write.h")
 
 # Add library
 add_library (OpenRaider_deps OBJECT ${DEPS_SRCS})

src/deps/imgui/imgui.cpp

@@ -6603,7 +6603,7 @@ bool ImGui::Selectable(const char* label, bool selected, const ImVec2& size_arg)
     const ImGuiID id = window->GetID(label);
     const ImVec2 label_size = CalcTextSize(label, NULL, true);
     
-    const float w = ImMax(label_size.x, window->Pos.x + ImGui::GetContentRegionMax().x - window->DC.CursorPos.x);
+    const float w = ImMax(label_size.x, window->Pos.x + ImGui::GetContentRegionMax().x - style.AutoFitPadding.x - window->DC.CursorPos.x);
     const ImVec2 size(size_arg.x != 0.0f ? size_arg.x : w, size_arg.y != 0.0f ? size_arg.y : label_size.y);
     const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + size);
     ItemSize(bb);
@@ -7555,10 +7555,10 @@ void ImDrawList::AddVtxUV(const ImVec2& pos, ImU32 col, const ImVec2& uv)
 }
 
 // NB: memory should be reserved for 6 vertices by the caller.
-void ImDrawList::AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col, float half_thickness)
+void ImDrawList::AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness)
 {
     const float inv_length = 1.0f / sqrtf(ImLengthSqr(b - a));
-    const ImVec2 hn = (b - a) * (half_thickness * inv_length);  // half normal
+    const ImVec2 hn = (b - a) * (thickness * 0.5f * inv_length);// half normal
     const ImVec2 hp0 = ImVec2(+hn.y, -hn.x);                    // half perpendiculars + user offset
     const ImVec2 hp1 = ImVec2(-hn.y, +hn.x);
 
@@ -7571,13 +7571,13 @@ void ImDrawList::AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col, float h
     AddVtx(a + hp1, col);
 }
 
-void ImDrawList::AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float half_thickness)
+void ImDrawList::AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness)
 {
     if ((col >> 24) == 0)
         return;
 
     ReserveVertices(6);
-    AddVtxLine(a, b, col, half_thickness);
+    AddVtxLine(a, b, col, thickness);
 }
 
 void ImDrawList::AddArc(const ImVec2& center, float rad, ImU32 col, int a_min, int a_max, bool tris, const ImVec2& third_point_offset)
@@ -9715,7 +9715,7 @@ void ImGui::ShowTestWindow(bool* opened)
                 // Draw a line between the button and the mouse cursor
                 ImDrawList* draw_list = ImGui::GetWindowDrawList();
                 draw_list->PushClipRectFullScreen();
-                draw_list->AddLine(ImGui::CalcItemRectClosestPoint(ImGui::GetIO().MousePos, true, -2.0f), ImGui::GetIO().MousePos, ImColor(ImGui::GetStyle().Colors[ImGuiCol_Button]), 2.0f);
+                draw_list->AddLine(ImGui::CalcItemRectClosestPoint(ImGui::GetIO().MousePos, true, -2.0f), ImGui::GetIO().MousePos, ImColor(ImGui::GetStyle().Colors[ImGuiCol_Button]), 4.0f);
                 draw_list->PopClipRect();
             }
             ImGui::SameLine(); ImGui::Text("Raw (%.1f, %.1f), WithLockThresold (%.1f, %.1f)", value_raw.x, value_raw.y, value_with_lock_threshold.x, value_with_lock_threshold.y);

src/deps/imgui/imgui.h

@@ -895,7 +895,7 @@ struct ImDrawList
     IMGUI_API void  PopTextureID();
 
     // Primitives   
-    IMGUI_API void  AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float half_thickness = 0.50f);
+    IMGUI_API void  AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness = 1.0f);
     IMGUI_API void  AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, int rounding_corners=0x0F);
     IMGUI_API void  AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, int rounding_corners=0x0F);
     IMGUI_API void  AddTriangleFilled(const ImVec2& a, const ImVec2& b, const ImVec2& c, ImU32 col);
@@ -913,7 +913,7 @@ struct ImDrawList
     IMGUI_API void  ReserveVertices(unsigned int vtx_count);
     IMGUI_API void  AddVtx(const ImVec2& pos, ImU32 col);
     IMGUI_API void  AddVtxUV(const ImVec2& pos, ImU32 col, const ImVec2& uv);
-    IMGUI_API void  AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col, float half_thickness = 0.50f);
+    IMGUI_API void  AddVtxLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness = 1.0f);
     IMGUI_API void  UpdateClipRect();
     IMGUI_API void  UpdateTextureID();
 };

src/deps/stb/stb.cpp

@@ -15,11 +15,3 @@
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb/stb_image_write.h"
 
-#define STB_RECT_PACK_IMPLEMENTATION
-#define STBRP_ASSERT orAssert
-#include "stb/stb_rect_pack.h"
-
-#define STB_TRUETYPE_IMPLEMENTATION
-#define STBTT_assert(x) orAssert(x)
-#include "stb/stb_truetype.h"
-

src/deps/stb/stb_rect_pack.h

@@ -1,546 +0,0 @@
-// stb_rect_pack.h - v0.05 - public domain - rectangle packing
-// Sean Barrett 2014
-//
-// Useful for e.g. packing rectangular textures into an atlas.
-// Does not do rotation.
-//
-// Not necessarily the awesomest packing method, but better than
-// the totally naive one in stb_truetype (which is primarily what
-// this is meant to replace).
-//
-// Has only had a few tests run, may have issues.
-//
-// More docs to come.
-//
-// No memory allocations; uses qsort() and assert() from stdlib.
-//
-// This library currently uses the Skyline Bottom-Left algorithm.
-//
-// Please note: better rectangle packers are welcome! Please
-// implement them to the same API, but with a different init
-// function.
-//
-// Version history:
-//
-//     0.05:  added STBRP_ASSERT to allow replacing assert
-//     0.04:  fixed minor bug in STBRP_LARGE_RECTS support
-//     0.01:  initial release
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//       INCLUDE SECTION
-//
-
-#ifndef STB_INCLUDE_STB_RECT_PACK_H
-#define STB_INCLUDE_STB_RECT_PACK_H
-
-#define STB_RECT_PACK_VERSION  1
-
-#ifdef STBRP_STATIC
-#define STBRP_DEF static
-#else
-#define STBRP_DEF extern
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct stbrp_context stbrp_context;
-typedef struct stbrp_node    stbrp_node;
-typedef struct stbrp_rect    stbrp_rect;
-
-#ifdef STBRP_LARGE_RECTS
-typedef int            stbrp_coord;
-#else
-typedef unsigned short stbrp_coord;
-#endif
-
-STBRP_DEF void stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects);
-// Assign packed locations to rectangles. The rectangles are of type
-// 'stbrp_rect' defined below, stored in the array 'rects', and there
-// are 'num_rects' many of them.
-//
-// Rectangles which are successfully packed have the 'was_packed' flag
-// set to a non-zero value and 'x' and 'y' store the minimum location
-// on each axis (i.e. bottom-left in cartesian coordinates, top-left
-// if you imagine y increasing downwards). Rectangles which do not fit
-// have the 'was_packed' flag set to 0.
-//
-// You should not try to access the 'rects' array from another thread
-// while this function is running, as the function temporarily reorders
-// the array while it executes.
-//
-// To pack into another rectangle, you need to call stbrp_init_target
-// again. To continue packing into the same rectangle, you can call
-// this function again. Calling this multiple times with multiple rect
-// arrays will probably produce worse packing results than calling it
-// a single time with the full rectangle array, but the option is
-// available.
-
-struct stbrp_rect
-{
-   // reserved for your use:
-   int            id;
-
-   // input:
-   stbrp_coord    w, h;
-
-   // output:
-   stbrp_coord    x, y;
-   int            was_packed;  // non-zero if valid packing
-
-}; // 16 bytes, nominally
-
-
-STBRP_DEF void stbrp_init_target (stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes);
-// Initialize a rectangle packer to:
-//    pack a rectangle that is 'width' by 'height' in dimensions
-//    using temporary storage provided by the array 'nodes', which is 'num_nodes' long
-//
-// You must call this function every time you start packing into a new target.
-//
-// There is no "shutdown" function. The 'nodes' memory must stay valid for
-// the following stbrp_pack_rects() call (or calls), but can be freed after
-// the call (or calls) finish.
-//
-// Note: to guarantee best results, either:
-//       1. make sure 'num_nodes' >= 'width'
-//   or  2. call stbrp_allow_out_of_mem() defined below with 'allow_out_of_mem = 1'
-//
-// If you don't do either of the above things, widths will be quantized to multiples
-// of small integers to guarantee the algorithm doesn't run out of temporary storage.
-//
-// If you do #2, then the non-quantized algorithm will be used, but the algorithm
-// may run out of temporary storage and be unable to pack some rectangles.
-
-STBRP_DEF void stbrp_setup_allow_out_of_mem (stbrp_context *context, int allow_out_of_mem);
-// Optionally call this function after init but before doing any packing to
-// change the handling of the out-of-temp-memory scenario, described above.
-// If you call init again, this will be reset to the default (false).
-
-
-STBRP_DEF void stbrp_setup_heuristic (stbrp_context *context, int heuristic);
-// Optionally select which packing heuristic the library should use. Different
-// heuristics will produce better/worse results for different data sets.
-// If you call init again, this will be reset to the default.
-
-enum
-{
-   STBRP_HEURISTIC_Skyline_default=0,
-   STBRP_HEURISTIC_Skyline_BL_sortHeight = STBRP_HEURISTIC_Skyline_default,
-   STBRP_HEURISTIC_Skyline_BF_sortHeight,
-};
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// the details of the following structures don't matter to you, but they must
-// be visible so you can handle the memory allocations for them
-
-struct stbrp_node
-{
-   stbrp_coord  x,y;
-   stbrp_node  *next;
-};
-
-struct stbrp_context
-{
-   int width;
-   int height;
-   int align;
-   int init_mode;
-   int heuristic;
-   int num_nodes;
-   stbrp_node *active_head;
-   stbrp_node *free_head;
-   stbrp_node extra[2]; // we allocate two extra nodes so optimal user-node-count is 'width' not 'width+2'
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//     IMPLEMENTATION SECTION
-//
-
-#ifdef STB_RECT_PACK_IMPLEMENTATION
-#include <stdlib.h>
-
-#ifndef STBRP_ASSERT
-#include <assert.h>
-#define STBRP_ASSERT assert
-#endif
-
-enum
-{
-   STBRP__INIT_skyline = 1,
-};
-
-STBRP_DEF void stbrp_setup_heuristic(stbrp_context *context, int heuristic)
-{
-   switch (context->init_mode) {
-      case STBRP__INIT_skyline:
-         STBRP_ASSERT(heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight || heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight);
-         context->heuristic = heuristic;
-         break;
-      default:
-         STBRP_ASSERT(0);
-   }
-}
-
-STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_out_of_mem)
-{
-   if (allow_out_of_mem)
-      // if it's ok to run out of memory, then don't bother aligning them;
-      // this gives better packing, but may fail due to OOM (even though
-      // the rectangles easily fit). @TODO a smarter approach would be to only
-      // quantize once we've hit OOM, then we could get rid of this parameter.
-      context->align = 1;
-   else {
-      // if it's not ok to run out of memory, then quantize the widths
-      // so that num_nodes is always enough nodes.
-      //
-      // I.e. num_nodes * align >= width
-      //                  align >= width / num_nodes
-      //                  align = ceil(width/num_nodes)
-
-      context->align = (context->width + context->num_nodes-1) / context->num_nodes;
-   }
-}
-
-STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes)
-{
-   int i;
-#ifndef STBRP_LARGE_RECTS
-   STBRP_ASSERT(width <= 0xffff && height <= 0xffff);
-#endif
-
-   for (i=0; i < num_nodes-1; ++i)
-      nodes[i].next = &nodes[i+1];
-   nodes[i].next = NULL;
-   context->init_mode = STBRP__INIT_skyline;
-   context->heuristic = STBRP_HEURISTIC_Skyline_default;
-   context->free_head = &nodes[0];
-   context->active_head = &context->extra[0];
-   context->width = width;
-   context->height = height;
-   context->num_nodes = num_nodes;
-   stbrp_setup_allow_out_of_mem(context, 0);
-
-   // node 0 is the full width, node 1 is the sentinel (lets us not store width explicitly)
-   context->extra[0].x = 0;
-   context->extra[0].y = 0;
-   context->extra[0].next = &context->extra[1];
-   context->extra[1].x = (stbrp_coord) width;
-#ifdef STBRP_LARGE_RECTS
-   context->extra[1].y = (1<<30);
-#else
-   context->extra[1].y = 65535;
-#endif
-   context->extra[1].next = NULL;
-}
-
-// find minimum y position if it starts at x1
-static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0, int width, int *pwaste)
-{
-   stbrp_node *node = first;
-   int x1 = x0 + width;
-   int min_y, visited_width, waste_area;
-   STBRP_ASSERT(first->x <= x0);
-
-   #if 0
-   // skip in case we're past the node
-   while (node->next->x <= x0)
-      ++node;
-   #else
-   STBRP_ASSERT(node->next->x > x0); // we ended up handling this in the caller for efficiency
-   #endif
-
-   STBRP_ASSERT(node->x <= x0);
-
-   min_y = 0;
-   waste_area = 0;
-   visited_width = 0;
-   while (node->x < x1) {
-      if (node->y > min_y) {
-         // raise min_y higher.
-         // we've accounted for all waste up to min_y,
-         // but we'll now add more waste for everything we've visted
-         waste_area += visited_width * (node->y - min_y);
-         min_y = node->y;
-         // the first time through, visited_width might be reduced
-         if (node->x < x0)
-            visited_width += node->next->x - x0;
-         else
-            visited_width += node->next->x - node->x;
-      } else {
-         // add waste area
-         int under_width = node->next->x - node->x;
-         if (under_width + visited_width > width)
-            under_width = width - visited_width;
-         waste_area += under_width * (min_y - node->y);
-         visited_width += under_width;
-      }
-      node = node->next;
-   }
-
-   *pwaste = waste_area;
-   return min_y;
-}
-
-typedef struct
-{
-   int x,y;
-   stbrp_node **prev_link;
-} stbrp__findresult;
-
-static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int width, int height)
-{
-   int best_waste = (1<<30), best_x, best_y = (1 << 30);
-   stbrp__findresult fr;
-   stbrp_node **prev, *node, *tail, **best = NULL;
-
-   // align to multiple of c->align
-   width = (width + c->align - 1);
-   width -= width % c->align;
-   STBRP_ASSERT(width % c->align == 0);
-
-   node = c->active_head;
-   prev = &c->active_head;
-   while (node->x + width <= c->width) {
-      int y,waste;
-      y = stbrp__skyline_find_min_y(c, node, node->x, width, &waste);
-      if (c->heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight) { // actually just want to test BL
-         // bottom left
-         if (y < best_y) {
-            best_y = y;
-            best = prev;
-         }
-      } else {
-         // best-fit
-         if (y + height <= c->height) {
-            // can only use it if it first vertically
-            if (y < best_y || (y == best_y && waste < best_waste)) {
-               best_y = y;
-               best_waste = waste;
-               best = prev;
-            }
-         }
-      }
-      prev = &node->next;
-      node = node->next;
-   }
-
-   best_x = (best == NULL) ? 0 : (*best)->x;
-
-   // if doing best-fit (BF), we also have to try aligning right edge to each node position
-   //
-   // e.g, if fitting
-   //
-   //     ____________________
-   //    |____________________|
-   //
-   //            into
-   //
-   //   |                         |
-   //   |             ____________|
-   //   |____________|
-   //
-   // then right-aligned reduces waste, but bottom-left BL is always chooses left-aligned
-   //
-   // This makes BF take about 2x the time
-
-   if (c->heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight) {
-      tail = c->active_head;
-      node = c->active_head;
-      prev = &c->active_head;
-      // find first node that's admissible
-      while (tail->x < width)
-         tail = tail->next;
-      while (tail) {
-         int xpos = tail->x - width;
-         int y,waste;
-         STBRP_ASSERT(xpos >= 0);
-         // find the left position that matches this
-         while (node->next->x <= xpos) {
-            prev = &node->next;
-            node = node->next;
-         }
-         STBRP_ASSERT(node->next->x > xpos && node->x <= xpos);
-         y = stbrp__skyline_find_min_y(c, node, xpos, width, &waste);
-         if (y + height < c->height) {
-            if (y <= best_y) {
-               if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) {
-                  best_x = xpos;
-                  STBRP_ASSERT(y <= best_y);
-                  best_y = y;
-                  best_waste = waste;
-                  best = prev;
-               }
-            }
-         }
-         tail = tail->next;
-      }
-   }
-
-   fr.prev_link = best;
-   fr.x = best_x;
-   fr.y = best_y;
-   return fr;
-}
-
-static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, int width, int height)
-{
-   // find best position according to heuristic
-   stbrp__findresult res = stbrp__skyline_find_best_pos(context, width, height);
-   stbrp_node *node, *cur;
-
-   // bail if:
-   //    1. it failed
-   //    2. the best node doesn't fit (we don't always check this)
-   //    3. we're out of memory
-   if (res.prev_link == NULL || res.y + height > context->height || context->free_head == NULL) {
-      res.prev_link = NULL;
-      return res;
-   }
-
-   // on success, create new node
-   node = context->free_head;
-   node->x = (stbrp_coord) res.x;
-   node->y = (stbrp_coord) (res.y + height);
-
-   context->free_head = node->next;
-
-   // insert the new node into the right starting point, and
-   // let 'cur' point to the remaining nodes needing to be
-   // stiched back in
-
-   cur = *res.prev_link;
-   if (cur->x < res.x) {
-      // preserve the existing one, so start testing with the next one
-      stbrp_node *next = cur->next;
-      cur->next = node;
-      cur = next;
-   } else {
-      *res.prev_link = node;
-   }
-
-   // from here, traverse cur and free the nodes, until we get to one
-   // that shouldn't be freed
-   while (cur->next && cur->next->x <= res.x + width) {
-      stbrp_node *next = cur->next;
-      // move the current node to the free list
-      cur->next = context->free_head;
-      context->free_head = cur;
-      cur = next;
-   }
-
-   // stitch the list back in
-   node->next = cur;
-
-   if (cur->x < res.x + width)
-      cur->x = (stbrp_coord) (res.x + width);
-
-#ifdef _DEBUG
-   cur = context->active_head;
-   while (cur->x < context->width) {
-      STBRP_ASSERT(cur->x < cur->next->x);
-      cur = cur->next;
-   }
-   STBRP_ASSERT(cur->next == NULL);
-
-   {
-      stbrp_node *L1 = NULL, *L2 = NULL;
-      int count=0;
-      cur = context->active_head;
-      while (cur) {
-         L1 = cur;
-         cur = cur->next;
-         ++count;
-      }
-      cur = context->free_head;
-      while (cur) {
-         L2 = cur;
-         cur = cur->next;
-         ++count;
-      }
-      STBRP_ASSERT(count == context->num_nodes+2);
-   }
-#endif
-
-   return res;
-}
-
-static int rect_height_compare(const void *a, const void *b)
-{
-   stbrp_rect *p = (stbrp_rect *) a;
-   stbrp_rect *q = (stbrp_rect *) b;
-   if (p->h > q->h)
-      return -1;
-   if (p->h < q->h)
-      return  1;
-   return (p->w > q->w) ? -1 : (p->w < q->w);
-}
-
-static int rect_width_compare(const void *a, const void *b)
-{
-   stbrp_rect *p = (stbrp_rect *) a;
-   stbrp_rect *q = (stbrp_rect *) b;
-   if (p->w > q->w)
-      return -1;
-   if (p->w < q->w)
-      return  1;
-   return (p->h > q->h) ? -1 : (p->h < q->h);
-}
-
-static int rect_original_order(const void *a, const void *b)
-{
-   stbrp_rect *p = (stbrp_rect *) a;
-   stbrp_rect *q = (stbrp_rect *) b;
-   return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed);
-}
-
-#ifdef STBRP_LARGE_RECTS
-#define STBRP__MAXVAL  0xffffffff
-#else
-#define STBRP__MAXVAL  0xffff
-#endif
-
-STBRP_DEF void stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects)
-{
-   int i;
-
-   // we use the 'was_packed' field internally to allow sorting/unsorting
-   for (i=0; i < num_rects; ++i) {
-      rects[i].was_packed = i;
-      #ifndef STBRP_LARGE_RECTS
-      STBRP_ASSERT(rects[i].w <= 0xffff && rects[i].h <= 0xffff);
-      #endif
-   }
-
-   // sort according to heuristic
-   qsort(rects, num_rects, sizeof(rects[0]), rect_height_compare);
-
-   for (i=0; i < num_rects; ++i) {
-      stbrp__findresult fr = stbrp__skyline_pack_rectangle(context, rects[i].w, rects[i].h);
-      if (fr.prev_link) {
-         rects[i].x = (stbrp_coord) fr.x;
-         rects[i].y = (stbrp_coord) fr.y;
-      } else {
-         rects[i].x = rects[i].y = STBRP__MAXVAL;
-      }
-   }
-
-   // unsort
-   qsort(rects, num_rects, sizeof(rects[0]), rect_original_order);
-
-   // set was_packed flags
-   for (i=0; i < num_rects; ++i)
-      rects[i].was_packed = !(rects[i].x == STBRP__MAXVAL && rects[i].y == STBRP__MAXVAL);
-}
-#endif

src/loader/Loader.cpp

@@ -38,12 +38,8 @@ Loader::LoaderVersion Loader::checkFile(std::string f) {
 
 std::unique_ptr<Loader> Loader::createLoader(std::string f) {
     LoaderVersion v = checkFile(f);
-    switch (v) {
-        case TR_4:
-        case TR_5:
-        case TR_UNKNOWN:
-            return nullptr;
 
+    switch (v) {
         case TR_1:
             return std::unique_ptr<Loader>(new LoaderTR1());
 
@@ -53,6 +49,8 @@ std::unique_ptr<Loader> Loader::createLoader(std::string f) {
         case TR_3:
             return std::unique_ptr<Loader>(new LoaderTR3());
     }
+
+    return nullptr;
 }
 
 Loader::~Loader() { }

src/main.cpp

@@ -20,7 +20,6 @@
 #include "World.h"
 #include "commander/commander.h"
 #include "commands/Command.h"
-#include "system/Font.h"
 #include "system/Shader.h"
 #include "system/Sound.h"
 #include "system/Window.h"
@@ -130,7 +129,6 @@ int main(int argc, char* argv[]) {
 
     Menu::shutdown();
     UI::shutdown();
-    Font::shutdown();
     Sound::shutdown();
     Shader::shutdown();
     Window::shutdown();

src/system/CMakeLists.txt

@@ -1,8 +1,4 @@
 # Source files
-set (SYS_SRCS ${SYS_SRCS} "Font.cpp" "../../include/system/Font.h")
-set (SYS_SRCS ${SYS_SRCS} "FontImGui.cpp" "../../include/system/FontImGui.h")
-set (SYS_SRCS ${SYS_SRCS} "FontTRLE.cpp" "../../include/system/FontTRLE.h")
-set (SYS_SRCS ${SYS_SRCS} "FontTTF.cpp" "../../include/system/FontTTF.h")
 set (SYS_SRCS ${SYS_SRCS} "Shader.cpp" "../../include/system/Shader.h")
 set (SYS_SRCS ${SYS_SRCS} "Sound.cpp" "../../include/system/Sound.h")
 set (SYS_SRCS ${SYS_SRCS} "Window.cpp" "../../include/system/Window.h")

src/system/Font.cpp

@@ -1,127 +0,0 @@
-/*!
- * \file src/system/Font.cpp
- * \brief Font Interface
- *
- * \author xythobuz
- */
-
-#include <vector>
-
-#include "global.h"
-#include "Log.h"
-#include "utils/strings.h"
-#include "system/FontImGui.h"
-#include "system/FontTRLE.h"
-#include "system/FontTTF.h"
-#include "system/Shader.h"
-#include "system/Font.h"
-
-bool Font::isInit = false;
-std::string Font::fontName;
-bool Font::showFontBox = false;
-
-void Font::shutdown() {
-    FontTRLE::shutdown();
-    FontTTF::shutdown();
-}
-
-int Font::initialize(std::string font) {
-    fontName = font;
-    if (stringEndsWith(fontName, ".pc")) {
-        return FontTRLE::initialize(fontName);
-    } else if (stringEndsWith(fontName, ".ttf")) {
-        return FontTTF::initialize(fontName);
-    }
-
-    if (font != "") {
-        Log::get(LOG_ERROR) << "Unknown font file format: " << font << Log::endl;
-        return -1;
-    } else {
-        return 0;
-    }
-}
-
-unsigned int Font::widthText(float scale, std::string s) {
-    if (stringEndsWith(fontName, ".pc")) {
-        return FontTRLE::widthText(scale, s);
-    } else if (stringEndsWith(fontName, ".ttf")) {
-        return FontTTF::widthText(scale, s);
-    } else {
-        return FontImGui::widthText(scale, s);
-    }
-}
-
-unsigned int Font::heightText(float scale, unsigned int maxWidth, std::string s) {
-    if (stringEndsWith(fontName, ".pc")) {
-        return FontTRLE::heightText(scale, maxWidth, s);
-    } else if (stringEndsWith(fontName, ".ttf")) {
-        return FontTTF::heightText(scale, maxWidth, s);
-    } else {
-        return FontImGui::heightText(scale, maxWidth, s);
-    }
-}
-
-void Font::drawText(unsigned int x, unsigned int y, float scale,
-                    glm::vec4 color, std::string s) {
-    if (stringEndsWith(fontName, ".pc")) {
-        FontTRLE::drawText(x, y, scale, color, s);
-    } else if (stringEndsWith(fontName, ".ttf")) {
-        FontTTF::drawText(x, y, scale, color, s);
-    } else {
-        FontImGui::drawText(x, y, scale, color, s);
-    }
-
-    if (showFontBox) {
-        unsigned int w = widthText(scale, s);
-        unsigned int h = heightText(scale, w + 100, s); // Should always be one line
-        drawFontBox(x, y, w, h);
-    }
-}
-
-void Font::drawTextWrapped(unsigned int x, unsigned int y, float scale,
-                           glm::vec4 color, unsigned int maxWidth, std::string s) {
-    if (stringEndsWith(fontName, ".pc")) {
-        FontTRLE::drawTextWrapped(x, y, scale, color, maxWidth, s);
-    } else if (stringEndsWith(fontName, ".ttf")) {
-        FontTTF::drawTextWrapped(x, y, scale, color, maxWidth, s);
-    } else {
-        FontImGui::drawTextWrapped(x, y, scale, color, maxWidth, s);
-    }
-
-    if (showFontBox) {
-        unsigned int w = widthText(scale, s);
-        if (w > maxWidth)
-            w = maxWidth;
-        unsigned int h = heightText(scale, w, s); // Should always be one line
-        drawFontBox(x, y, w, h);
-    }
-}
-
-void Font::drawTextCentered(unsigned int x, unsigned int y, float scale,
-                            glm::vec4 color, unsigned int width, std::string s) {
-    drawText(x + ((width / 2) - (widthText(scale, s) / 2)), y, scale, color, s);
-}
-
-void Font::drawFontBox(unsigned int x, unsigned int y, unsigned int w, unsigned int h) {
-    static ShaderBuffer vert, uv;
-    std::vector<glm::vec2> vertices, uvs;
-
-    vertices.emplace_back(x, y);
-    vertices.emplace_back(x + w, y);
-    vertices.emplace_back(x + w, y + h);
-    vertices.emplace_back(x, y + h);
-    vertices.emplace_back(x, y);
-
-    uvs.emplace_back(0.0f, 0.0f);
-    uvs.emplace_back(1.0f, 0.0f);
-    uvs.emplace_back(1.0f, 1.0f);
-    uvs.emplace_back(0.0f, 1.0f);
-    uvs.emplace_back(0.0f, 0.0f);
-
-    vert.bufferData(vertices);
-    uv.bufferData(uvs);
-
-    Shader::drawGL(vert, uv, glm::vec4(1.0f, 1.0f, 0.0f, 1.0f), TEXTURE_WHITE,
-                   TextureStorage::SYSTEM, gl::GL_LINE_STRIP);
-}
-

src/system/FontImGui.cpp

@@ -1,66 +0,0 @@
-/*!
- * \file src/system/FontImGui.cpp
- * \brief Default Font Implementation
- *
- * \author xythobuz
- */
-
-#include "imgui/imgui.h"
-
-#include "global.h"
-#include "UI.h"
-#include "system/FontImGui.h"
-
-#define SCALE_CALC 30.0f
-#define SCALE_DRAW SCALE_CALC
-
-unsigned int FontImGui::widthText(float scale, std::string s) {
-    ImGuiIO& io = ImGui::GetIO();
-    ImFont* font = io.Fonts->Fonts.at(0);
-    ImVec2 size = font->CalcTextSizeA(scale * SCALE_CALC, FLT_MAX, io.DisplaySize.y, s.c_str(),
-                                      s.c_str() + s.length());
-    return size.x;
-}
-
-void FontImGui::drawText(unsigned int x, unsigned int y, float scale,
-                         glm::vec4 color, std::string s) {
-    ImGuiIO& io = ImGui::GetIO();
-    ImFont* font = io.Fonts->Fonts.at(0);
-    ImVec2 pos = ImVec2(x, y);
-    ImU32 col = (ImU32(color.r * 255)) | (ImU32(color.g * 255) << 8) | (ImU32(color.b * 255) << 16) |
-                (ImU32(color.a * 255) << 24);
-
-    ImDrawList dl;
-    dl.PushTextureID(font->ContainerAtlas->TexID);
-    dl.PushClipRect(ImVec4(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y));
-    dl.AddText(font, scale * SCALE_DRAW, pos, col, s.c_str(), s.c_str() + s.length());
-
-    ImDrawList* dlp = &dl;
-    UI::renderImGui(&dlp, 1);
-}
-
-unsigned int FontImGui::heightText(float scale, unsigned int maxWidth, std::string s) {
-    ImGuiIO& io = ImGui::GetIO();
-    ImFont* font = io.Fonts->Fonts.at(0);
-    ImVec2 size = font->CalcTextSizeA(scale * SCALE_CALC, FLT_MAX, maxWidth, s.c_str(),
-                                      s.c_str() + s.length());
-    return size.y;
-}
-
-void FontImGui::drawTextWrapped(unsigned int x, unsigned int y, float scale,
-                                glm::vec4 color, unsigned int maxWidth, std::string s) {
-    ImGuiIO& io = ImGui::GetIO();
-    ImFont* font = io.Fonts->Fonts.at(0);
-    ImVec2 pos = ImVec2(x, y);
-    ImU32 col = (ImU32(color.r * 255)) | (ImU32(color.g * 255) << 8) | (ImU32(color.b * 255) << 16) |
-                (ImU32(color.a * 255) << 24);
-
-    ImDrawList dl;
-    dl.PushTextureID(font->ContainerAtlas->TexID);
-    dl.PushClipRect(ImVec4(0.0f, 0.0f, io.DisplaySize.x, io.DisplaySize.y));
-    dl.AddText(font, scale * SCALE_DRAW, pos, col, s.c_str(), s.c_str() + s.length(), maxWidth);
-
-    ImDrawList* dlp = &dl;
-    UI::renderImGui(&dlp, 1);
-}
-

src/system/FontTRLE.cpp

@@ -1,358 +0,0 @@
-/*!
- * \file src/system/FontTRLE.cpp
- * \brief Tomb Raider Level Editor Font loader
- *
- * \author xythobuz
- */
-
-#include <fstream>
-#include <sstream>
-
-#include "global.h"
-#include "TextureManager.h"
-#include "utils/strings.h"
-#include "system/Shader.h"
-#include "system/FontTRLE.h"
-
-#define SCALING 2.0f
-
-bool FontTRLE::mFontInit = false;
-unsigned int FontTRLE::mFontTexture = 0;
-int FontTRLE::offsets[106][5];
-ShaderBuffer FontTRLE::vertexBuffer;
-ShaderBuffer FontTRLE::uvBuffer;
-
-void FontTRLE::shutdown() {
-}
-
-int FontTRLE::initialize(std::string font) {
-    orAssert(stringEndsWith(font, ".pc") == true);
-
-    shutdown();
-
-    // Load .pc file...
-    std::ifstream file(font, std::ios::in | std::ios::binary);
-    unsigned char* pixels = new unsigned char[256 * 256 * 4];
-    if (!file.read((char*)pixels, 256 * 256 * 4)) {
-        delete [] pixels;
-        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;
-    }
-
-    mFontTexture = TextureManager::loadBufferSlot(pixels, 256, 256,
-                   ColorMode::BGRA, 32,
-                   TextureStorage::SYSTEM);
-    delete [] pixels;
-
-    // Try to load .lps file or use default glyph positions
-    std::string lpsFile = findAndReplace(font, ".pc", ".lps");
-    loadLPS(lpsFile);
-
-    mFontInit = true;
-    return 0;
-}
-
-void FontTRLE::loadLPS(std::string f) {
-    std::ifstream file(f);
-    if (!file) {
-        std::copy(&defaultOffsets[0][0], &defaultOffsets[0][0] + (106 * 5), &offsets[0][0]);
-        return;
-    }
-
-    for (std::string line; std::getline(file, line);) {
-        std::istringstream stream(line);
-        int index;
-        stream >> index;
-        if (stream.get() != '=')
-            continue;
-        stream >> offsets[index][0];
-        if (stream.get() != ',')
-            continue;
-        stream >> offsets[index][1];
-        if (stream.get() != ',')
-            continue;
-        stream >> offsets[index][2];
-        if (stream.get() != ',')
-            continue;
-        stream >> offsets[index][3];
-        if (stream.get() != ',')
-            continue;
-        stream >> offsets[index][4];
-    }
-}
-
-void FontTRLE::writeChar(unsigned int index, unsigned int xDraw, unsigned int yDraw, float scale,
-                         std::vector<glm::vec2>& vertices, std::vector<glm::vec2>& uvs) {
-    orAssert(mFontInit == true);
-
-    float width = ((float)offsets[index][2]) * scale * SCALING;
-    float height = ((float)offsets[index][3]) * scale * SCALING;
-    float offset = ((float)offsets[index][4]) * scale * SCALING;
-
-    // screen coordinates
-    float xMin = xDraw;
-    float yMin = yDraw + offset + (10.0f * scale * SCALING);
-    float xMax = xMin + width;
-    float yMax = yMin + height;
-
-    // texture part
-    float txMin = ((float)offsets[index][0]) / 256.0f;
-    float txMax = ((float)(offsets[index][0] + offsets[index][2])) / 256.0f;
-    float tyMin = ((float)offsets[index][1]) / 256.0f;
-    float tyMax = ((float)(offsets[index][1] + offsets[index][3])) / 256.0f;
-
-    vertices.push_back(glm::vec2(xMin, yMax));
-    vertices.push_back(glm::vec2(xMin, yMin));
-    vertices.push_back(glm::vec2(xMax, yMax));
-
-    vertices.push_back(glm::vec2(xMax, yMin));
-    vertices.push_back(glm::vec2(xMax, yMax));
-    vertices.push_back(glm::vec2(xMin, yMin));
-
-    uvs.push_back(glm::vec2(txMin, tyMax));
-    uvs.push_back(glm::vec2(txMin, tyMin));
-    uvs.push_back(glm::vec2(txMax, tyMax));
-
-    uvs.push_back(glm::vec2(txMax, tyMin));
-    uvs.push_back(glm::vec2(txMax, tyMax));
-    uvs.push_back(glm::vec2(txMin, tyMin));
-}
-
-unsigned int FontTRLE::widthText(float scale, std::string s) {
-    orAssert(mFontInit == true);
-    orAssert(s.length() > 0);
-
-    unsigned int width = 0;
-    for (unsigned int i = 0; i < s.length(); i++) {
-        // index into offset table
-        int index = s[i] - '!';
-
-        if (index == -1) // space
-            width += (unsigned int)(14.0f * scale * SCALING);
-
-        if ((index < 0) || (index > 105))
-            continue; // skip unprintable chars
-
-        width += (float)(offsets[index][2] + 1) * scale * SCALING; // glyph width
-    }
-
-    return width;
-}
-
-void FontTRLE::drawText(unsigned int x, unsigned int y, float scale,
-                        glm::vec4 color, std::string s) {
-    orAssert(mFontInit == true);
-    orAssert(s.length() > 0);
-
-    std::vector<glm::vec2> vertices;
-    std::vector<glm::vec2> uvs;
-    for (unsigned int i = 0; i < s.length(); i++) {
-        // index into offset table
-        int index = s[i] - '!';
-
-        if (index == -1) // space
-            x += (unsigned int)(14.0f * scale * SCALING);
-
-        if ((index < 0) || (index > 105))
-            continue; // skip unprintable chars
-
-        writeChar((unsigned int)index, x, y, scale, vertices, uvs);
-        x += (int)((float)(offsets[index][2] + 1) * scale * SCALING); // width
-    }
-
-    vertexBuffer.bufferData(vertices);
-    uvBuffer.bufferData(uvs);
-    Shader::drawGL(vertexBuffer, uvBuffer, color, mFontTexture);
-}
-
-unsigned int FontTRLE::heightText(float scale, unsigned int maxWidth, std::string s) {
-    orAssert(mFontInit == true);
-    orAssert(s.length() > 0);
-
-    unsigned int x = 0;
-    unsigned int yMax = 0;
-    unsigned int yReturn = 0;
-
-    for (unsigned int i = 0; i < s.length(); i++) {
-        // index into offset table
-        int index = s[i] - '!';
-
-        if (index == -1) // space
-            x += (unsigned int)(14.0f * scale * SCALING);
-
-        if ((index < 0) || (index > 105))
-            continue; // skip unprintable chars
-
-        if (yMax < (unsigned int)(((float)offsets[index][3]) * scale * SCALING))
-            yMax = (unsigned int)(((float)offsets[index][3]) * scale * SCALING);
-
-        x += (int)((float)(offsets[index][2] + 1) * scale * SCALING); // width
-        if (x > maxWidth) {
-            // go to the next line
-            yReturn += yMax + 2;
-            yMax = 0;
-            x = (int)((float)(offsets[index][2] + 1) * scale * SCALING);
-        }
-    }
-
-    return yReturn + yMax + 2;
-}
-
-void FontTRLE::drawTextWrapped(unsigned int x, unsigned int y, float scale,
-                               glm::vec4 color, unsigned int maxWidth, std::string s) {
-    orAssert(mFontInit == true);
-    orAssert(s.length() > 0);
-
-    unsigned int xStart = x;
-    unsigned int yMax = 0;
-
-    std::vector<glm::vec2> vertices;
-    std::vector<glm::vec2> uvs;
-    for (unsigned int i = 0; i < s.length(); i++) {
-        // index into offset table
-        int index = s[i] - '!';
-
-        if (index == -1) // space
-            x += (unsigned int)(14.0f * scale * SCALING);
-
-        if ((index < 0) || (index > 105))
-            continue; // skip unprintable chars
-
-        if (yMax < (unsigned int)(((float)offsets[index][3]) * scale * SCALING))
-            yMax = (unsigned int)(((float)offsets[index][3]) * scale * SCALING);
-
-        x += (int)((float)(offsets[index][2] + 1) * scale * SCALING); // width
-        if ((x - xStart) > maxWidth) {
-            // go to the next line
-            y += yMax + 2;
-            yMax = 0;
-            x = xStart;
-        } else {
-            x -= (int)((float)(offsets[index][2] + 1) * scale * SCALING);
-        }
-
-        writeChar((unsigned int)index, x, y, scale, vertices, uvs);
-        x += (int)((float)(offsets[index][2] + 1) * scale * SCALING); // width
-    }
-
-    vertexBuffer.bufferData(vertices);
-    uvBuffer.bufferData(uvs);
-    Shader::drawGL(vertexBuffer, uvBuffer, color, mFontTexture);
-}
-
-int FontTRLE::defaultOffsets[106][5] = {
-    { 174,  52,   3,  12, -11 },
-    {  98,  58,   6,   4, -10 },
-    {  82,  26,  13,  11, -10 },
-    {  78,  38,   9,  13, -10 },
-    { 214,  13,  14,  11, -9  },
-    {  40,  26,  13,  11, -10 },
-    { 157,  57,   5,   6, -11 },
-    { 204,  39,   5,  15, -12 },
-    {  34,  40,   5,  15, -12 },
-    { 184,  59,   4,   4, -11 },
-    {  22,  40,  10,  10, -9  },
-    { 178,  59,   4,   4, -2  },
-    { 106,  60,   7,   2, -4  },
-    { 114,  60,   4,   3, -2  },
-    { 212,  38,   8,  14, -12 },
-    {  88,  49,   9,   9, -8  },
-    { 200,  55,   5,   9, -8  },
-    {  46,  52,   8,   9, -8  },
-    {  88,  38,   7,  10, -8  },
-    {  62,  40,  10,  10, -8  },
-    { 142,  48,   8,  11, -9  },
-    { 232,  50,   8,  10, -9  },
-    { 120,  47,   8,  11, -9  },
-    {  22,  51,   8,  10, -9  },
-    { 110,  49,   8,  10, -8  },
-    { 152,  57,   4,   7, -7  },
-    { 136,  57,   4,   9, -7  },
-    { 178,  40,  11,   9, -8  },
-    { 210,  53,  10,   6, -7  },
-    { 240,  40,  11,   9, -7  },
-    {  12,  39,   9,  12, -11 },
-    {  66,  13,  15,  13, -10 },
-    { 130,  13,  13,  12, -11 },
-    { 214,  25,  12,  12, -11 },
-    { 132,  35,  10,  12, -11 },
-    {   0,  26,  12,  12, -11 },
-    {  14,  26,  12,  12, -11 },
-    {  66,  27,  11,  12, -11 },
-    { 182,  27,  11,  12, -11 },
-    { 200,  13,  13,  12, -11 },
-    { 222,  54,   4,  12, -11 },
-    {  56,  52,   4,  15, -11 },
-    { 230,  15,  12,  12, -11 },
-    { 144,  35,  10,  12, -11 },
-    {  48,  13,  17,  12, -11 },
-    { 144,  13,  13,  12, -11 },
-    {  54,  26,  11,  12, -11 },
-    { 200,  26,  11,  12, -11 },
-    { 240,   0,  13,  14, -11 },
-    { 158,  13,  13,  12, -11 },
-    { 156,  35,  10,  12, -11 },
-    { 172,  13,  13,  12, -11 },
-    {  98,  13,  14,  12, -11 },
-    {  82,  13,  14,  12, -11 },
-    {  24,  13,  22,  12, -11 },
-    { 186,  13,  12,  13, -11 },
-    { 114,  13,  14,  12, -11 },
-    { 228,  28,  11,  12, -11 },
-    {  62,  60,   5,   3, -4  },
-    { 248,  59,   5,   3, -4  },
-    {  88,  59,   7,   3, -4  },
-    { 142,  60,   6,   2, -3  },
-    { 120,  59,   7,   3, -4  },
-    { 242,  59,   4,   4, -11 },
-    {  98,  49,  10,   8, -7  },
-    {  96,  35,  10,  13, -12 },
-    {  72,  52,   8,   8, -7  },
-    {   0,  39,  10,  11, -10 },
-    { 164,  52,   8,   8, -7  },
-    { 168,  38,   9,  13, -12 },
-    { 120,  35,  11,  11, -7  },
-    { 108,  35,  10,  13, -12 },
-    { 194,  27,   5,  11, -10 },
-    {  40,  51,   5,  15, -10 },
-    {  28,  26,  11,  13, -12 },
-    {  82,  52,   5,  12, -11 },
-    {  96,  26,  17,   8, -7  },
-    { 152,  48,  11,   8, -7  },
-    {  62,  51,   9,   8, -7  },
-    { 244,  15,  10,  12, -7  },
-    {  52,  39,   9,  12, -7  },
-    {  10,  52,   9,   8, -7  },
-    { 190,  52,   8,   8, -7  },
-    {   0,  51,   8,  10, -9  },
-    { 178,  50,  10,   8, -7  },
-    { 130,  48,  11,   8, -7  },
-    { 132,  26,  17,   8, -7  },
-    { 242,  50,  10,   8, -7  },
-    {  40,  38,  10,  12, -7  },
-    { 232,  41,   7,   8, -7  },
-    { 222,  41,   8,  12, -7  },
-    { 130,  57,   5,   8, -7  },
-    { 194,  39,   9,  12, -10 },
-    {  32,  56,   4,  11, -10 },
-    {   1,  14,  22,  11, -10 },
-    { 192,   0,  23,  13, -10 },
-    { 168,   0,  23,  12, -10 },
-    { 216,   0,  23,  12, -10 },
-    { 150,  26,  17,   8, -8  },
-    { 168,  26,  11,  11, -9  },
-    { 114,  26,  17,   8, -8  },
-    { 240,  28,  12,  11, -9  },
-    {   0,   0,  40,  12, -10 },
-    {  84,   0,  39,  11, -10 },
-    {  42,   0,  39,  11, -10 },
-    { 126,   0,  39,  11, -10 },
-};
-

src/system/FontTTF.cpp

@@ -1,279 +0,0 @@
-/*!
- * \file src/system/FontTTF.cpp
- * \brief TrueType Font Implementation
- *
- * \author xythobuz
- */
-
-#include <fstream>
-
-#include "global.h"
-#include "Log.h"
-#include "TextureManager.h"
-#include "utils/pixel.h"
-#include "system/FontTTF.h"
-
-#define MAP_WIDTH 512
-#define MAP_HEIGHT 512
-#define FONT_SIZE 33
-#define MAP_NUM_CHARS 100
-
-FontMapTTF::FontMapTTF() : begin(-1), texture(-1), charInfo(nullptr) { }
-
-FontMapTTF::FontMapTTF(FontMapTTF&& other) {
-    begin = other.begin;
-    texture = other.texture;
-    other.begin = other.texture = -1;
-    charInfo = other.charInfo;
-    other.charInfo = nullptr;
-}
-
-FontMapTTF::~FontMapTTF() {
-    if (charInfo != nullptr) {
-        delete [] charInfo;
-    }
-
-    if (texture > -1) {
-        //! \fixme Free the TextureManager buffer slot
-    }
-}
-
-int FontMapTTF::initialize(unsigned char* fontData, int firstChar) {
-    stbtt_pack_context context;
-    unsigned char* pixels = new unsigned char[MAP_WIDTH * MAP_HEIGHT];
-    if (!stbtt_PackBegin(&context, pixels, MAP_WIDTH, MAP_HEIGHT, 0, 1, nullptr)) {
-        delete [] pixels;
-        Log::get(LOG_ERROR) << "Error initializing font map in stbtt_PackBegin!" << Log::endl;
-        return -1;
-    }
-
-    stbtt_PackSetOversampling(&context, 2, 2);
-
-    if (charInfo != nullptr)
-        delete [] charInfo;
-
-    charInfo = new stbtt_packedchar[MAP_NUM_CHARS];
-    if (!stbtt_PackFontRange(&context, fontData, 0, FONT_SIZE, firstChar, MAP_NUM_CHARS, charInfo)) {
-        stbtt_PackEnd(&context);
-        delete [] pixels;
-        delete [] charInfo;
-        charInfo = nullptr;
-        Log::get(LOG_ERROR) << "Error packing font map!" << Log::endl;
-        return -2;
-    }
-
-    stbtt_PackEnd(&context);
-    unsigned char* rgb = grayscale2rgba(pixels, MAP_WIDTH, MAP_HEIGHT);
-    delete [] pixels;
-
-    texture = TextureManager::loadBufferSlot(rgb, MAP_WIDTH, MAP_HEIGHT, ColorMode::RGBA,
-              32, TextureStorage::SYSTEM, texture);
-    delete [] rgb;
-    if (texture < 0) {
-        delete [] charInfo;
-        charInfo = nullptr;
-        Log::get(LOG_ERROR) << "Error loading new font map texture!" << Log::endl;
-        return -3;
-    }
-
-    begin = firstChar;
-    return 0;
-}
-
-bool FontMapTTF::contains(int c) {
-    orAssert(begin >= 0);
-    return (begin >= 0) && (c >= begin) && (c < (begin + MAP_NUM_CHARS));
-}
-
-void FontMapTTF::getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad* quad) {
-    orAssert(contains(c));
-    stbtt_GetPackedQuad(charInfo, MAP_WIDTH, MAP_HEIGHT, c - begin, xpos, ypos, quad, 0);
-}
-
-// ----------------------------------------------------------------------------
-
-unsigned char* FontTTF::fontData = nullptr;
-std::vector<FontMapTTF> FontTTF::maps;
-ShaderBuffer FontTTF::vertexBuffer;
-ShaderBuffer FontTTF::uvBuffer;
-
-int FontTTF::initialize(std::string f) {
-    orAssert(f.length() > 0);
-
-    std::ifstream file(f, std::ios::binary);
-    if (!file) {
-        Log::get(LOG_ERROR) << "Couldn't open file \"" << f << "\"!" << Log::endl;
-        return -1;
-    }
-
-    file.seekg(0, std::ios::end);
-    auto size = file.tellg();
-    orAssert(size > 0);
-    file.seekg(0);
-
-    maps.clear();
-    if (fontData != nullptr) {
-        delete [] fontData;
-        fontData = nullptr;
-    }
-
-    fontData = new unsigned char[size];
-    if (!file.read(reinterpret_cast<char*>(fontData), size)) {
-        Log::get(LOG_ERROR) << "Couldn't read data in \"" << f << "\"" << Log::endl;
-        delete [] fontData;
-        fontData = nullptr;
-        return -2;
-    }
-
-    maps.emplace_back();
-    if (maps.at(0).initialize(fontData, ' ') < 0) {
-        delete [] fontData;
-        fontData = nullptr;
-        return -3;
-    }
-
-    return 0;
-}
-
-void FontTTF::shutdown() {
-    if (fontData != nullptr) {
-        delete [] fontData;
-        fontData = nullptr;
-    }
-
-    maps.clear();
-}
-
-unsigned int FontTTF::widthText(float scale, std::string s) {
-    float x = 0.0f, y = 0.0f;
-    stbtt_aligned_quad q;
-    for (int i = 0; i < s.length(); i++) {
-        if ((s[i] < 0x20) || (s[i] == 0x7F)) {
-            continue;
-        }
-
-        getQuad(s[i], &x, &y, &q);
-    }
-    return x * scale;
-}
-
-void FontTTF::drawText(unsigned int x, unsigned int y, float scale,
-                       glm::vec4 color, std::string s) {
-    drawTextInternal(x, y, scale, color, 0, s, false);
-}
-
-unsigned int FontTTF::heightText(float scale, unsigned int maxWidth, std::string s) {
-    float x = 0.0f, y = FONT_SIZE;
-    stbtt_aligned_quad q;
-    for (int i = 0; i < s.length(); i++) {
-        if ((s[i] < 0x20) || (s[i] == 0x7F)) {
-            continue;
-        }
-
-        getQuad(s[i], &x, &y, &q);
-        if (x > maxWidth) {
-            x = 0.0f;
-            y += FONT_SIZE;
-        }
-    }
-    return y * scale;
-}
-
-void FontTTF::drawTextWrapped(unsigned int x, unsigned int y, float scale,
-                              glm::vec4 color, unsigned int maxWidth, std::string s) {
-    drawTextInternal(x, y, scale, color, maxWidth, s, true);
-}
-
-void FontTTF::drawTextInternal(unsigned int x, unsigned int y, float scale,
-                               glm::vec4 color, unsigned int maxWidth, std::string s,
-                               bool drawWrapped) {
-    std::vector<glm::vec2> vertices;
-    std::vector<glm::vec2> uvs;
-    int texture = -1;
-    float xpos = x, ypos = y + (FONT_SIZE * scale);
-    for (int i = 0; i < s.length(); i++) {
-        if ((s[i] < 0x20) || (s[i] == 0x7F)) {
-            continue;
-        }
-
-        stbtt_aligned_quad quad;
-        int tex = getQuad(s[i], &xpos, &ypos, &quad);
-
-        if (drawWrapped && (xpos > (x + maxWidth))) {
-            xpos = x;
-            ypos += FONT_SIZE * scale;
-            if (s[i] != ' ')
-                i--;
-            continue;
-        }
-
-        if ((texture != tex) && (texture != -1)) {
-            vertexBuffer.bufferData(vertices);
-            uvBuffer.bufferData(uvs);
-            Shader::drawGL(vertexBuffer, uvBuffer, color, texture);
-            vertices.clear();
-            uvs.clear();
-        }
-
-        texture = tex;
-
-        float xmin = quad.x0;
-        float xmax = quad.x0 + ((quad.x1 - quad.x0) * scale);
-        float ymin = quad.y1;
-        float ymax = quad.y1 + ((quad.y0 - quad.y1) * scale);
-
-        vertices.emplace_back(xmin, ymin);
-        vertices.emplace_back(xmin, ymax);
-        vertices.emplace_back(xmax, ymax);
-        vertices.emplace_back(xmax, ymin);
-        vertices.emplace_back(xmin, ymin);
-        vertices.emplace_back(xmax, ymax);
-
-        uvs.emplace_back(quad.s0, quad.t1);
-        uvs.emplace_back(quad.s0, quad.t0);
-        uvs.emplace_back(quad.s1, quad.t0);
-        uvs.emplace_back(quad.s1, quad.t1);
-        uvs.emplace_back(quad.s0, quad.t1);
-        uvs.emplace_back(quad.s1, quad.t0);
-    }
-
-    vertexBuffer.bufferData(vertices);
-    uvBuffer.bufferData(uvs);
-    Shader::drawGL(vertexBuffer, uvBuffer, color, texture);
-}
-
-int FontTTF::charIsMapped(int c) {
-    for (int i = 0; i < maps.size(); i++) {
-        if (maps.at(i).contains(c)) {
-            return i;
-        }
-    }
-
-    int begin = c;
-    if (c >= (MAP_NUM_CHARS / 2))
-        begin -= (MAP_NUM_CHARS / 2);
-
-    Log::get(LOG_INFO) << "Unmapped character '" << char(c) << "', new map from " << begin << " to "
-                       << begin + MAP_NUM_CHARS - 1 << "..." << Log::endl;
-
-    int p = maps.size();
-    maps.emplace_back();
-    if (maps.at(p).initialize(fontData, begin) < 0) {
-        return -1;
-    }
-
-    return p;
-}
-
-int FontTTF::getQuad(int c, float* xpos, float* ypos, stbtt_aligned_quad* quad) {
-    if (c < 0) {
-        //! \fixme This has nothing to do with proper UTF8 support...
-        c += 128;
-    }
-
-    int map = charIsMapped(c);
-    orAssert(map >= 0);
-    maps.at(map).getQuad(c, xpos, ypos, quad);
-    return maps.at(map).getTexture();
-}
-