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

fonts now work (seemingly) as well as they used to

Browse Source
This commit is contained in:
Bill Meltsner
2010-04-15 14:04:16 -04:00
parent f8f812a719
commit de6c8fd704
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+19 -16
View File
@@ -31,7 +31,7 @@ namespace opengl
{
Font::Font(love::font::FontData * data)
: height(data->getHeight()), lineHeight(1.25)
: height(data->getHeight()), lineHeight(1.25), mSpacing(1)
{
glyphs = new Glyph*[MAX_CHARS];
for(unsigned int i = 0; i < MAX_CHARS; i++)
@@ -52,7 +52,7 @@ namespace opengl
float Font::getHeight() const
{
return height;
return height / lineHeight;
}
void Font::print(std::string text, float x, float y) const
@@ -64,45 +64,48 @@ namespace opengl
{
glPushMatrix();
glTranslatef(ceil(x), ceil(y+getHeight()), 0.0f);
glTranslatef(ceil(x), ceil(y), 0.0f);
glRotatef(LOVE_TODEG(angle), 0, 0, 1.0f);
glScalef(sx, sy, 1.0f);
int s = 0;
int first = (int)text[0];
int s = -bearingX[first];
int by = bearingY[first];
for (unsigned int i = 0; i < text.size(); i++) {
int g = (int)text[i];
glyphs[g]->draw(bearingX[g] + s, -bearingY[g], 0, 1, 1, 0, 0);
s += spacing[g];
if (!glyphs[g]) g = 32; // space
glyphs[g]->draw(bearingX[g] + s, -bearingY[g]+by, 0, 1, 1, 0, 0);
s += spacing[g] * mSpacing;
}
glPopMatrix();
}
void Font::print(char character, float x, float y) const
{
glyphs[character]->draw(x, y+getHeight(), 0, 1, 1, 0, 0);
if (!glyphs[character]) character = ' ';
glyphs[character]->draw(x, y+height, 0, 1, 1, 0, 0);
}
float Font::getWidth(const std::string & line) const
int Font::getWidth(const std::string & line) const
{
if(line.size() == 0) return 0;
float temp = 0;
int temp = 0;
for(unsigned int i = 0; i < line.size() - 1; i++)
for(unsigned int i = 0; i < line.size(); i++)
{
temp += widths[(int)line[i]] + (spacing[(int)line[i]] * mSpacing);
temp += (spacing[(int)line[i]] * mSpacing);
}
temp += widths[(int)line[line.size() - 1]]; // the last character's spacing isn't counted
return temp;
}
float Font::getWidth(const char * line) const
int Font::getWidth(const char * line) const
{
return this->getWidth(std::string(line));
}
float Font::getWidth(const char character) const
int Font::getWidth(const char character) const
{
return (float)widths[(int)character];
return widths[(int)character];
}
void Font::setLineHeight(float height)
src/modules/graphics/opengl/Font.h
+3 -3
View File
@@ -102,15 +102,15 @@ namespace opengl
*
* @param line A line of text.
**/
float getWidth(const std::string & line) const;
float getWidth(const char * line) const;
int getWidth(const std::string & line) const;
int getWidth(const char * line) const;
/**
* Returns the width of the passed character.
*
* @param character A character.
**/
float getWidth(const char character) const;
int getWidth(const char character) const;
/**
* Sets the line height (which should be a number to multiply the font size by,
src/modules/graphics/opengl/wrap_Font.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ namespace opengl
{
Font * t = luax_checkfont(L, 1);
const char * str = luaL_checkstring(L, 2);
lua_pushnumber(L, t->getWidth(str));
lua_pushinteger(L, t->getWidth(str));
return 1;
}