mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 22:21:18 +02:00
Code Issues Projects Releases Wiki Activity

- corrections for y co-ord placement of font

Browse Source
This commit is contained in:
Mark Vejvoda
2011-06-28 07:52:05 +00:00
parent ebd5bca7fe
commit a9dfd3853b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/glest_game/graphics/renderer.cpp
View File

@@ -1450,7 +1450,7 @@ Vec2f Renderer::getCentered3DPos(const string &text, Font3D *font, Vec2f &pos, i
if(lineHeight < h) {
//pos.y += ((float)h / 2.f);
//pos.y -= ((float(h) / 2.f) - (lineHeight / 2.f));
pos.y += (lineHeight / 2.f);
pos.y += (lineHeight / 2.f) + 2;
//pos.y -= h;
//printf("Center text [%s] h = %d, lineHeight = %f, pos.y = %f\n",text.c_str(),h,lineHeight,pos.y);

4
source/shared_lib/sources/graphics/font.cpp
View File

@@ -79,7 +79,7 @@ Text * FontMetrics::getTextHandler() {
float FontMetrics::getTextWidth(const string &str) {
if(textHandler != NULL) {
return textHandler->Advance(str.c_str());
return (textHandler->Advance(str.c_str()) * Font::scaleFontValue);
}
else {
float width= 0.f;
@@ -103,7 +103,7 @@ float FontMetrics::getTextWidth(const string &str) {
float FontMetrics::getHeight() const {
if(textHandler != NULL) {
return textHandler->LineHeight(" ");
return (textHandler->LineHeight(" ") * Font::scaleFontValue);
}
else {
return height;

2
source/shared_lib/sources/graphics/gl/text_renderer_gl.cpp
View File

@@ -470,7 +470,7 @@ void TextRenderer3DGl::internalRender(const string &text, float x, float y, boo
translatePos.x = x - (font->getTextHandler()->Advance(renderText.c_str()) / 2.f);
//assertGl();
//translatePos.y = y - (font->getTextHandler()->LineHeight(text.c_str()) / font->getYOffsetFactor());
translatePos.y = y - (font->getTextHandler()->LineHeight(renderText.c_str()) / 2.f);
translatePos.y = y - ((font->getTextHandler()->LineHeight(renderText.c_str()) * Font::scaleFontValue) / 2.f);
//assertGl();
translatePos.z = 0;