2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 18:27:42 +00:00

FontCache reading

This commit is contained in:
Jack Andersen
2015-11-28 11:45:38 -10:00
parent b1f99619cd
commit 4ede0d6858
4 changed files with 111 additions and 38 deletions

View File

@@ -361,12 +361,8 @@ void TextView::typesetGlyphs(const std::string& str, const Zeus::CColor& default
}
if (lCh != -1)
{
adv += DoKern(m_fontAtlas.lookupKern(lCh, ch), m_fontAtlas);
m_glyphs.emplace_back(adv, *glyph, defaultColor);
}
else
m_glyphs.emplace_back(adv, *glyph, defaultColor);
m_glyphs.emplace_back(adv, *glyph, defaultColor);
lCh = ch;
rem -= sz;
@@ -395,12 +391,8 @@ void TextView::typesetGlyphs(const std::wstring& str, const Zeus::CColor& defaul
continue;
if (lCh != -1)
{
adv += DoKern(m_fontAtlas.lookupKern(lCh, ch), m_fontAtlas);
m_glyphs.emplace_back(adv, *glyph, defaultColor);
}
else
m_glyphs.emplace_back(adv, *glyph, defaultColor);
m_glyphs.emplace_back(adv, *glyph, defaultColor);
lCh = ch;