From b0fe41186c9ee3aeca72009d754c2fc763b16109 Mon Sep 17 00:00:00 2001 From: EmmanuelMess Date: Thu, 26 Dec 2024 15:52:21 -0300 Subject: [PATCH] fix naming conventions, add scissoring --- examples/terminal-example/main.c | 7 +- renderers/terminal/clay_renderer_terminal.c | 94 +++++++++++++++++---- 2 files changed, 82 insertions(+), 19 deletions(-) diff --git a/examples/terminal-example/main.c b/examples/terminal-example/main.c index b36330e..edbf349 100644 --- a/examples/terminal-example/main.c +++ b/examples/terminal-example/main.c @@ -37,16 +37,19 @@ Clay_RenderCommandArray CreateLayout() { } int main() { + const int width = 80; + const int height = 24; + uint64_t totalMemorySize = Clay_MinMemorySize(); Clay_Arena arena = Clay_CreateArenaWithCapacityAndMemory(totalMemorySize, malloc(totalMemorySize)); - Clay_Initialize(arena, (Clay_Dimensions) { .width = 80, .height = 24 }); // TODO this is wrong, but I have no idea what the actual size of the terminal is in pixels + Clay_Initialize(arena, (Clay_Dimensions) { .width = (float) width, .height = (float) height }); // TODO this is wrong, but I have no idea what the actual size of the terminal is in pixels // Tell clay how to measure text Clay_SetMeasureTextFunction(Console_MeasureText); while(true) { Clay_RenderCommandArray layout = CreateLayout(); - Clay_Console_Render(layout); + Clay_Console_Render(layout, width, height); fflush(stdout); sleep(1); diff --git a/renderers/terminal/clay_renderer_terminal.c b/renderers/terminal/clay_renderer_terminal.c index 6ca385b..fb8a650 100644 --- a/renderers/terminal/clay_renderer_terminal.c +++ b/renderers/terminal/clay_renderer_terminal.c @@ -7,9 +7,18 @@ #include "signal.h" #endif -#define gotoxy(x, y) printf("\033[%d;%dH", y+1, x+1) +static inline void Console_MoveCursor(int x, int y) { + printf("\033[%d;%dH", y+1, x+1); +} -static inline void Console_DrawRectangle(int x0, int y0, int width, int height, Clay_Color color) { +bool Clay_PointIsInsideRect(Clay_Vector2 point, Clay_BoundingBox rect) { + // TODO this function is a copy of Clay__PointIsInsideRect but that one is internal, I don't know if we want + // TODO to expose Clay__PointIsInsideRect + return point.x >= rect.x && point.x <= rect.x + rect.width && point.y >= rect.y && point.y <= rect.y + rect.height; +} + +static inline void Console_DrawRectangle(int x0, int y0, int width, int height, Clay_Color color, + Clay_BoundingBox scissorBox) { if (color.r < 127 || color.g < 127 || color.b < 127 || color.a < 127) { // For now there are only two colors, return; @@ -17,7 +26,11 @@ static inline void Console_DrawRectangle(int x0, int y0, int width, int height, for (int y = y0; y < height; y++) { for (int x = x0; x < width; x++) { - gotoxy(x, y); + if(!Clay_PointIsInsideRect((Clay_Vector2) { .x = x, .y = y }, scissorBox)) { + continue; + } + + Console_MoveCursor(x, y); // TODO there are only two colors actually drawn, the background and white if (color.r < 127 || color.g < 127 || color.b < 127 || color.a < 127) { printf(" "); @@ -61,10 +74,19 @@ void Clay_Raylib_Initialize(int width, int height, const char *title, unsigned i //TODO } -void Clay_Console_Render(Clay_RenderCommandArray renderCommands) +void Clay_Console_Render(Clay_RenderCommandArray renderCommands, int width, int height) { printf("\033[H\033[J"); // Clear + const Clay_BoundingBox fullWindow = { + .x = 0, + .y = 0, + .width = (float) width, + .height = (float) height, + }; + + Clay_BoundingBox scissorBox = fullWindow; + for (int j = 0; j < renderCommands.length; j++) { Clay_RenderCommand *renderCommand = Clay_RenderCommandArray_Get(&renderCommands, j); @@ -73,48 +95,84 @@ void Clay_Console_Render(Clay_RenderCommandArray renderCommands) { case CLAY_RENDER_COMMAND_TYPE_TEXT: { Clay_String text = renderCommand->text; - int k = 0; - for (int i = 0; i < text.length; i++) { - if(text.chars[i] == '\n') { - k++; + int y = 0; + for (int x = 0; x < text.length; x++) { + if(text.chars[x] == '\n') { + y++; continue; } - gotoxy((int) boundingBox.x + i, (int) boundingBox.y + k); - printf("%c", text.chars[i]); + int cursorX = (int) boundingBox.x + x; + int cursorY = (int) boundingBox.y + y; + if(!Clay_PointIsInsideRect((Clay_Vector2) { .x = cursorX, .y = cursorY }, scissorBox)) { + continue; + } + + Console_MoveCursor(cursorX, cursorY); + printf("%c", text.chars[x]); } break; } case CLAY_RENDER_COMMAND_TYPE_SCISSOR_START: { - //TODO + scissorBox = boundingBox; break; } case CLAY_RENDER_COMMAND_TYPE_SCISSOR_END: { - //TODO + scissorBox = fullWindow; break; } case CLAY_RENDER_COMMAND_TYPE_RECTANGLE: { Clay_RectangleElementConfig *config = renderCommand->config.rectangleElementConfig; - Console_DrawRectangle((int)boundingBox.x, (int)boundingBox.y, (int)boundingBox.width, (int)boundingBox.height, config->color); + Console_DrawRectangle( + (int)boundingBox.x, + (int)boundingBox.y, + (int)boundingBox.width, + (int)boundingBox.height, + config->color, + scissorBox); break; } case CLAY_RENDER_COMMAND_TYPE_BORDER: { Clay_BorderElementConfig *config = renderCommand->config.borderElementConfig; // Left border if (config->left.width > 0) { - Console_DrawRectangle((int)(boundingBox.x), (int)(boundingBox.y + config->cornerRadius.topLeft), (int)config->left.width, (int)(boundingBox.height - config->cornerRadius.topLeft - config->cornerRadius.bottomLeft), config->left.color); + Console_DrawRectangle( + (int)(boundingBox.x), + (int)(boundingBox.y + config->cornerRadius.topLeft), + (int)config->left.width, + (int)(boundingBox.height - config->cornerRadius.topLeft - config->cornerRadius.bottomLeft), + config->left.color, + scissorBox); } // Right border if (config->right.width > 0) { - Console_DrawRectangle((int)(boundingBox.x + boundingBox.width - config->right.width), (int)(boundingBox.y + config->cornerRadius.topRight), (int)config->right.width, (int)(boundingBox.height - config->cornerRadius.topRight - config->cornerRadius.bottomRight), config->right.color); + Console_DrawRectangle( + (int)(boundingBox.x + boundingBox.width - config->right.width), + (int)(boundingBox.y + config->cornerRadius.topRight), + (int)config->right.width, + (int)(boundingBox.height - config->cornerRadius.topRight - config->cornerRadius.bottomRight), + config->right.color, + scissorBox); } // Top border if (config->top.width > 0) { - Console_DrawRectangle((int)(boundingBox.x + config->cornerRadius.topLeft), (int)(boundingBox.y), (int)(boundingBox.width - config->cornerRadius.topLeft - config->cornerRadius.topRight), (int)config->top.width, config->top.color); + Console_DrawRectangle( + (int)(boundingBox.x + config->cornerRadius.topLeft), + (int)(boundingBox.y), + (int)(boundingBox.width - config->cornerRadius.topLeft - config->cornerRadius.topRight), + (int)config->top.width, + config->top.color, + scissorBox); } // Bottom border if (config->bottom.width > 0) { - Console_DrawRectangle((int)(boundingBox.x + config->cornerRadius.bottomLeft), (int)(boundingBox.y + boundingBox.height - config->bottom.width), (int)(boundingBox.width - config->cornerRadius.bottomLeft - config->cornerRadius.bottomRight), (int)config->bottom.width, config->bottom.color); + Console_DrawRectangle( + (int)(boundingBox.x + config->cornerRadius.bottomLeft), + (int)(boundingBox.y + boundingBox.height - config->bottom.width), + (int)(boundingBox.width - config->cornerRadius.bottomLeft - config->cornerRadius.bottomRight), + (int)config->bottom.width, + config->bottom.color, + scissorBox); } break; } @@ -127,4 +185,6 @@ void Clay_Console_Render(Clay_RenderCommandArray renderCommands) } } } + + Console_MoveCursor(-1, -1); // TODO make the user not be able to write }