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-04-27 06:46:20 +10:00
parent 929c75c364
commit a25b699966
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/core/StarFont.cpp
View File

@ -30,6 +30,8 @@ FTContext ftContext;
struct FontImpl { struct FontImpl {
FT_Face face; FT_Face face;
unsigned loadedPixelSize = 0;
String::Char loadedChar = 0;
}; };
FontPtr Font::loadFont(String const& fileName, unsigned pixelSize) { FontPtr Font::loadFont(String const& fileName, unsigned pixelSize) {
@ -95,20 +97,23 @@ 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 (m_loadedPixelSize != m_pixelSize || m_loadedChar != c) {
if (m_fontImpl->loadedPixelSize != m_pixelSize || m_fontImpl->loadedChar != c) {
FT_UInt glyph_index = FT_Get_Char_Index(face, c); FT_UInt glyph_index = FT_Get_Char_Index(face, c);
if (FT_Load_Glyph(face, glyph_index, FontLoadFlags) != 0) if (FT_Load_Glyph(face, glyph_index, FontLoadFlags) != 0)
return {}; return {};
/* convert to an anti-aliased bitmap */ // convert to an anti-aliased bitmap
if (FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL) != 0) if (FT_Render_Glyph(face->glyph, FT_RENDER_MODE_NORMAL) != 0)
return {}; return {};
} }
m_loadedPixelSize = m_pixelSize; m_fontImpl->loadedPixelSize = m_pixelSize;
m_loadedChar = c; m_fontImpl->loadedChar = c;
FT_GlyphSlot slot = face->glyph; FT_GlyphSlot slot = face->glyph;
if (!slot->bitmap.buffer)
return {};
unsigned width = slot->bitmap.width; unsigned width = slot->bitmap.width;
unsigned height = slot->bitmap.rows; unsigned height = slot->bitmap.rows;

2
source/core/StarFont.hpp
View File

@ -41,8 +41,6 @@ private:
FontImplPtr m_fontImpl; FontImplPtr m_fontImpl;
ByteArrayConstPtr m_fontBuffer; ByteArrayConstPtr m_fontBuffer;
unsigned m_pixelSize; unsigned m_pixelSize;
unsigned m_loadedPixelSize;
String::Char m_loadedChar;
uint8_t m_alphaThreshold; uint8_t m_alphaThreshold;
HashMap<pair<String::Char, unsigned>, unsigned> m_widthCache; HashMap<pair<String::Char, unsigned>, unsigned> m_widthCache;