Sara/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2025-09-18 12:36:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up example code

Browse source
This commit is contained in:
mivirl 2025-05-29 17:16:01 +00:00
parent c09e4b71ab
commit 6d25c03ae1
No known key found for this signature in database
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/termbox2-demo/main.c
View file

@ -796,9 +796,7 @@ int main(void)
Clay_SetMeasureTextFunction(Clay_Termbox_MeasureText, NULL); Clay_SetMeasureTextFunction(Clay_Termbox_MeasureText, NULL);
// Initial render before waiting for events // Initial render before waiting for events
Clay_SetLayoutDimensions((Clay_Dimensions) { Clay_Termbox_Width(), Clay_Termbox_Height() });
Clay_RenderCommandArray commands = CreateLayout(shark_image); Clay_RenderCommandArray commands = CreateLayout(shark_image);
tb_clear();
Clay_Termbox_Render(commands); Clay_Termbox_Render(commands);
tb_present(); tb_present();
@ -809,7 +807,7 @@ int main(void)
handle_termbox_events(); handle_termbox_events();
Clay_RenderCommandArray commands = CreateLayout(shark_image); commands = CreateLayout(shark_image);
tb_clear(); tb_clear();
Clay_Termbox_Render(commands); Clay_Termbox_Render(commands);
@ -818,5 +816,6 @@ int main(void)
Clay_Termbox_Close(); Clay_Termbox_Close();
free_image(shark_image); free_image(shark_image);
free(memory);
return 0; return 0;
} }

44
renderers/termbox2/clay_renderer_termbox2.c
View file

@ -33,18 +33,17 @@
// -- Data structures // -- Data structures
typedef struct { typedef struct {
int width; int width, height;
int height;
} clay_tb_dimensions; } clay_tb_dimensions;
typedef struct { typedef struct {
float width; float width, height;
float height;
} clay_tb_pixel_dimensions; } clay_tb_pixel_dimensions;
typedef struct { typedef struct {
int x, y, width, height; int x, y;
} cell_bounding_box; int width, height;
} clay_tb_cell_bounding_box;
typedef struct { typedef struct {
Clay_Color clay; Clay_Color clay;
@ -244,7 +243,7 @@ static clay_tb_pixel_dimensions clay_tb_cell_size = { .width = 9, .height = 21 }
// Scissor mode prevents drawing outside of the specified bounding box // Scissor mode prevents drawing outside of the specified bounding box
static bool clay_tb_scissor_enabled = false; static bool clay_tb_scissor_enabled = false;
cell_bounding_box clay_tb_scissor_box; clay_tb_cell_bounding_box clay_tb_scissor_box;
// ----------------------------------------------- // -----------------------------------------------
@ -303,7 +302,8 @@ static int clay_tb_rgb_intensity_to_index(int color)
*/ */
static uintattr_t clay_tb_color_convert(Clay_Color color) static uintattr_t clay_tb_color_convert(Clay_Color color)
{ {
clay_tb_assert(clay_tb_valid_color(color), "Invalid Clay color"); clay_tb_assert(clay_tb_valid_color(color), "Invalid Clay color: (%f, %f, %f, %f)", color.r,
color.g, color.b, color.a);
uintattr_t tb_color = TB_DEFAULT; uintattr_t tb_color = TB_DEFAULT;
@ -451,9 +451,9 @@ static inline int clay_tb_roundf(float f)
\param box Bounding box with pixel measurements to convert \param box Bounding box with pixel measurements to convert
*/ */
static inline cell_bounding_box cell_snap_bounding_box(Clay_BoundingBox box) static inline clay_tb_cell_bounding_box cell_snap_bounding_box(Clay_BoundingBox box)
{ {
return (cell_bounding_box) { return (clay_tb_cell_bounding_box) {
.x = clay_tb_roundf(box.x / clay_tb_cell_size.width), .x = clay_tb_roundf(box.x / clay_tb_cell_size.width),
.y = clay_tb_roundf(box.y / clay_tb_cell_size.height), .y = clay_tb_roundf(box.y / clay_tb_cell_size.height),
.width = clay_tb_roundf((box.x + box.width) / clay_tb_cell_size.width) .width = clay_tb_roundf((box.x + box.width) / clay_tb_cell_size.width)
@ -536,7 +536,8 @@ static void clay_tb_resize_buffer(void)
\param x X position of cell \param x X position of cell
\param y Y position of cell \param y Y position of cell
*/ */
static inline color_pair clay_tb_get_transparency_color(int x, int y, color_pair color) static inline clay_tb_color_pair clay_tb_get_transparency_color(
int x, int y, clay_tb_color_pair color)
{ {
if (!clay_tb_transparency) { if (!clay_tb_transparency) {
return color; return color;
@ -550,7 +551,7 @@ static inline color_pair clay_tb_get_transparency_color(int x, int y, color_pair
.a = 255 .a = 255
}; };
return (color_pair) { return (clay_tb_color_pair) {
.clay = new_color, .clay = new_color,
.termbox = clay_tb_color_convert(new_color) .termbox = clay_tb_color_convert(new_color)
}; };
@ -849,7 +850,7 @@ void Clay_Termbox_Render(Clay_RenderCommandArray commands)
clay_tb_resize_buffer(); clay_tb_resize_buffer();
for (int32_t i = 0; i < commands.length; ++i) { for (int32_t i = 0; i < commands.length; ++i) {
const Clay_RenderCommand *command = Clay_RenderCommandArray_Get(&commands, i); const Clay_RenderCommand *command = Clay_RenderCommandArray_Get(&commands, i);
const cell_bounding_box cell_box = cell_snap_bounding_box(command->boundingBox); const clay_tb_cell_bounding_box cell_box = cell_snap_bounding_box(command->boundingBox);
int box_begin_x = CLAY__MAX(cell_box.x, 0); int box_begin_x = CLAY__MAX(cell_box.x, 0);
int box_end_x = CLAY__MIN(cell_box.x + cell_box.width, tb_width()); int box_end_x = CLAY__MIN(cell_box.x + cell_box.width, tb_width());
@ -877,8 +878,8 @@ void Clay_Termbox_Render(Clay_RenderCommandArray commands)
for (int y = box_begin_y; y < box_end_y; ++y) { for (int y = box_begin_y; y < box_end_y; ++y) {
for (int x = box_begin_x; x < box_end_x; ++x) { for (int x = box_begin_x; x < box_end_x; ++x) {
color_pair color_bg_new = clay_tb_get_transparency_color( clay_tb_color_pair color_bg_new = clay_tb_get_transparency_color(
x, y, (color_pair) { color_bg, color_tb_bg }); x, y, (clay_tb_color_pair) { color_bg, color_tb_bg });
clay_tb_set_cell( clay_tb_set_cell(
x, y, ' ', color_tb_fg, color_bg_new.termbox, color_bg_new.clay); x, y, ' ', color_tb_fg, color_bg_new.termbox, color_bg_new.clay);
} }
@ -1017,8 +1018,8 @@ void Clay_Termbox_Render(Clay_RenderCommandArray commands)
} }
} }
color_pair color_bg_new = clay_tb_get_transparency_color( clay_tb_color_pair color_bg_new = clay_tb_get_transparency_color(
x, y, (color_pair) { color_bg, color_tb_bg }); x, y, (clay_tb_color_pair) { color_bg, color_tb_bg });
clay_tb_set_cell( clay_tb_set_cell(
x, y, ch, color_tb_fg, color_bg_new.termbox, color_bg_new.clay); x, y, ch, color_tb_fg, color_bg_new.termbox, color_bg_new.clay);
} }
@ -1042,11 +1043,12 @@ void Clay_Termbox_Render(Clay_RenderCommandArray commands)
} }
i += codepoint_length; i += codepoint_length;
uintattr_t color_tb_bg = (clay_tb_transparency) ? TB_DEFAULT uintattr_t color_tb_bg = (clay_tb_transparency)
? TB_DEFAULT
: clay_tb_color_convert(clay_tb_color_buffer_clay_get(x, y)); : clay_tb_color_convert(clay_tb_color_buffer_clay_get(x, y));
Clay_Color color_bg = { 0 }; Clay_Color color_bg = { 0 };
color_pair color_bg_new = clay_tb_get_transparency_color( clay_tb_color_pair color_bg_new = clay_tb_get_transparency_color(
x, y, (color_pair) { color_bg, color_tb_bg }); x, y, (clay_tb_color_pair) { color_bg, color_tb_bg });
clay_tb_set_cell( clay_tb_set_cell(
x, y, ch, color_tb_fg, color_bg_new.termbox, color_bg_new.clay); x, y, ch, color_tb_fg, color_bg_new.termbox, color_bg_new.clay);
} }
@ -1108,7 +1110,7 @@ void Clay_Termbox_Render(Clay_RenderCommandArray commands)
break; break;
} }
case CLAY_RENDER_COMMAND_TYPE_SCISSOR_START: { case CLAY_RENDER_COMMAND_TYPE_SCISSOR_START: {
clay_tb_scissor_box = (cell_bounding_box) { clay_tb_scissor_box = (clay_tb_cell_bounding_box) {
.x = box_begin_x, .x = box_begin_x,
.y = box_begin_y, .y = box_begin_y,
.width = box_end_x - box_begin_x, .width = box_end_x - box_begin_x,