Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-31 04:25:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Changed Font::shapeText() to pass the segments vector by reference

Browse source
This commit is contained in:
Leon Styhre 2024-08-04 11:31:03 +02:00
parent 5d653a9e93
commit 14c4e00bf2
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,8 @@ glm::vec2 Font::sizeText(std::string text, float lineSpacing)
float highestWidth {0.0f};
float y {lineHeight};
std::vector<ShapeSegment> segmentsHB {std::move(shapeText(text))};
std::vector<ShapeSegment> segmentsHB;
shapeText(text, segmentsHB);
for (auto& segment : segmentsHB) {
for (size_t i {0}; i < segment.glyphIndexes.size(); ++i) {
@ -135,7 +136,8 @@ int Font::loadGlyphs(const std::string& text)
{
mMaxGlyphHeight = static_cast<int>(std::round(mFontSize));
std::vector<ShapeSegment> segmentsHB {std::move(shapeText(text))};
std::vector<ShapeSegment> segmentsHB;
shapeText(text, segmentsHB);
for (auto& segment : segmentsHB) {
for (size_t i {0}; i < segment.glyphIndexes.size(); ++i) {
@ -196,7 +198,8 @@ TextCache* Font::buildTextCache(const std::string& text,
// Vertices by texture.
std::map<FontTexture*, std::vector<Renderer::Vertex>> vertMap;
std::vector<ShapeSegment> segmentsHB {std::move(shapeText(text))};
std::vector<ShapeSegment> segmentsHB;
shapeText(text, segmentsHB);
for (auto& segment : segmentsHB) {
for (size_t cursor {0}; cursor < segment.glyphIndexes.size(); ++cursor) {
@ -327,7 +330,8 @@ std::string Font::wrapText(const std::string& text,
bool addEllipsis {false};
float totalWidth {0.0f};
std::vector<ShapeSegment> segmentsHB {std::move(shapeText(text))};
std::vector<ShapeSegment> segmentsHB;
shapeText(text, segmentsHB);
// This should capture a lot of short strings, which are only a single segment.
if (!multiLine && segmentsHB.size() == 1 && segmentsHB.front().shapedWidth <= maxLength)
@ -476,7 +480,8 @@ glm::vec2 Font::getWrappedTextCursorOffset(const std::string& wrappedText,
size_t cursor {0};
// TODO: Enable this code when shaped text is properly wrapped in wrapText().
// std::vector<ShapeSegment> segmentsHB {std::move(shapeText(wrappedText))};
// std::vector<ShapeSegment> segmentsHB;
// shapeText(wrappedText, segmentsHB);
// size_t totalPos {0};
// for (auto& segment : segmentsHB) {
@ -740,9 +745,8 @@ void Font::initLibrary()
}
}
std::vector<Font::ShapeSegment> Font::shapeText(const std::string& text)
void Font::shapeText(const std::string& text, std::vector<ShapeSegment>& segmentsHB)
{
std::vector<ShapeSegment> segmentsHB;
hb_font_t* lastFont {nullptr};
size_t lastCursor {0};
size_t byteLength {0};
@ -813,7 +817,7 @@ std::vector<Font::ShapeSegment> Font::shapeText(const std::string& text)
}
if (segmentsHB.empty())
return segmentsHB;
return;
size_t cursor {0};
size_t length {0};
@ -870,8 +874,6 @@ std::vector<Font::ShapeSegment> Font::shapeText(const std::string& text)
}
}
}
return segmentsHB;
}
void Font::rebuildTextures()

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

@ -210,7 +210,7 @@ private:
};
// Shape text using HarfBuzz.
std::vector<ShapeSegment> shapeText(const std::string& text);
void shapeText(const std::string& text, std::vector<ShapeSegment>& segmentsHB);
// Completely recreate the texture data for all textures based on mGlyphs information.
void rebuildTextures();