From 716a26e42c7bd13d631f1c14ebb40a3d27ed816b Mon Sep 17 00:00:00 2001 From: jacob Date: Sat, 24 May 2025 09:09:53 -0500 Subject: [PATCH] allow text color --- src/draw.c | 2 +- src/draw.h | 2 ++ src/user.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/draw.c b/src/draw.c index 67d6c445..f84b00c3 100644 --- a/src/draw.c +++ b/src/draw.c @@ -496,7 +496,7 @@ struct rect draw_text(struct gpu_cmd_buffer *cmdbuff, struct draw_text_params pa f32 x = draw_pos.x + tg->off_x; f32 y = draw_pos.y + tg->off_y; struct quad quad = quad_from_rect(RECT(x, y, tg->width, tg->height)); - draw_quad_texture(cmdbuff, DRAW_TEXTURE_PARAMS(.texture = params.font->texture, .clip = tg->clip, .quad = quad)); + draw_quad_texture(cmdbuff, DRAW_TEXTURE_PARAMS(.texture = params.font->texture, .tint0_srgb = params.color, .tint1_srgb = params.color, .clip = tg->clip, .quad = quad)); draw_pos.x += tg->advance; } diff --git a/src/draw.h b/src/draw.h index e2deddd4..9965313e 100644 --- a/src/draw.h +++ b/src/draw.h @@ -84,6 +84,7 @@ void draw_grid(struct gpu_cmd_buffer *cmdbuff, struct rect rect, u32 bg0_srgb, u .alignment = DRAW_TEXT_ALIGNMENT_LEFT, \ .offset_x = DRAW_TEXT_OFFSET_X_LEFT, \ .offset_y = DRAW_TEXT_OFFSET_Y_TOP, \ + .color = COLOR_WHITE, \ __VA_ARGS__ \ }) @@ -91,6 +92,7 @@ struct draw_text_params { struct font *font; struct v2 pos; f32 scale; + u32 color; enum draw_text_alignment alignment; enum draw_text_offset_x offset_x; enum draw_text_offset_x offset_y; diff --git a/src/user.c b/src/user.c index f564749b..4550d3ed 100644 --- a/src/user.c +++ b/src/user.c @@ -1877,7 +1877,7 @@ INTERNAL void user_update(void) //draw_text(G.ui_cmd_buffer, font, pos, string_format(temp.arena, LIT("blended world entities: %F/%F"), FMT_UINT(G.ss_blended->num_ents_allocated), FMT_UINT(G.ss_blended->num_ents_reserved))); //draw_text(G.ui_cmd_buffer, font, pos, text); - draw_text(G.ui_cmd_buffer, DRAW_TEXT_PARAMS(.font = font, .pos = pos, .str = text, .offset_y = DRAW_TEXT_OFFSET_Y_BOTTOM)); + draw_text(G.ui_cmd_buffer, DRAW_TEXT_PARAMS(.font = font, .pos = pos, .str = text, .offset_y = DRAW_TEXT_OFFSET_Y_BOTTOM, .color = COLOR_WHITE)); arena_temp_end(temp); }