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

Added vrld's text-rotation-fixing patch (finally fixes #56)

Browse Source
This commit is contained in:
Bill Meltsner
2010-11-09 18:56:34 -05:00
parent 0aa4c36950
commit 3cb3537db0
3 changed files with 21 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+7
View File
@@ -67,6 +67,7 @@ namespace opengl
void Font::print(std::string text, float x, float y, float angle, float sx, float sy) const
{
float dx = 0.0f; // spacing counter for newline handling
glPushMatrix();
glTranslatef(ceil(x), ceil(y), 0.0f);
@@ -74,12 +75,18 @@ namespace opengl
glScalef(sx, sy, 1.0f);
for (unsigned int i = 0; i < text.size(); i++) {
unsigned char g = (unsigned char)text[i];
if (g == '\n') { // wrap newline, but do not print it
glTranslatef(-dx, round(getHeight()), 0);
dx = 0.0f;
continue;
}
if (!glyphs[g]) g = 32; // space
glPushMatrix();
glTranslatef(0, round(getHeight()), 0);
glyphs[g]->draw(0, 0, 0, 1, 1, 0, 0);
glPopMatrix();
glTranslatef(spacing[g], 0, 0);
dx += spacing[g];
}
glPopMatrix();
}
src/modules/graphics/opengl/Graphics.cpp
+7 -103
View File
@@ -700,97 +700,23 @@ namespace opengl
return (int)max;
}
void Graphics::print( const char * str, float x, float y )
void Graphics::print( const char * str, float x, float y)
{
if(currentFont != 0)
{
std::string text(str);
if(text.find("\n") == std::string::npos)
currentFont->print(text, x, y);
else
{
int lines = 0;
text = "";
for(unsigned int i = 0; i < strlen(str); i++)
{
if(str[i] == '\n')
{
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight()));
text = "";
lines++;
}
else
text += str[i];
}
if(text != "") // Print the last text (if applicable).
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight()));
}
currentFont->print(text, x, y);
}
}
void Graphics::print( const char * str, float x, float y , float angle)
void Graphics::print( const char * str, float x, float y, float angle)
{
if(currentFont != 0)
{
std::string text(str);
if(text.find("\n") == std::string::npos)
currentFont->print(text, x, y, angle, 1, 1);
else
{
int lines = 0;
text = "";
for(unsigned int i = 0; i < strlen(str); i++)
{
if(str[i] == '\n')
{
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight()), angle, 1, 1);
text = "";
lines++;
}
else
text += str[i];
}
if(text != "") // Print the last text (if applicable).
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight()), angle, 1, 1);
}
}
print(str, x, y, angle, 1, 1);
}
void Graphics::print( const char * str, float x, float y , float angle, float s)
void Graphics::print( const char * str, float x, float y, float angle, float s)
{
if(currentFont != 0)
{
std::string text(str);
if(text.find("\n") == std::string::npos)
currentFont->print(text, x, y, angle, s, s);
else
{
int lines = 0;
text = "";
for(unsigned int i = 0; i < strlen(str); i++)
{
if(str[i] == '\n')
{
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight() * s), angle, s, s);
text = "";
lines++;
}
else
text += str[i];
}
if(text != "") // Print the last text (if applicable).
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight() * s), angle, s, s);
}
}
print(str, x, y, angle, s, s);
}
void Graphics::print( const char * str, float x, float y , float angle, float sx, float sy)
@@ -798,29 +724,7 @@ namespace opengl
if(currentFont != 0)
{
std::string text(str);
if(text.find("\n") == std::string::npos)
currentFont->print(text, x, y, angle, sx, sy);
else
{
int lines = 0;
text = "";
for(unsigned int i = 0; i < strlen(str); i++)
{
if(str[i] == '\n')
{
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight() * sy), angle, sx, sy);
text = "";
lines++;
}
else
text += str[i];
}
if(text != "") // Print the last text (if applicable).
currentFont->print(text, x, y + (lines * currentFont->getHeight() * currentFont->getLineHeight() * sy), angle, sx, sy);
}
currentFont->print(text, x, y, angle, sx, sy);
}
}