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

Fixed crash in font code, updated font loading code to allow splitting our huge XML file so that chinese can be in a separate file, switched to wqyMicroHei for chinese font (font not included in SVN because of size)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5808 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-08-29 19:28:57 +00:00
parent 4ead096539
commit e79025b041
3 changed files with 63 additions and 29 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.

90
src/guiengine/scalable_font.cpp
View File

@ -54,6 +54,7 @@ ScalableFont::ScalableFont(IGUIEnvironment *env, const io::path& filename)
setInvisibleCharacters ( L" " ); setInvisibleCharacters ( L" " );
// FIXME: need to delete the created XML reader?
load( file_manager->createXMLReader(filename.c_str()) ); load( file_manager->createXMLReader(filename.c_str()) );
assert(Areas.size() > 0); assert(Areas.size() > 0);
} }
@ -75,39 +76,48 @@ void ScalableFont::setShadow(irr::video::SColor col)
m_shadow_color = col; m_shadow_color = col;
} }
//! loads a font file from xml void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
bool ScalableFont::load(io::IXMLReader* xml)
{ {
if (!SpriteBank)
return false;
while (xml->read()) while (xml->read())
{ {
if (io::EXN_ELEMENT == xml->getNodeType()) if (io::EXN_ELEMENT == xml->getNodeType())
{ {
if (core::stringw(L"Texture") == xml->getNodeName()) if (core::stringw(L"include") == xml->getNodeName())
{
core::stringc filename = xml->getAttributeValue(L"file");
// FIXME: need to delete the created XML reader?
io::IXMLReader* included = file_manager->createXMLReader(
file_manager->getFontFile(filename.c_str()));
printf("FONT: including '%s'\n", file_manager->getFontFile(filename.c_str()).c_str());
if (included == NULL) printf("Include not found :( :(\n");
if (included != NULL)
{
doReadXmlFile(included);
}
}
else if (core::stringw(L"Texture") == xml->getNodeName())
{ {
// add a texture // add a texture
core::stringc filename = xml->getAttributeValue(L"filename"); core::stringc filename = xml->getAttributeValue(L"filename");
core::stringc fn = file_manager->getFontFile(filename.c_str()).c_str(); core::stringc fn = file_manager->getFontFile(filename.c_str()).c_str();
u32 i = (u32)xml->getAttributeValueAsInt(L"index"); u32 i = (u32)xml->getAttributeValueAsInt(L"index");
float scale=1.0f; float scale=1.0f;
if(xml->getAttributeValue(L"scale")) if(xml->getAttributeValue(L"scale"))
scale = xml->getAttributeValueAsFloat(L"scale"); scale = xml->getAttributeValueAsFloat(L"scale");
//std::cout << "scale = " << scale << std::endl; //std::cout << "scale = " << scale << std::endl;
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;
// make sure the sprite bank has enough textures in it // make sure the sprite bank has enough textures in it
while (i+1 > SpriteBank->getTextureCount()) while (i+1 > SpriteBank->getTextureCount())
{ {
SpriteBank->addTexture(NULL); SpriteBank->addTexture(NULL);
} }
TextureInfo info; TextureInfo info;
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"));
@ -121,16 +131,16 @@ bool ScalableFont::load(io::IXMLReader* xml)
SGUISpriteFrame f; SGUISpriteFrame f;
SGUISprite s; SGUISprite s;
core::rect<s32> rectangle; core::rect<s32> rectangle;
a.underhang = xml->getAttributeValueAsInt(L"u"); a.underhang = xml->getAttributeValueAsInt(L"u");
a.overhang = xml->getAttributeValueAsInt(L"o"); a.overhang = xml->getAttributeValueAsInt(L"o");
a.spriteno = SpriteBank->getSprites().size(); a.spriteno = SpriteBank->getSprites().size();
s32 texno = xml->getAttributeValueAsInt(L"i"); s32 texno = xml->getAttributeValueAsInt(L"i");
// parse rectangle // parse rectangle
core::stringc rectstr = xml->getAttributeValue(L"r"); core::stringc rectstr = xml->getAttributeValue(L"r");
wchar_t ch = xml->getAttributeValue(L"c")[0]; wchar_t ch = xml->getAttributeValue(L"c")[0];
const c8 *c = rectstr.c_str(); const c8 *c = rectstr.c_str();
s32 val; s32 val;
val = 0; val = 0;
@ -142,7 +152,7 @@ bool ScalableFont::load(io::IXMLReader* xml)
} }
rectangle.UpperLeftCorner.X = val; rectangle.UpperLeftCorner.X = val;
while (*c == L' ' || *c == L',') c++; while (*c == L' ' || *c == L',') c++;
val = 0; val = 0;
while (*c >= '0' && *c <= '9') while (*c >= '0' && *c <= '9')
{ {
@ -152,7 +162,7 @@ bool ScalableFont::load(io::IXMLReader* xml)
} }
rectangle.UpperLeftCorner.Y = val; rectangle.UpperLeftCorner.Y = val;
while (*c == L' ' || *c == L',') c++; while (*c == L' ' || *c == L',') c++;
val = 0; val = 0;
while (*c >= '0' && *c <= '9') while (*c >= '0' && *c <= '9')
{ {
@ -162,7 +172,7 @@ bool ScalableFont::load(io::IXMLReader* xml)
} }
rectangle.LowerRightCorner.X = val; rectangle.LowerRightCorner.X = val;
while (*c == L' ' || *c == L',') c++; while (*c == L' ' || *c == L',') c++;
val = 0; val = 0;
while (*c >= '0' && *c <= '9') while (*c >= '0' && *c <= '9')
{ {
@ -171,32 +181,42 @@ bool ScalableFont::load(io::IXMLReader* xml)
c++; c++;
} }
rectangle.LowerRightCorner.Y = val; rectangle.LowerRightCorner.Y = val;
CharacterMap[ch] = Areas.size(); CharacterMap[ch] = Areas.size();
//std::cout << "Inserting character '" << (int)ch << "' with area " << Areas.size() << std::endl; //std::cout << "Inserting character '" << (int)ch << "' with area " << Areas.size() << std::endl;
// make frame // make frame
f.rectNumber = SpriteBank->getPositions().size(); f.rectNumber = SpriteBank->getPositions().size();
f.textureNumber = texno; f.textureNumber = texno;
// add frame to sprite // add frame to sprite
s.Frames.push_back(f); s.Frames.push_back(f);
s.frameTime = 0; s.frameTime = 0;
// add rectangle to sprite bank // add rectangle to sprite bank
SpriteBank->getPositions().push_back(rectangle); SpriteBank->getPositions().push_back(rectangle);
a.width = rectangle.getWidth(); a.width = rectangle.getWidth();
// add sprite to sprite bank // add sprite to sprite bank
SpriteBank->getSprites().push_back(s); SpriteBank->getSprites().push_back(s);
// add character to font // add character to font
Areas.push_back(a); Areas.push_back(a);
} }
} }
} }
}
//! loads a font file from xml
bool ScalableFont::load(io::IXMLReader* xml)
{
if (!SpriteBank)
return false;
doReadXmlFile(xml);
// set bad character // set bad character
WrongCharacter = getAreaIDFromCharacter(L' ', NULL); WrongCharacter = getAreaIDFromCharacter(L' ', NULL);
@ -289,17 +309,18 @@ s32 ScalableFont::getAreaIDFromCharacter(const wchar_t c, bool* fallback_font) c
if (n != CharacterMap.end()) if (n != CharacterMap.end())
{ {
if (fallback_font != NULL) *fallback_font = false; if (fallback_font != NULL) *fallback_font = false;
// std::cout << "Character " << (int)c << " found in font\n";
return (*n).second; return (*n).second;
} }
else if (m_fallback_font != NULL && fallback_font != NULL) else if (m_fallback_font != NULL && fallback_font != NULL)
{ {
//std::wcout << L"Font does not have this character : <" << c << L">, trying fallback font" << std::endl; // std::cout << "Font does not have this character : <" << (int)c << ">, trying fallback font" << std::endl;
*fallback_font = true; *fallback_font = true;
return m_fallback_font->getAreaIDFromCharacter(c, NULL); return m_fallback_font->getAreaIDFromCharacter(c, NULL);
} }
else else
{ {
//std::cout << "The font does not have this character : <" << (int)c << ">" << std::endl; // std::cout << "The font does not have this character : <" << (int)c << ">" << std::endl;
if (fallback_font != NULL) *fallback_font = false; if (fallback_font != NULL) *fallback_font = false;
return WrongCharacter; return WrongCharacter;
} }
@ -309,7 +330,8 @@ const ScalableFont::SFontArea &ScalableFont::getAreaFromCharacter(const wchar_t
bool* fallback_font) const bool* fallback_font) const
{ {
const int area_id = getAreaIDFromCharacter(c, fallback_font); const int area_id = getAreaIDFromCharacter(c, fallback_font);
assert(area_id < (int)Areas.size());
if(m_mono_space_digits && ( (c>=L'0' && c<=L'9') || c==L' ' ) ) if(m_mono_space_digits && ( (c>=L'0' && c<=L'9') || c==L' ' ) )
{ {
const SFontArea &area = (fallback_font && *fallback_font) const SFontArea &area = (fallback_font && *fallback_font)
@ -319,9 +341,19 @@ const ScalableFont::SFontArea &ScalableFont::getAreaFromCharacter(const wchar_t
return m_max_digit_area; return m_max_digit_area;
} }
const bool use_fallback_font = (fallback_font && *fallback_font);
if (use_fallback_font)
{
assert(area_id < (int)m_fallback_font->Areas.size());
}
else
{
assert(area_id < (int)Areas.size());
}
// Note: fallback_font can be NULL // Note: fallback_font can be NULL
return ( (fallback_font && *fallback_font) ? m_fallback_font->Areas[area_id] return ( use_fallback_font ? m_fallback_font->Areas[area_id] : Areas[area_id]);
: Areas[area_id]);
} // getAreaFromCharacter } // getAreaFromCharacter

2
src/guiengine/scalable_font.hpp
View File

@ -56,6 +56,8 @@ class ScalableFont : public IGUIFontBitmap
void lazyLoadTexture(int texID); void lazyLoadTexture(int texID);
void doReadXmlFile(io::IXMLReader* xml);
bool m_is_hollow_copy; bool m_is_hollow_copy;
bool m_rtl; bool m_rtl;
public: public: