qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ui] Add a text color component

Browse source 
Despite the current rendering API taking only byte color, the component
holds a uint32_t to allow for rgba color when I figure out a suitable
API.
This commit is contained in:
Bill Currie 2023-07-04 17:17:16 +09:00
parent 6701f921a4
commit 104fba13a6
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/ui/text.h
View file

@ -77,6 +77,8 @@ enum {
text_passage_glyphs,
// glyphs for a single text object
text_glyphs,
// tint color for glyphs
text_color,
// text_script, text_font and text_features on the passage root object set
// the defaults for all text objects in the passage. The settings can be
// overridden at the paragraph level or individual text object level by

13
libs/ui/canvas.c
View file

@ -343,7 +343,8 @@ draw_outline_views (canvas_system_t *canvas_sys, ecs_pool_t *pool,
}
static void
draw_glyph_refs (view_pos_t *abs, glyphset_t *glyphset, glyphref_t *gref)
draw_glyph_refs (view_pos_t *abs, glyphset_t *glyphset, glyphref_t *gref,
uint32_t color)
{
uint32_t count = gref->count;
glyphobj_t *glyph = glyphset->glyphs + gref->start;
@ -351,7 +352,7 @@ draw_glyph_refs (view_pos_t *abs, glyphset_t *glyphset, glyphref_t *gref)
while (count-- > 0) {
glyphobj_t *g = glyph++;
r_funcs->Draw_Glyph (abs->x + g->x, abs->y + g->y,
g->fontid, g->glyphid, 254);
g->fontid, g->glyphid, color);
}
}
@ -373,6 +374,7 @@ draw_glyphs (canvas_system_t *canvas_sys, ecs_pool_t *pool, ecs_range_t range)
{
auto reg = canvas_sys->reg;
uint32_t glyphs = canvas_sys->text_base + text_glyphs;
uint32_t color = canvas_sys->text_base + text_color;
uint32_t vhref = canvas_sys->view_base + view_href;
uint32_t count = range.end - range.start;
uint32_t *ent = pool->dense + range.start;
@ -384,7 +386,8 @@ draw_glyphs (canvas_system_t *canvas_sys, ecs_pool_t *pool, ecs_range_t range)
if (View_GetVisible (view)) {
view_pos_t abs = View_GetAbs (view);
glyphref_t *gref = Ent_GetComponent (view.id, glyphs, reg);
draw_glyph_refs (&abs, gs, gref);
uint32_t *c = Ent_SafeGetComponent (view.id, color, reg);
draw_glyph_refs (&abs, gs, gref, c ? *c : 254);
}
}
}
@ -395,6 +398,7 @@ draw_passage_glyphs (canvas_system_t *canvas_sys, ecs_pool_t *pool,
{
auto reg = canvas_sys->reg;
uint32_t glyphs = canvas_sys->text_base + text_glyphs;
uint32_t color = canvas_sys->text_base + text_color;
uint32_t vhref = canvas_sys->view_base + view_href;
uint32_t count = range.end - range.start;
uint32_t *ent = pool->dense + range.start;
@ -414,7 +418,8 @@ draw_passage_glyphs (canvas_system_t *canvas_sys, ecs_pool_t *pool,
for (uint32_t i = href->index; i < h->num_objects; i++) {
glyphref_t *gref = Ent_GetComponent (h->ent[i], glyphs, reg);
draw_glyph_refs (&abs[i], gs, gref);
uint32_t *c = Ent_SafeGetComponent (h->ent[i], color, reg);
draw_glyph_refs (&abs[i], gs, gref, c ? *c : 254);
if (0) draw_box (abs, len, i, 253);
}

4
libs/ui/text.c
View file

@ -74,6 +74,10 @@ const component_t text_components[text_comp_count] = {
.size = sizeof (glyphref_t),
.name = "glyphs",
},
[text_color] = {
.size = sizeof (uint32_t),
.name = "color",
},
[text_script] = {
.size = sizeof (script_component_t),
.name = "script",