Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-29 19:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed uninitialized max glyph size in Font.

Browse source
This commit is contained in:
Aloshi 2014-09-27 16:09:49 -05:00
parent 7c31d7ca0a
commit 030c840cfb
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
es-core/src/resources/Font.cpp
View file

@ -197,6 +197,8 @@ Font::Font(int size, const std::string& path) : mSize(size), mPath(path)
{ {
assert(mSize > 0); assert(mSize > 0);
mMaxGlyphHeight = 0;
if(!sLibrary) if(!sLibrary)
initLibrary(); initLibrary();
@ -424,7 +426,7 @@ FT_Face Font::getFaceForChar(UnicodeChar id)
} }
if(FT_Get_Char_Index(fit->second->face, id) != 0) if(FT_Get_Char_Index(fit->second->face, id) != 0)
return fit->second->face; return fit->second->face;
} }
// nothing has a valid glyph - return the "real" face so we get a "missing" character // nothing has a valid glyph - return the "real" face so we get a "missing" character
@ -588,7 +590,9 @@ Eigen::Vector2f Font::sizeText(std::string text, float lineSpacing)
y += lineHeight; y += lineHeight;
} }
lineWidth += getGlyph(character)->advance.x(); Glyph* glyph = getGlyph(character);
if(glyph)
lineWidth += glyph->advance.x();
} }
if(lineWidth > highestWidth) if(lineWidth > highestWidth)
@ -605,6 +609,7 @@ float Font::getHeight(float lineSpacing) const
float Font::getLetterHeight() float Font::getLetterHeight()
{ {
Glyph* glyph = getGlyph((UnicodeChar)'S'); Glyph* glyph = getGlyph((UnicodeChar)'S');
assert(glyph);
return glyph->texSize.y() * glyph->texture->textureSize.y(); return glyph->texSize.y() * glyph->texture->textureSize.y();
} }
@ -689,7 +694,9 @@ Eigen::Vector2f Font::getWrappedTextCursorOffset(std::string text, float xLen, s
continue; continue;
} }
lineWidth += getGlyph(character)->advance.x(); Glyph* glyph = glyph;
if(glyph)
lineWidth += glyph->advance.x();
} }
return Eigen::Vector2f(lineWidth, y); return Eigen::Vector2f(lineWidth, y);