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

- i think this fixes the y centering for all resolutions, after testing we can remove lots of unused properties and code

Browse Source
This commit is contained in:
Mark Vejvoda
2011-07-01 01:18:47 +00:00
parent 97e19785a9
commit 1b72bcafe8
6 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ float FontMetrics::DEFAULT_Y_OFFSET_FACTOR = 2.0f;
bool Font::fontIsRightToLeft = false;
float Font::scaleFontValue = 1.0;
int Font::baseSize = 0;
int Font::faceResolution = 72;
//int Font::scaleFontYOffset = 0;
//
@@ -129,6 +130,7 @@ Font::Font(FontTextHandlerType type) {
try {
textHandler = NULL;
textHandler = new TextFTGL(type);
TextFTGL::faceResolution = faceResolution;
metrics.setTextHandler(this->textHandler);
}
catch(exception &ex) {

10
source/shared_lib/sources/graphics/gl/font_textFTGL.cpp
View File

@@ -32,6 +32,8 @@ using namespace Shared::PlatformCommon;
namespace Shared { namespace Graphics { namespace Gl {
int TextFTGL::faceResolution = 72;
//====================================================================
TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) {
@@ -77,7 +79,7 @@ TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) {
free((void*)fontFile);
fontFile = NULL;
ftFont->FaceSize(24);
ftFont->FaceSize(24,TextFTGL::faceResolution);
if(ftFont->Error()) {
throw runtime_error("FTGL: error setting face size");
}
@@ -143,10 +145,10 @@ void TextFTGL::init(string fontName, int fontSize) {
fontFile = NULL;
if(fontSize > 0) {
ftFont->FaceSize(fontSize);
ftFont->FaceSize(fontSize,TextFTGL::faceResolution);
}
else {
ftFont->FaceSize(24);
ftFont->FaceSize(24,TextFTGL::faceResolution);
}
if(ftFont->Error()) {
@@ -170,7 +172,7 @@ void TextFTGL::init(string fontName, int fontSize) {
}
void TextFTGL::SetFaceSize(int value) {
ftFont->FaceSize(value);
ftFont->FaceSize(value,TextFTGL::faceResolution);
if(ftFont->Error()) {
throw runtime_error("FTGL: error setting face size");
}