ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add black borders to most text in the race UI

Browse Source
This commit is contained in:
Alayan 2018-10-05 19:47:44 +02:00
parent 697af6b08c
commit 1202a34a59
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/states_screens/race_gui.cpp
View File

@ -371,7 +371,9 @@ void RaceGUI::drawScores()
position.LowerRightCorner.X, position.LowerRightCorner.X,
position.LowerRightCorner.Y + string_height); position.LowerRightCorner.Y + string_height);
font->setBlackBorder(true);
font->draw(score.c_str(),pos,color); font->draw(score.c_str(),pos,color);
font->setBlackBorder(false);
if (i == 1) if (i == 1)
{ {
@ -451,8 +453,10 @@ void RaceGUI::drawGlobalTimer()
if (use_digit_font) if (use_digit_font)
font->setShadow(video::SColor(255, 128, 0, 0)); font->setShadow(video::SColor(255, 128, 0, 0));
font->setScale(1.0f); font->setScale(1.0f);
font->setBlackBorder(true);
font->draw(sw.c_str(), pos, time_color, false, false, NULL, font->draw(sw.c_str(), pos, time_color, false, false, NULL,
true /* ignore RTL */); true /* ignore RTL */);
font->setBlackBorder(false);
} // drawGlobalTimer } // drawGlobalTimer
@ -515,9 +519,10 @@ void RaceGUI::drawLiveDifference()
gui::ScalableFont* font = GUIEngine::getHighresDigitFont(); gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
font->setShadow(video::SColor(255, 128, 0, 0)); font->setShadow(video::SColor(255, 128, 0, 0));
font->setScale(1.0f); font->setScale(1.0f);
font->setBlackBorder(true);
font->draw(sw.c_str(), pos, time_color, false, false, NULL, font->draw(sw.c_str(), pos, time_color, false, false, NULL,
true /* ignore RTL */); true /* ignore RTL */);
font->setBlackBorder(false);
} // drawLiveDifference } // drawLiveDifference
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -804,7 +809,9 @@ void RaceGUI::drawRank(const AbstractKart *kart,
pos.UpperLeftCorner = core::vector2di(int(offset.X + 0.64f*meter_width), pos.UpperLeftCorner = core::vector2di(int(offset.X + 0.64f*meter_width),
int(offset.Y - 0.49f*meter_height)); int(offset.Y - 0.49f*meter_height));
font->setBlackBorder(true);
font->draw(oss.str().c_str(), pos, color, true, true); font->draw(oss.str().c_str(), pos, color, true, true);
font->setBlackBorder(false);
font->setScale(1.0f); font->setScale(1.0f);
return; return;
} }
@ -874,7 +881,9 @@ void RaceGUI::drawRank(const AbstractKart *kart,
pos.UpperLeftCorner = core::vector2di(int(offset.X + 0.64f*meter_width), pos.UpperLeftCorner = core::vector2di(int(offset.X + 0.64f*meter_width),
int(offset.Y - 0.49f*meter_height)); int(offset.Y - 0.49f*meter_height));
font->setBlackBorder(true);
font->draw(oss.str().c_str(), pos, color, true, true); font->draw(oss.str().c_str(), pos, color, true, true);
font->setBlackBorder(false);
font->setScale(1.0f); font->setScale(1.0f);
} // drawRank } // drawRank
@ -1164,6 +1173,7 @@ void RaceGUI::drawLap(const AbstractKart* kart,
if (ctf) if (ctf)
{ {
gui::ScalableFont* font = GUIEngine::getHighresDigitFont(); gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
font->setBlackBorder(true);
font->setScale(scaling.Y < 1.0f ? 0.5f: 1.0f); font->setScale(scaling.Y < 1.0f ? 0.5f: 1.0f);
core::stringw text = StringUtils::toWString(ctf->getRedScore()); core::stringw text = StringUtils::toWString(ctf->getRedScore());
font->draw(text, pos, video::SColor(255, 255, 0, 0)); font->draw(text, pos, video::SColor(255, 255, 0, 0));
@ -1176,6 +1186,7 @@ void RaceGUI::drawLap(const AbstractKart* kart,
text = StringUtils::toWString(ctf->getBlueScore()); text = StringUtils::toWString(ctf->getBlueScore());
font->draw(text, pos, video::SColor(255, 0, 0, 255)); font->draw(text, pos, video::SColor(255, 0, 0, 255));
font->setScale(1.0f); font->setScale(1.0f);
font->setBlackBorder(false);
return; return;
} }
@ -1206,7 +1217,9 @@ void RaceGUI::drawLap(const AbstractKart* kart,
out << lap + 1 << "/" << race_manager->getNumLaps(); out << lap + 1 << "/" << race_manager->getNumLaps();
gui::ScalableFont* font = GUIEngine::getHighresDigitFont(); gui::ScalableFont* font = GUIEngine::getHighresDigitFont();
font->setBlackBorder(true);
font->draw(out.str().c_str(), pos, color); font->draw(out.str().c_str(), pos, color);
font->setBlackBorder(false);
font->setScale(1.0f); font->setScale(1.0f);
#endif #endif
} // drawLap } // drawLap