alema/ugui.c3l
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better font atlas implementation

Browse source
This commit is contained in:
Alessandro Mauri 2024-12-15 21:39:26 +01:00
parent 5a89e9ec7d
commit 6d8300f9d9
7 changed files with 170 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/ugui_text.c3
View file

@ -18,7 +18,7 @@ fn Codepoint str_to_codepoint(char[] str, usz* off)
return cp;
}
fn Rect! Ctx.get_text_bounds(&ctx, String text, bool* update_atlas)
fn Rect! Ctx.get_text_bounds(&ctx, String text)
{
Rect text_bounds;
short line_height = (short)ctx.font.ascender - (short)ctx.font.descender;
@ -34,9 +34,8 @@ fn Rect! Ctx.get_text_bounds(&ctx, String text, bool* update_atlas)
off += x;
bool n;
if (!ascii::is_cntrl((char)cp)) {
gp = ctx.font.get_glyph(cp, &n)!;
gp = ctx.font.get_glyph(cp)!;
line_len += gp.adv;
if (n) { *update_atlas = true; }
} else if (cp == '\n'){
text_bounds.h += line_height + line_gap;
line_len = 0;
@ -67,10 +66,9 @@ fn void! Ctx.text_unbounded(&ctx, String label, String text)
short baseline = (short)ctx.font.ascender;
short line_height = (short)ctx.font.ascender - (short)ctx.font.descender;
short line_gap = (short)ctx.font.linegap;
bool update_atlas;
// if the element is new or the parent was updated then redo layout
if (c_elem.flags.is_new || parent.flags.updated) {
Rect text_size = ctx.get_text_bounds(text, &update_atlas)!;
Rect text_size = ctx.get_text_bounds(text)!;
// 2. Layout
c_elem.bounds = ctx.position_element(parent, text_size, true);
@ -79,25 +77,5 @@ fn void! Ctx.text_unbounded(&ctx, String label, String text)
c_elem.text.str = text;
}
if (update_atlas) {
// FIXME: atlas here is hardcoded, look at the todo in ugui_data
Cmd up = {
.type = CMD_UPDATE_ATLAS,
.update_atlas = {
.raw_buffer = ctx.font.atlas[0].buffer,
.width = ctx.font.atlas[0].width,
.height = ctx.font.atlas[0].height,
},
};
ctx.cmd_queue.enqueue(&up)!;
}
Cmd bounds = {
.type = CMD_RECT,
.rect.rect = c_elem.bounds,
.rect.color = uint_to_rgba(0x000000ff),
};
ctx.cmd_queue.enqueue(&bounds)!;
ctx.push_string(c_elem.bounds, text)!;
}