text size can now be entered in the filepath with a comma separator, like this "filepath,16"

This commit is contained in:
viktorljung
2016-01-18 17:17:12 +01:00
parent 7faed50507
commit 92553f1e93
5 changed files with 118 additions and 70 deletions
+7
View File
@@ -3,6 +3,9 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include <boost/tokenizer.hpp>
#include <boost/lexical_cast.hpp>
#include "../OpenGL.h"
#include "../GLM.h"
@@ -21,6 +24,10 @@ public:
glm::ivec2 Bearing; // Offset from baseline to left/top of glyph
GLuint Advance; // Offset to advance to next glyph
};
FT_Face Face;
~Font();
std::map<GLchar, Character> m_Characters;
+1
View File
@@ -3,6 +3,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include "../OpenGL.h"
#include "../GLM.h"