evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update StarFont.cpp

Browse Source
This commit is contained in:
Kae 2024-09-12 23:03:15 +10:00
parent 4da398e42d
commit ba9335f801
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/core/StarFont.cpp
View File

@ -30,8 +30,6 @@ FTContext ftContext;
struct FontImpl { struct FontImpl {
FT_Face face; FT_Face face;
String::Char loadedChar = 0;
unsigned renderedPixelSize = 0;
}; };
FontPtr Font::loadFont(String const& fileName, unsigned pixelSize) { FontPtr Font::loadFont(String const& fileName, unsigned pixelSize) {
@ -84,8 +82,7 @@ unsigned Font::width(String::Char c) {
if (auto width = m_widthCache.maybe({c, m_pixelSize})) { if (auto width = m_widthCache.maybe({c, m_pixelSize})) {
return *width; return *width;
} else { } else {
if (m_fontImpl->loadedChar != c) FT_Load_Char(m_fontImpl->face, c, FontLoadFlags);
FT_Load_Char(m_fontImpl->face, m_fontImpl->loadedChar = c, FontLoadFlags);
unsigned newWidth = (m_fontImpl->face->glyph->linearHoriAdvance + 32768) / 65536; unsigned newWidth = (m_fontImpl->face->glyph->linearHoriAdvance + 32768) / 65536;
m_widthCache.insert({c, m_pixelSize}, newWidth); m_widthCache.insert({c, m_pixelSize}, newWidth);
return newWidth; return newWidth;
@ -98,19 +95,11 @@ tuple<Image, Vec2I, bool> Font::render(String::Char c) {
throw FontException("Font::render called on uninitialized font."); throw FontException("Font::render called on uninitialized font.");
FT_Face face = m_fontImpl->face; FT_Face face = m_fontImpl->face;
if (FT_Load_Glyph(face, FT_Get_Char_Index(face, c), FontLoadFlags) != 0)
return {};
if (m_fontImpl->loadedChar != c) { if (FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL) != 0)
if (FT_Load_Glyph(face, FT_Get_Char_Index(face, m_fontImpl->loadedChar = c), FontLoadFlags) != 0) return {};
return {};
m_fontImpl->renderedPixelSize = 0;
}
if (m_fontImpl->renderedPixelSize != m_pixelSize) {
m_fontImpl->renderedPixelSize = m_pixelSize;
if (FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL) != 0)
return {};
}
FT_GlyphSlot slot = face->glyph; FT_GlyphSlot slot = face->glyph;
if (!slot->bitmap.buffer) if (!slot->bitmap.buffer)