GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

_font cache v2

Browse Source
This commit is contained in:
Ari Vuollet
2023-09-04 22:43:57 +03:00
parent 54761f40fe
commit 43b2348d62
4 changed files with 21 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Engine/Render2D/Font.cpp
View File

@@ -119,7 +119,7 @@ void Font::Invalidate()
_characters.Clear();
}
void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines, const TextLayoutOptions& layout)
void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines, const TextLayoutOptions& layout, Array<FontCharacterEntry>& characterEntries)
{
int32 textLength = text.Length();
if (textLength == 0)
@@ -234,7 +234,7 @@ void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines
break;
}
}
CharacterEntries.Add(entry);
characterEntries.Add(entry);
// Check if move to another line
if (moveLine)
@@ -244,8 +244,6 @@ void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines
tmpLine.Size.Y = baseLinesDistance;
tmpLine.LastCharIndex = Math::Max(tmpLine.LastCharIndex, tmpLine.FirstCharIndex);
outputLines.Add(tmpLine);
outputLines.Last().CharacterEntries.Set(CharacterEntries.Get(), CharacterEntries.Count());
CharacterEntries.Clear();
// Reset line
tmpLine.Location.Y += baseLinesDistance;
@@ -269,8 +267,6 @@ void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines
tmpLine.Size.Y = baseLinesDistance;
tmpLine.LastCharIndex = textLength - 1;
outputLines.Add(tmpLine);
outputLines.Last().CharacterEntries.Set(CharacterEntries.Get(), CharacterEntries.Count());
CharacterEntries.Clear();
tmpLine.Location.Y += baseLinesDistance;
}
@@ -317,7 +313,8 @@ Float2 Font::MeasureText(const StringView& text, const TextLayoutOptions& layout
// Process text
Array<FontLineCache> lines;
ProcessText(text, lines, layout);
Array<FontCharacterEntry> characterEntries;
ProcessText(text, lines, layout, characterEntries);
// Calculate bounds
Float2 max = Float2::Zero;
@@ -338,7 +335,8 @@ int32 Font::HitTestText(const StringView& text, const Float2& location, const Te
// Process text
Array<FontLineCache> lines;
ProcessText(text, lines, layout);
Array<FontCharacterEntry> characterEntries;
ProcessText(text, lines, layout, characterEntries);
ASSERT(lines.HasItems());
float scale = layout.Scale / FontManager::FontScale;
float baseLinesDistance = static_cast<float>(_height) * layout.BaseLinesGapScale * scale;
@@ -412,7 +410,8 @@ Float2 Font::GetCharPosition(const StringView& text, int32 index, const TextLayo
// Process text
Array<FontLineCache> lines;
ProcessText(text, lines, layout);
Array<FontCharacterEntry> characterEntries;
ProcessText(text, lines, layout, characterEntries);
ASSERT(lines.HasItems());
float scale = layout.Scale / FontManager::FontScale;
float baseLinesDistance = static_cast<float>(_height) * layout.BaseLinesGapScale * scale;