From 6aa103c72cddbdbe9b8df3cb4e2adcd4cb962ff9 Mon Sep 17 00:00:00 2001 From: "bart@bartbes.ath.cx" Date: Wed, 24 Feb 2010 13:47:15 +0100 Subject: [PATCH] Fixed font origin --- src/modules/graphics/opengl/ImageFont.cpp | 6 +++--- src/modules/graphics/opengl/TrueTypeFont.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/graphics/opengl/ImageFont.cpp b/src/modules/graphics/opengl/ImageFont.cpp index c74ec8015..013cb4f76 100644 --- a/src/modules/graphics/opengl/ImageFont.cpp +++ b/src/modules/graphics/opengl/ImageFont.cpp @@ -46,7 +46,7 @@ namespace opengl void ImageFont::print(string text, float x, float y) const { glPushMatrix(); - glTranslatef(x, y, 0.0f); + glTranslatef(x, y+getHeight(), 0.0f); GLuint OpenGLFont = list; glListBase(OpenGLFont); glCallLists((int)text.length(), GL_UNSIGNED_BYTE, text.c_str()); @@ -57,7 +57,7 @@ namespace opengl { glPushMatrix(); - glTranslatef(x, y, 0.0f); + glTranslatef(x, y+getHeight(), 0.0f); glRotatef(angle * 57.29578f, 0, 0, 1.0f); glScalef(sx, sy, 1.0f); @@ -71,7 +71,7 @@ namespace opengl void ImageFont::print(char character, float x, float y) const { glPushMatrix(); - glTranslatef(x, y, 0.0f); + glTranslatef(x, y+getHeight(), 0.0f); GLuint OpenGLFont = list; glListBase(OpenGLFont); glCallList(list + (int)character); diff --git a/src/modules/graphics/opengl/TrueTypeFont.cpp b/src/modules/graphics/opengl/TrueTypeFont.cpp index 9f658654b..81785aa6d 100644 --- a/src/modules/graphics/opengl/TrueTypeFont.cpp +++ b/src/modules/graphics/opengl/TrueTypeFont.cpp @@ -147,7 +147,7 @@ namespace opengl void TrueTypeFont::print(string text, float x, float y) const { glPushMatrix(); - glTranslatef(ceil(x), ceil(y), 0.0f); // + getHeight() to make the x,y coordiantes the top left corner + glTranslatef(ceil(x), ceil(y+getHeight()), 0.0f); // + getHeight() to make the x,y coordiantes the top left corner GLuint TrueTypeFont = list; glListBase(TrueTypeFont); glCallLists((int)text.length(), GL_UNSIGNED_BYTE, text.c_str()); @@ -158,7 +158,7 @@ namespace opengl { glPushMatrix(); - glTranslatef(ceil(x), ceil(y), 0.0f); + glTranslatef(ceil(x), ceil(y+getHeight()), 0.0f); glRotatef(angle * 57.29578f, 0, 0, 1.0f); glScalef(sx, sy, 1.0f); @@ -172,7 +172,7 @@ namespace opengl void TrueTypeFont::print(char character, float x, float y) const { glPushMatrix(); - glTranslatef(ceil(x), ceil(y), 0.0f); + glTranslatef(ceil(x), ceil(y+getHeight()), 0.0f); GLuint TrueTypeFont = list; glListBase(TrueTypeFont); glCallList(list + (int)character);