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

Fix #3989

Browse Source
This commit is contained in:
Benau 2019-07-08 10:57:59 +08:00
parent 6cab3b07c9
commit 6c096bb63b
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/graphics/stk_text_billboard.cpp
View File

@ -29,9 +29,9 @@ STKTextBillboard::STKTextBillboard(const video::SColor& color_top,
ISceneNode* parent, ISceneManager* mgr,
s32 id,
const core::vector3df& position,
const core::vector3df& size)
const core::vector3df& scale)
: ISceneNode(parent, mgr, id, position,
core::vector3df(0.0f, 0.0f, 0.0f), size)
core::vector3df(0.0f, 0.0f, 0.0f), scale)
{
using namespace SP;
m_color_top = color_top;
@ -52,6 +52,12 @@ STKTextBillboard::STKTextBillboard(const video::SColor& color_top,
static_assert(sizeof(GLTB) == 20, "Wrong compiler padding");
} // STKTextBillboard
// ----------------------------------------------------------------------------
float STKTextBillboard::getDefaultScale(FontWithFace* face)
{
return 1.0f / (float)face->getDPI();
} // getDefaultScale
// ----------------------------------------------------------------------------
void STKTextBillboard::updateAbsolutePosition()
{
@ -92,7 +98,7 @@ void STKTextBillboard::init(const core::stringw& text, FontWithFace* face)
face->drawText(text, core::rect<s32>(0, 0, size.Width, size.Height),
video::SColor(255,255,255,255), false, false, NULL, NULL, this);
const float scale = 0.02f;
const float scale = getDefaultScale(face);
float max_x = 0;
float min_y = 0;
float max_y = 0;
@ -262,7 +268,7 @@ void STKTextBillboard::initLegacy(const core::stringw& text, FontWithFace* face)
face->drawText(text, core::rect<s32>(0, 0, size.Width, size.Height),
video::SColor(255,255,255,255), false, false, NULL, NULL, this);
const float scale = 0.02f;
const float scale = getDefaultScale(face);
float max_x = 0;
float min_y = 0;
float max_y = 0;

4
src/graphics/stk_text_billboard.hpp
View File

@ -83,13 +83,15 @@ private:
core::aabbox3df m_bbox;
// ------------------------------------------------------------------------
float getDefaultScale(FontWithFace* face);
public:
// ------------------------------------------------------------------------
STKTextBillboard(const video::SColor& color_top,
const video::SColor& color_bottom, ISceneNode* parent,
ISceneManager* mgr, s32 id,
const core::vector3df& position,
const core::vector3df& size);
const core::vector3df& scale = core::vector3df(1, 1, 1));
// ------------------------------------------------------------------------
~STKTextBillboard()
{

2
src/karts/kart.cpp
View File

@ -3446,7 +3446,7 @@ void Kart::setOnScreenText(const core::stringw& text)
GUIEngine::getSkin()->getColor("font::top"),
getNode(), irr_driver->getSceneManager(), -1,
core::vector3df(0.0f, 1.5f, 0.0f),
core::vector3df(0.35f, 0.35f, 0.35f));
core::vector3df(0.5f, 0.5f, 0.5f));
if (CVS->isGLSL())
tb->init(text, bold_face);
else