Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/global/metrics.cpp
View File

@ -67,6 +67,9 @@ int Metrics::toVirtualY(int h) const{
if(screenH == 0) { if(screenH == 0) {
throw runtime_error("div by 0 screenH == 0"); throw runtime_error("div by 0 screenH == 0");
} }
//printf("h [%d] virtualH [%d] screenH [%d] result = %d\n",h,virtualH,screenH,(h*virtualH/screenH));
return h*virtualH/screenH; return h*virtualH/screenH;
} }

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

@ -1446,9 +1446,11 @@ Vec2f Renderer::getCentered3DPos(const string &text, Font3D *font, Vec2f &pos, i
} }
const Metrics &metrics= Metrics::getInstance(); const Metrics &metrics= Metrics::getInstance();
float lineHeight = (font->getTextHandler()->LineHeight(text.c_str()) * Font::scaleFontValue); float lineHeight = (font->getTextHandler()->LineHeight(text.c_str()) * Font::scaleFontValue);
lineHeight=metrics.toVirtualY(lineHeight); //lineHeight=metrics.toVirtualY(lineHeight);
//lineHeight= lineHeight / (2.f + 0.2f * FontMetrics::DEFAULT_Y_OFFSET_FACTOR); //lineHeight= lineHeight / (2.f + 0.2f * FontMetrics::DEFAULT_Y_OFFSET_FACTOR);
pos.y += (h / 2.f) - (lineHeight / 2.f); //pos.y += (h / 2.f) - (lineHeight / 2.f);
//pos.y += (h / 2.f) - (lineHeight);
pos.y += (lineHeight / 2.f); // y starts at the middle of the render position, so only move up 1/2 the font height
return pos; return pos;
} }

1
source/shared_lib/include/graphics/font.h
View File

@ -67,6 +67,7 @@ public:
static bool fontIsRightToLeft; static bool fontIsRightToLeft;
static float scaleFontValue; static float scaleFontValue;
static int baseSize; static int baseSize;
static int faceResolution;
//static int scaleFontYOffset; //static int scaleFontYOffset;
public: public:

2
source/shared_lib/include/graphics/gl/font_textFTGL.h
View File

@ -28,6 +28,8 @@ class TextFTGL : public Text
{ {
public: public:
static int faceResolution;
TextFTGL(FontTextHandlerType type); TextFTGL(FontTextHandlerType type);
virtual ~TextFTGL(); virtual ~TextFTGL();
virtual void init(string fontName, int fontSize); virtual void init(string fontName, int fontSize);

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; bool Font::fontIsRightToLeft = false;
float Font::scaleFontValue = 1.0; float Font::scaleFontValue = 1.0;
int Font::baseSize = 0; int Font::baseSize = 0;
int Font::faceResolution = 72;
//int Font::scaleFontYOffset = 0; //int Font::scaleFontYOffset = 0;
// //
@ -129,6 +130,7 @@ Font::Font(FontTextHandlerType type) {
try { try {
textHandler = NULL; textHandler = NULL;
textHandler = new TextFTGL(type); textHandler = new TextFTGL(type);
TextFTGL::faceResolution = faceResolution;
metrics.setTextHandler(this->textHandler); metrics.setTextHandler(this->textHandler);
} }
catch(exception &ex) { 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 { namespace Shared { namespace Graphics { namespace Gl {
int TextFTGL::faceResolution = 72;
//==================================================================== //====================================================================
TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) { TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) {
@ -77,7 +79,7 @@ TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) {
free((void*)fontFile); free((void*)fontFile);
fontFile = NULL; fontFile = NULL;
ftFont->FaceSize(24); ftFont->FaceSize(24,TextFTGL::faceResolution);
if(ftFont->Error()) { if(ftFont->Error()) {
throw runtime_error("FTGL: error setting face size"); throw runtime_error("FTGL: error setting face size");
} }
@ -143,10 +145,10 @@ void TextFTGL::init(string fontName, int fontSize) {
fontFile = NULL; fontFile = NULL;
if(fontSize > 0) { if(fontSize > 0) {
ftFont->FaceSize(fontSize); ftFont->FaceSize(fontSize,TextFTGL::faceResolution);
} }
else { else {
ftFont->FaceSize(24); ftFont->FaceSize(24,TextFTGL::faceResolution);
} }
if(ftFont->Error()) { if(ftFont->Error()) {
@ -170,7 +172,7 @@ void TextFTGL::init(string fontName, int fontSize) {
} }
void TextFTGL::SetFaceSize(int value) { void TextFTGL::SetFaceSize(int value) {
ftFont->FaceSize(value); ftFont->FaceSize(value,TextFTGL::faceResolution);
if(ftFont->Error()) { if(ftFont->Error()) {
throw runtime_error("FTGL: error setting face size"); throw runtime_error("FTGL: error setting face size");
} }