LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #165 and part of #129

Browse Source
This commit is contained in:
vrld
2011-01-07 14:42:51 +01:00
parent e3067ff33d
commit 3587cd4320
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+5 -4
View File
@@ -32,7 +32,7 @@ namespace opengl
{ {
Font::Font(love::font::FontData * data, const Image::Filter& filter) Font::Font(love::font::FontData * data, const Image::Filter& filter)
: height(data->getHeight()), lineHeight(1.25), mSpacing(1) : height(data->getHeight()), lineHeight(1), mSpacing(1)
{ {
glyphs = new Glyph*[MAX_CHARS]; glyphs = new Glyph*[MAX_CHARS];
type = FONT_UNKNOWN; type = FONT_UNKNOWN;
@@ -62,7 +62,7 @@ namespace opengl
float Font::getHeight() const float Font::getHeight() const
{ {
return height / lineHeight; return height;
} }
void Font::print(std::string text, float x, float y, float angle, float sx, float sy) const void Font::print(std::string text, float x, float y, float angle, float sx, float sy) const
@@ -76,13 +76,14 @@ namespace opengl
for (unsigned int i = 0; i < text.size(); i++) { for (unsigned int i = 0; i < text.size(); i++) {
unsigned char g = (unsigned char)text[i]; unsigned char g = (unsigned char)text[i];
if (g == '\n') { // wrap newline, but do not print it if (g == '\n') { // wrap newline, but do not print it
glTranslatef(-dx, floor(getHeight() + 0.5f), 0); glTranslatef(-dx, floor(getHeight() * getLineHeight() + 0.5f), 0);
dx = 0.0f; dx = 0.0f;
continue; continue;
} }
if (!glyphs[g]) g = 32; // space if (!glyphs[g]) g = 32; // space
glPushMatrix(); glPushMatrix();
if (type == FONT_TRUETYPE) glTranslatef(0, floor(getHeight() + 0.5f), 0); // 1.25 is magic line height for true type fonts
if (type == FONT_TRUETYPE) glTranslatef(0, floor(getHeight() / 1.25f + 0.5f), 0);
glyphs[g]->draw(0, 0, 0, 1, 1, 0, 0); glyphs[g]->draw(0, 0, 0, 1, 1, 0, 0);
glPopMatrix(); glPopMatrix();
glTranslatef(spacing[g], 0, 0); glTranslatef(spacing[g], 0, 0);