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

Improve ScalableFont to fix offsets introduced by recent font changes

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12338 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2013-01-06 00:36:20 +00:00
parent 63aea86164
commit 47b5a604af
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/fonts/StkFont.xml
View File

Binary file not shown.

BIN
data/fonts/rasheeq.xml
View File

Binary file not shown.

18
src/guiengine/scalable_font.cpp
View File

@ -131,6 +131,10 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
scale = xml->getAttributeValueAsFloat(L"scale"); scale = xml->getAttributeValueAsFloat(L"scale");
//std::cout << "scale = " << scale << std::endl; //std::cout << "scale = " << scale << std::endl;
bool excludeFromMaxHeightCalculation = false;
if (xml->getAttributeValue(L"excludeFromMaxHeightCalculation"))
excludeFromMaxHeightCalculation = (core::stringc(xml->getAttributeValue(L"excludeFromMaxHeightCalculation")) == "true");
core::stringw alpha = xml->getAttributeValue(L"hasAlpha"); core::stringw alpha = xml->getAttributeValue(L"hasAlpha");
//std::cout << "---- Adding font texture " << fn.c_str() << "; alpha=" << alpha.c_str() << std::endl; //std::cout << "---- Adding font texture " << fn.c_str() << "; alpha=" << alpha.c_str() << std::endl;
@ -146,6 +150,7 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
info.m_file_name = fn; info.m_file_name = fn;
info.m_has_alpha = (alpha == core::stringw("true")); info.m_has_alpha = (alpha == core::stringw("true"));
info.m_scale = scale; info.m_scale = scale;
info.m_exclude_from_max_height_calculation = excludeFromMaxHeightCalculation;
#ifdef DEBUG #ifdef DEBUG
@ -280,19 +285,30 @@ void ScalableFont::setScale(const float scale)
void ScalableFont::setMaxHeight() void ScalableFont::setMaxHeight()
{ {
// FIXME: should consider per-texture scaling
MaxHeight = 0; MaxHeight = 0;
s32 t; s32 t;
core::array< core::rect<s32> >& p = SpriteBank->getPositions(); core::array< core::rect<s32> >& p = SpriteBank->getPositions();
core::array< SGUISprite >& sprites = SpriteBank->getSprites();
for (u32 i=0; i<p.size(); ++i) for (u32 i=0; i<p.size(); ++i)
{ {
t = p[i].getHeight(); t = p[i].getHeight();
// FIXME: consider fallback fonts
int texID = sprites[i].Frames[0].textureNumber;
const TextureInfo& info = (*(m_texture_files.find(texID))).second;
if (info.m_exclude_from_max_height_calculation) continue;
float char_scale = info.m_scale;
t *= char_scale;
if (t>MaxHeight) if (t>MaxHeight)
MaxHeight = t; MaxHeight = t;
} }
MaxHeight = MaxHeight*m_scale;
} }

1
src/guiengine/scalable_font.hpp
View File

@ -45,6 +45,7 @@ class ScalableFont : public IGUIFontBitmap
irr::core::stringc m_file_name; irr::core::stringc m_file_name;
bool m_has_alpha; bool m_has_alpha;
float m_scale; float m_scale;
bool m_exclude_from_max_height_calculation;
TextureInfo() TextureInfo()
{ {