Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved the text shaping to a separate function

Browse source
This commit is contained in:
Leon Styhre 2024-08-01 14:34:34 +02:00
parent 412e74738a
commit 84e850a507
2 changed files with 60 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,52 +176,20 @@ TextCache* Font::buildTextCache(const std::string& text,
std::map<FontTexture*, std::vector<Renderer::Vertex>> vertMap;
// Build segments for HarfBuzz.
buildShapeSegments(text);
size_t cursor {0};
size_t length {0};
hb_glyph_info_t* glyphInfo {nullptr};
hb_glyph_position_t* glyphPos {nullptr};
unsigned int glyphCount {0};
if (buildShapeSegments(text))
shapeSegments(text);
for (auto& segment : mSegmentsHB) {
cursor = 0;
length = 0;
if (segment.doShape) {
hb_buffer_reset(mBufHB);
hb_buffer_add_utf8(mBufHB, text.c_str(), text.length(), segment.startPos,
segment.length);
hb_buffer_guess_segment_properties(mBufHB);
hb_shape(segment.fontHB, mBufHB, nullptr, 0);
glyphInfo = hb_buffer_get_glyph_infos(mBufHB, &glyphCount);
glyphPos = hb_buffer_get_glyph_positions(mBufHB, &glyphCount);
length = glyphCount;
}
else {
length = segment.length;
}
while (cursor < length) {
unsigned int character {0};
if (segment.doShape) {
character = glyphInfo[cursor].codepoint;
++cursor;
}
else {
// This also advances the cursor.
character = Utils::String::chars2Unicode(segment.substring, cursor);
}
for (size_t cursor {0}; cursor < segment.glyphIndexes.size(); ++cursor) {
unsigned int character {segment.glyphIndexes[cursor]};
Glyph* glyph {nullptr};
// Invalid character.
if (character == 0)
if (!segment.doShape && character == 0)
continue;
if (character == '\n') {
if (!segment.doShape && character == '\n') {
y += getHeight(lineSpacing);
x = offset[0] +
(xLen != 0 ? getNewlineStartOffset(text,
@ -697,13 +665,13 @@ void Font::initLibrary()
}
}
void Font::buildShapeSegments(const std::string& text)
bool Font::buildShapeSegments(const std::string& text)
{
// Calculate the hash value for the string to make sure we're not building segments
// repeatedly for the same text.
const size_t hashValue {std::hash<std::string> {}(text)};
if (hashValue == mTextHash)
return;
return false;
mTextHash = hashValue;
mSegmentsHB.clear();
@ -767,6 +735,55 @@ void Font::buildShapeSegments(const std::string& text)
}
lastFont = currGlyph->fontHB;
}
return true;
}
void Font::shapeSegments(const std::string& text)
{
if (mSegmentsHB.empty())
return;
size_t cursor {0};
size_t length {0};
hb_glyph_info_t* glyphInfo {nullptr};
hb_glyph_position_t* glyphPos {nullptr};
unsigned int glyphCount {0};
for (auto& segment : mSegmentsHB) {
cursor = 0;
length = 0;
segment.glyphIndexes.clear();
if (segment.doShape) {
hb_buffer_reset(mBufHB);
hb_buffer_add_utf8(mBufHB, text.c_str(), text.length(), segment.startPos,
segment.length);
hb_buffer_guess_segment_properties(mBufHB);
hb_shape(segment.fontHB, mBufHB, nullptr, 0);
glyphInfo = hb_buffer_get_glyph_infos(mBufHB, &glyphCount);
length = glyphCount;
}
else {
length = segment.length;
}
while (cursor < length) {
unsigned int character {0};
if (segment.doShape) {
character = glyphInfo[cursor].codepoint;
++cursor;
}
else {
// This also advances the cursor.
character = Utils::String::chars2Unicode(segment.substring, cursor);
}
segment.glyphIndexes.emplace_back(character);
}
}
}
void Font::rebuildTextures()

4
es-core/src/resources/Font.h
View file

@ -194,6 +194,7 @@ private:
hb_font_t* fontHB;
bool doShape;
std::string substring;
std::vector<unsigned int> glyphIndexes;
ShapeSegment()
: startPos {0}
@ -205,7 +206,8 @@ private:
};
// Builds segments for HarfBuzz.
void buildShapeSegments(const std::string& text);
bool buildShapeSegments(const std::string& text);
void shapeSegments(const std::string& text);
// Completely recreate the texture data for all textures based on mGlyphs information.
void rebuildTextures();