From cef0577e3e7c6b21c7af269fcc6d1f1914819422 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 19 Nov 2011 09:49:52 +0000 Subject: [PATCH] - added commented out debug code for future ref --- source/glest_game/graphics/renderer.cpp | 2 +- source/shared_lib/sources/graphics/freetype-gl/texture-font.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index febef064f..7770f3070 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -1901,7 +1901,7 @@ Vec2f Renderer::getCentered3DPos(const string &text, Font3D *font, Vec2f &pos, i float heightGap = (float)(((float)h - lineHeight) / 2.0); pos.y -= heightGap; - //printf("h = %d lineHeight = %f heightGap = %f\n",h,lineHeight,heightGap); + //printf("h = %d lineHeight = %f heightGap = %f\n",h,lineHeight,heightGap); // Now calculate till we get text to middle //pos.y -= (realHeight / 2); diff --git a/source/shared_lib/sources/graphics/freetype-gl/texture-font.c b/source/shared_lib/sources/graphics/freetype-gl/texture-font.c index c3aff5fc1..6085bad63 100644 --- a/source/shared_lib/sources/graphics/freetype-gl/texture-font.c +++ b/source/shared_lib/sources/graphics/freetype-gl/texture-font.c @@ -93,12 +93,14 @@ texture_font_new( TextureAtlas *atlas, } { - FT_Size_Metrics metrics = face->size->metrics; + FT_Size_Metrics metrics = face->size->metrics; self->ascender = (metrics.ascender >> 6) / 100.0; self->descender = (metrics.descender >> 6) / 100.0; self->height = (metrics.height >> 6) / 100.0; self->linegap = self->height - self->ascender + self->descender; + //printf("filename [%s] size = %f metrics.ascender = %ld metrics.descender = %ld metrics.height = %ld self->linegap = %f\n",filename,size,metrics.ascender,metrics.descender,metrics.height,self->linegap); + //printf("self->ascender = %f self->descender = %f self->height = %f self->linegap = %f\n",self->ascender,self->descender,self->height,self->linegap); return self; } }