From a011cb3b26b9bf5ec02497b8a98e563d25ce73c7 Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Tue, 4 Oct 2011 23:49:34 +0000 Subject: [PATCH] Font LinBiolinum_Re-0.6.4.ttf is default now and some default values are set according to this font. --- source/glest_game/main/main.cpp | 2 -- source/shared_lib/sources/graphics/font.cpp | 6 +++--- source/shared_lib/sources/graphics/gl/font_textFTGL.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 459cb47c0..bf3869c76 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -2694,8 +2694,6 @@ int glestMain(int argc, char** argv) { lang.loadStrings(language); if( lang.hasString("FONT_BASE_SIZE")) { - // 256 for English - // 30000 for Chinese Font::baseSize = strToInt(lang.get("FONT_BASE_SIZE")); } diff --git a/source/shared_lib/sources/graphics/font.cpp b/source/shared_lib/sources/graphics/font.cpp index 0f73ee119..df04fab60 100644 --- a/source/shared_lib/sources/graphics/font.cpp +++ b/source/shared_lib/sources/graphics/font.cpp @@ -42,11 +42,11 @@ bool Font::fontIsRightToLeft = false; // in 3D render mode float Font::scaleFontValue = 0.80; // This value is used for centering font text vertically (height) -float Font::scaleFontValueCenterHFactor = 3.0; +float Font::scaleFontValueCenterHFactor = 4.0; //float Font::scaleFontValue = 1.0; //float Font::scaleFontValueCenterHFactor = 4.0; -int Font::baseSize = 0; +int Font::baseSize = 3; #ifdef USE_FTGL @@ -55,7 +55,7 @@ string Font::langHeightText = TextFTGL::langHeightText; #else -int Font::faceResolution = 72; +int Font::faceResolution = 720; string Font::langHeightText = "yW"; #endif diff --git a/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp b/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp index 7e0ec83d1..54447a981 100644 --- a/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp +++ b/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp @@ -381,7 +381,7 @@ const char* TextFTGL::findFont(const char *firstFontToTry) { } string data_path = Text::DEFAULT_FONT_PATH; - string defaultFont = data_path + "data/core/fonts/LiberationSans-Regular.ttf"; + string defaultFont = data_path + "data/core/fonts/LinBiolinum_Re-0.6.4.ttf"; tryFont = defaultFont; #ifdef WIN32 replaceAll(tryFont, "/", "\\");