godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[TextServer] Fix long selection performance.

This commit is contained in:
bruvzg 2022-04-11 11:37:38 +03:00
parent 83d2673772
commit 75eec38772
No known key found for this signature in database
GPG Key ID: 7960FCF39844EC38
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
servers/text_server.cpp
View File

@ -979,6 +979,14 @@ TextServer::Direction TextServer::shaped_text_get_dominant_direction_in_range(co
} }
} }
_FORCE_INLINE_ void _push_range(Vector<Vector2> &r_vector, real_t p_start, real_t p_end) {
if (!r_vector.is_empty() && Math::is_equal_approx(r_vector[r_vector.size() - 1].y, p_start, (real_t)UNIT_EPSILON)) {
r_vector.write[r_vector.size() - 1].y = p_end;
} else {
r_vector.push_back(Vector2(p_start, p_end));
}
}
Vector<Vector2> TextServer::shaped_text_get_selection(const RID &p_shaped, int64_t p_start, int64_t p_end) const { Vector<Vector2> TextServer::shaped_text_get_selection(const RID &p_shaped, int64_t p_start, int64_t p_end) const {
Vector<Vector2> ranges; Vector<Vector2> ranges;
@ -1003,7 +1011,7 @@ Vector<Vector2> TextServer::shaped_text_get_selection(const RID &p_shaped, int64
for (int j = 0; j < glyphs[i].count; j++) { for (int j = 0; j < glyphs[i].count; j++) {
advance += glyphs[i + j].advance; advance += glyphs[i + j].advance;
} }
ranges.push_back(Vector2(off, off + advance)); _push_range(ranges, off, off + advance);
} }
// Only start of grapheme is in selection range. // Only start of grapheme is in selection range.
if (glyphs[i].start >= start && glyphs[i].end > end) { if (glyphs[i].start >= start && glyphs[i].end > end) {
@ -1013,9 +1021,9 @@ Vector<Vector2> TextServer::shaped_text_get_selection(const RID &p_shaped, int64
} }
real_t char_adv = advance / (real_t)(glyphs[i].end - glyphs[i].start); real_t char_adv = advance / (real_t)(glyphs[i].end - glyphs[i].start);
if ((glyphs[i].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) { if ((glyphs[i].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) {
ranges.push_back(Vector2(off + char_adv * (glyphs[i].end - end), off + advance)); _push_range(ranges, off + char_adv * (glyphs[i].end - end), off + advance);
} else { } else {
ranges.push_back(Vector2(off, off + char_adv * (end - glyphs[i].start))); _push_range(ranges, off, off + char_adv * (end - glyphs[i].start));
} }
} }
// Only end of grapheme is in selection range. // Only end of grapheme is in selection range.
@ -1026,9 +1034,9 @@ Vector<Vector2> TextServer::shaped_text_get_selection(const RID &p_shaped, int64
} }
real_t char_adv = advance / (real_t)(glyphs[i].end - glyphs[i].start); real_t char_adv = advance / (real_t)(glyphs[i].end - glyphs[i].start);
if ((glyphs[i].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) { if ((glyphs[i].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) {
ranges.push_back(Vector2(off, off + char_adv * (glyphs[i].end - start))); _push_range(ranges, off, off + char_adv * (glyphs[i].end - start));
} else { } else {
ranges.push_back(Vector2(off + char_adv * (start - glyphs[i].start), off + advance)); _push_range(ranges, off + char_adv * (start - glyphs[i].start), off + advance);
} }
} }
// Selection range is within grapheme. // Selection range is within grapheme.
@ -1039,9 +1047,9 @@ Vector<Vector2> TextServer::shaped_text_get_selection(const RID &p_shaped, int64
} }
real_t char_adv = advance / (real_t)(glyphs[i].end - glyphs[i].start); real_t char_adv = advance / (real_t)(glyphs[i].end - glyphs[i].start);
if ((glyphs[i].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) { if ((glyphs[i].flags & GRAPHEME_IS_RTL) == GRAPHEME_IS_RTL) {
ranges.push_back(Vector2(off + char_adv * (glyphs[i].end - end), off + char_adv * (glyphs[i].end - start))); _push_range(ranges, off + char_adv * (glyphs[i].end - end), off + char_adv * (glyphs[i].end - start));
} else { } else {
ranges.push_back(Vector2(off + char_adv * (start - glyphs[i].start), off + char_adv * (end - glyphs[i].start))); _push_range(ranges, off + char_adv * (start - glyphs[i].start), off + char_adv * (end - glyphs[i].start));
} }
} }
} }
@ -1050,25 +1058,6 @@ Vector<Vector2> TextServer::shaped_text_get_selection(const RID &p_shaped, int64
} }
} }
// Merge intersecting ranges.
int i = 0;
while (i < ranges.size()) {
i++;
}
i = 0;
while (i < ranges.size()) {
int j = i + 1;
while (j < ranges.size()) {
if (Math::is_equal_approx(ranges[i].y, ranges[j].x, (real_t)UNIT_EPSILON)) {
ranges.write[i].y = ranges[j].y;
ranges.remove_at(j);
continue;
}
j++;
}
i++;
}
return ranges; return ranges;
} }