Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- add more details in font error message

This commit is contained in:
SoftCoder 2016-10-30 08:41:31 -07:00
parent d40a6fdc1b
commit 57c53b9175
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit 0834a3d3275e1ead9a0ef73232413f2966f01297 Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7

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

@ -2706,13 +2706,13 @@ void Renderer::renderSelectionQuad() {
Vec2i computeCenteredPos(const string &text, Font2D *font, int x, int y) { Vec2i computeCenteredPos(const string &text, Font2D *font, int x, int y) {
if(font == NULL) { if(font == NULL) {
//abort(); //abort();
throw megaglest_runtime_error("font == NULL (1)"); throw megaglest_runtime_error("font == NULL (1) text = " + text);
} }
const Metrics &metrics= Metrics::getInstance(); const Metrics &metrics= Metrics::getInstance();
FontMetrics *fontMetrics= font->getMetrics(); FontMetrics *fontMetrics= font->getMetrics();
if(fontMetrics == NULL) { if(fontMetrics == NULL) {
throw megaglest_runtime_error("fontMetrics == NULL (1)"); throw megaglest_runtime_error("fontMetrics == NULL (1) text = " + text);
} }
int virtualX = (fontMetrics->getTextWidth(text) > 0 ? static_cast<int>(fontMetrics->getTextWidth(text)/2.f) : 5); int virtualX = (fontMetrics->getTextWidth(text) > 0 ? static_cast<int>(fontMetrics->getTextWidth(text)/2.f) : 5);
@ -2729,13 +2729,13 @@ Vec2i computeCenteredPos(const string &text, Font2D *font, int x, int y) {
Vec2i computeCenteredPos(const string &text, Font3D *font, int x, int y) { Vec2i computeCenteredPos(const string &text, Font3D *font, int x, int y) {
if(font == NULL) { if(font == NULL) {
throw megaglest_runtime_error("font == NULL (2)"); throw megaglest_runtime_error("font == NULL (2) text = " + text);
} }
const Metrics &metrics= Metrics::getInstance(); const Metrics &metrics= Metrics::getInstance();
FontMetrics *fontMetrics= font->getMetrics(); FontMetrics *fontMetrics= font->getMetrics();
if(fontMetrics == NULL) { if(fontMetrics == NULL) {
throw megaglest_runtime_error("fontMetrics == NULL (2)"); throw megaglest_runtime_error("fontMetrics == NULL (2) text = " + text);
} }
int virtualX = (fontMetrics->getTextWidth(text) > 0 ? static_cast<int>(fontMetrics->getTextWidth(text) / 2.f) : 5); int virtualX = (fontMetrics->getTextWidth(text) > 0 ? static_cast<int>(fontMetrics->getTextWidth(text) / 2.f) : 5);
@ -2861,10 +2861,10 @@ Vec2f Renderer::getCentered3DPos(const string &text, Font3D *font, Vec2f &pos, i
if(centeredW == true) { if(centeredW == true) {
if(font == NULL) { if(font == NULL) {
//abort(); //abort();
throw megaglest_runtime_error("font == NULL (5)"); throw megaglest_runtime_error("font == NULL (5) text = " + text);
} }
else if(font->getTextHandler() == NULL) { else if(font->getTextHandler() == NULL) {
throw megaglest_runtime_error("font->getTextHandler() == NULL (5)"); throw megaglest_runtime_error("font->getTextHandler() == NULL (5) text = " + text);
} }
float lineWidth = (font->getTextHandler()->Advance(text.c_str()) * ::Shared::Graphics::Font::scaleFontValue); float lineWidth = (font->getTextHandler()->Advance(text.c_str()) * ::Shared::Graphics::Font::scaleFontValue);
@ -2875,10 +2875,10 @@ Vec2f Renderer::getCentered3DPos(const string &text, Font3D *font, Vec2f &pos, i
if(centeredH) { if(centeredH) {
if(font == NULL) { if(font == NULL) {
throw megaglest_runtime_error("font == NULL (6)"); throw megaglest_runtime_error("font == NULL (6) text = " + text);
} }
else if(font->getTextHandler() == NULL) { else if(font->getTextHandler() == NULL) {
throw megaglest_runtime_error("font->getTextHandler() == NULL (6)"); throw megaglest_runtime_error("font->getTextHandler() == NULL (6) text = " + text);
} }
//const Metrics &metrics= Metrics::getInstance(); //const Metrics &metrics= Metrics::getInstance();
@ -3080,7 +3080,7 @@ void Renderer::renderTextShadow3D(const string &text, Font3D *font,const Vec4f &
} }
if(font == NULL) { if(font == NULL) {
throw megaglest_runtime_error("font == NULL (3)"); throw megaglest_runtime_error("font == NULL (3) text = " + text);
} }
glPushAttrib(GL_CURRENT_BIT); glPushAttrib(GL_CURRENT_BIT);
@ -3108,7 +3108,7 @@ void Renderer::renderTextShadow(const string &text, Font2D *font,const Vec4f &co
} }
if(font == NULL) { if(font == NULL) {
throw megaglest_runtime_error("font == NULL (4)"); throw megaglest_runtime_error("font == NULL (4) text = " + text);
} }
glPushAttrib(GL_CURRENT_BIT); glPushAttrib(GL_CURRENT_BIT);