Add minimal SDL2 example

CMakeLists.txt

@@ -8,5 +8,4 @@ if(NOT MSVC)
   add_subdirectory("examples/raylib-sidebar-scrolling-container")
   add_subdirectory("examples/cairo-pdf-rendering")
   add_subdirectory("examples/clay-official-website")
-  add_subdirectory("examples/minimal-sdl2")
 endif()

clay.h

@@ -551,13 +551,13 @@ typedef struct
 } Clay__WarningArray;
 
 Clay__WarningArray Clay__WarningArray_Allocate_Arena(uint32_t capacity, Clay_Arena *arena) {
-    size_t totalSizeBytes = capacity * sizeof(Clay_String);
+    uint64_t totalSizeBytes = capacity * sizeof(Clay_String);
     Clay__WarningArray array = CLAY__INIT(Clay__WarningArray){.capacity = capacity, .length = 0};
-    uintptr_t nextAllocAddress = (uintptr_t)arena->nextAllocation + (uintptr_t)arena->memory;
-    uintptr_t arenaOffsetAligned = nextAllocAddress + (CLAY__ALIGNMENT(Clay_String) - (nextAllocAddress % CLAY__ALIGNMENT(Clay_String)));
-    arenaOffsetAligned -= (uintptr_t)arena->memory;
+    uint64_t nextAllocAddress = (uint64_t)arena->nextAllocation + (uint64_t)arena->memory;
+    uint64_t arenaOffsetAligned = nextAllocAddress + (CLAY__ALIGNMENT(Clay_String) - (nextAllocAddress % CLAY__ALIGNMENT(Clay_String)));
+    arenaOffsetAligned -= (uint64_t)arena->memory;
     if (arenaOffsetAligned + totalSizeBytes <= arena->capacity) {
-        array.internalArray = (Clay__Warning*)((uintptr_t)arena->memory + (uintptr_t)arenaOffsetAligned);
+        array.internalArray = (Clay__Warning*)((uint64_t)arena->memory + (uint64_t)arenaOffsetAligned);
         arena->nextAllocation = arenaOffsetAligned + totalSizeBytes;
     }
     else {
@@ -586,13 +586,13 @@ Clay__Warning *Clay__WarningArray_Add(Clay__WarningArray *array, Clay__Warning i
 
 void* Clay__Array_Allocate_Arena(uint32_t capacity, uint32_t itemSize, uint32_t alignment, Clay_Arena *arena)
 {
-    size_t totalSizeBytes = capacity * itemSize;
-    uintptr_t nextAllocAddress = (uintptr_t)arena->nextAllocation + (uintptr_t)arena->memory;
-    uintptr_t arenaOffsetAligned = nextAllocAddress + (alignment - (nextAllocAddress % alignment));
-    arenaOffsetAligned -= (uintptr_t)arena->memory;
+    uint64_t totalSizeBytes = capacity * itemSize;
+    uint64_t nextAllocAddress = (uint64_t)arena->nextAllocation + (uint64_t)arena->memory;
+    uint64_t arenaOffsetAligned = nextAllocAddress + (alignment - (nextAllocAddress % alignment));
+    arenaOffsetAligned -= (uint64_t)arena->memory;
     if (arenaOffsetAligned + totalSizeBytes <= arena->capacity) {
         arena->nextAllocation = arenaOffsetAligned + totalSizeBytes;
-        return (void*)((uintptr_t)arena->memory + (uintptr_t)arenaOffsetAligned);
+        return (void*)((uint64_t)arena->memory + (uint64_t)arenaOffsetAligned);
     }
     else {
         if (Clay__warningsEnabled) {
@@ -1043,7 +1043,7 @@ Clay_RenderCommand *Clay_RenderCommandArray_Add(Clay_RenderCommandArray *array,
 	}
 	return &CLAY__RENDER_COMMAND_DEFAULT;
 }
-Clay_RenderCommand *Clay_RenderCommandArray_Get(Clay_RenderCommandArray *array, int32_t index) {
+Clay_RenderCommand *Clay_RenderCommandArray_Get(Clay_RenderCommandArray *array, int index) {
     return Clay__Array_RangeCheck(index, array->length) ? &array->internalArray[index] : &CLAY__RENDER_COMMAND_DEFAULT;
 }
 #pragma endregion
@@ -1546,7 +1546,7 @@ uint32_t Clay__RehashWithNumber(uint32_t id, uint32_t number) {
 
 uint32_t Clay__HashTextWithConfig(Clay_String *text, Clay_TextElementConfig *config) {
     uint32_t hash = 0;
-    uintptr_t pointerAsNumber = (uintptr_t)text->chars;
+    uint64_t pointerAsNumber = (uint64_t)text->chars;
 
     hash += pointerAsNumber;
     hash += (hash << 10);
@@ -2881,14 +2881,14 @@ void Clay__AttachElementConfig(Clay_ElementConfigUnion config, Clay__ElementConf
     openLayoutElement->elementConfigs.length++;
     Clay__ElementConfigArray_Add(&Clay__elementConfigBuffer, CLAY__INIT(Clay_ElementConfig) { .type = type, .config = config });
 }
-Clay_LayoutConfig * Clay__StoreLayoutConfig(Clay_LayoutConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY_LAYOUT_DEFAULT : Clay__LayoutConfigArray_Add(&Clay__layoutConfigs, config); }
-Clay_RectangleElementConfig * Clay__StoreRectangleElementConfig(Clay_RectangleElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__RECTANGLE_ELEMENT_CONFIG_DEFAULT : Clay__RectangleElementConfigArray_Add(&Clay__rectangleElementConfigs, config); }
-Clay_TextElementConfig * Clay__StoreTextElementConfig(Clay_TextElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__TEXT_ELEMENT_CONFIG_DEFAULT : Clay__TextElementConfigArray_Add(&Clay__textElementConfigs, config); }
-Clay_ImageElementConfig * Clay__StoreImageElementConfig(Clay_ImageElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__IMAGE_ELEMENT_CONFIG_DEFAULT : Clay__ImageElementConfigArray_Add(&Clay__imageElementConfigs, config); }
-Clay_FloatingElementConfig * Clay__StoreFloatingElementConfig(Clay_FloatingElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__FLOATING_ELEMENT_CONFIG_DEFAULT : Clay__FloatingElementConfigArray_Add(&Clay__floatingElementConfigs, config); }
-Clay_CustomElementConfig * Clay__StoreCustomElementConfig(Clay_CustomElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__CUSTOM_ELEMENT_CONFIG_DEFAULT : Clay__CustomElementConfigArray_Add(&Clay__customElementConfigs, config); }
-Clay_ScrollElementConfig * Clay__StoreScrollElementConfig(Clay_ScrollElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__SCROLL_ELEMENT_CONFIG_DEFAULT : Clay__ScrollElementConfigArray_Add(&Clay__scrollElementConfigs, config); }
-Clay_BorderElementConfig * Clay__StoreBorderElementConfig(Clay_BorderElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__BORDER_ELEMENT_CONFIG_DEFAULT : Clay__BorderElementConfigArray_Add(&Clay__borderElementConfigs, config); }
+inline Clay_LayoutConfig * Clay__StoreLayoutConfig(Clay_LayoutConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY_LAYOUT_DEFAULT : Clay__LayoutConfigArray_Add(&Clay__layoutConfigs, config); }
+inline Clay_RectangleElementConfig * Clay__StoreRectangleElementConfig(Clay_RectangleElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__RECTANGLE_ELEMENT_CONFIG_DEFAULT : Clay__RectangleElementConfigArray_Add(&Clay__rectangleElementConfigs, config); }
+inline Clay_TextElementConfig * Clay__StoreTextElementConfig(Clay_TextElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__TEXT_ELEMENT_CONFIG_DEFAULT : Clay__TextElementConfigArray_Add(&Clay__textElementConfigs, config); }
+inline Clay_ImageElementConfig * Clay__StoreImageElementConfig(Clay_ImageElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__IMAGE_ELEMENT_CONFIG_DEFAULT : Clay__ImageElementConfigArray_Add(&Clay__imageElementConfigs, config); }
+inline Clay_FloatingElementConfig * Clay__StoreFloatingElementConfig(Clay_FloatingElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__FLOATING_ELEMENT_CONFIG_DEFAULT : Clay__FloatingElementConfigArray_Add(&Clay__floatingElementConfigs, config); }
+inline Clay_CustomElementConfig * Clay__StoreCustomElementConfig(Clay_CustomElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__CUSTOM_ELEMENT_CONFIG_DEFAULT : Clay__CustomElementConfigArray_Add(&Clay__customElementConfigs, config); }
+inline Clay_ScrollElementConfig * Clay__StoreScrollElementConfig(Clay_ScrollElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__SCROLL_ELEMENT_CONFIG_DEFAULT : Clay__ScrollElementConfigArray_Add(&Clay__scrollElementConfigs, config); }
+inline Clay_BorderElementConfig * Clay__StoreBorderElementConfig(Clay_BorderElementConfig config) {  return Clay__debugMaxElementsLatch ? &CLAY__BORDER_ELEMENT_CONFIG_DEFAULT : Clay__BorderElementConfigArray_Add(&Clay__borderElementConfigs, config); }
 
 #pragma region DebugTools
 Clay_Color CLAY__DEBUGVIEW_COLOR_1 = CLAY__INIT(Clay_Color) {58, 56, 52, 255};
@@ -3211,7 +3211,7 @@ void Clay__RenderDebugView() {
             CLAY(CLAY_LAYOUT({ .sizing = {CLAY_SIZING_GROW({}), CLAY_SIZING_GROW({})}, .layoutDirection = CLAY_TOP_TO_BOTTOM }), CLAY_RECTANGLE({ .color = ((initialElementsLength + initialRootsLength) & 1) == 0 ? CLAY__DEBUGVIEW_COLOR_2 : CLAY__DEBUGVIEW_COLOR_1 })) {
                 Clay_ElementId panelContentsId = Clay__HashString(CLAY_STRING("Clay__DebugViewPaneOuter"), 0, 0);
                 // Element list
-                CLAY(Clay__AttachId(panelContentsId), CLAY_LAYOUT({ .sizing = {CLAY_SIZING_GROW({}), CLAY_SIZING_GROW({})} }), CLAY_FLOATING({ .pointerCaptureMode = CLAY_POINTER_CAPTURE_MODE_PASSTHROUGH })) {
+                CLAY(Clay__AttachId(panelContentsId), CLAY_LAYOUT({ .sizing = {CLAY_SIZING_GROW({}), CLAY_SIZING_GROW({})} }), CLAY_FLOATING({})) {
                     CLAY(CLAY_LAYOUT({ .sizing = {CLAY_SIZING_GROW({}), CLAY_SIZING_GROW({})}, .padding = {.x = CLAY__DEBUGVIEW_OUTER_PADDING }, .layoutDirection = CLAY_TOP_TO_BOTTOM })) {
                         layoutData = Clay__RenderDebugLayoutElementsList((int32_t)initialRootsLength, highlightedRow);
                     }

examples/minimal-sdl2/CMakeLists.txt

@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.27)
 project(minimal_sdl2 C)
 set(CMAKE_C_STANDARD 99)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
+
 include(FetchContent)
 set(FETCHCONTENT_QUIET FALSE)
 
@@ -28,11 +30,7 @@ add_executable(minimal_sdl2 main.c)
 target_compile_options(minimal_sdl2 PUBLIC)
 target_include_directories(minimal_sdl2 PUBLIC .)
 
-target_link_libraries(minimal_sdl2 PUBLIC
-    SDL2::SDL2main
-    SDL2::SDL2-static
-    SDL2_ttf::SDL2_ttf-static
-)
+target_link_libraries(minimal_sdl2 PUBLIC SDL2 SDL2_ttf)
 set(CMAKE_CXX_FLAGS_DEBUG "-Wall -Werror -DCLAY_DEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 

examples/minimal-sdl2/main.c

@@ -21,9 +21,9 @@ static void Label(Clay_String text) {
         CLAY_RECTANGLE({ .color = Clay_Hovered() ? COLOR_BLUE : COLOR_ORANGE })
     ) {
         CLAY_TEXT(text, CLAY_TEXT_CONFIG({
-            .textColor = { 255, 255, 255, 255 },
             .fontId = FONT_ID_BODY_24,
             .fontSize = 24,
+            .textColor = { 255, 255, 255, 255 },
         }));
     }
 }
@@ -60,8 +60,8 @@ typedef struct
 static Font fonts[1];
 
 
-static Clay_Dimensions MeasureText(Clay_String *text, Clay_TextElementConfig *config);
-static void Render(SDL_Renderer *renderer, Clay_RenderCommandArray renderCommands);
+static Clay_Dimensions measureText(Clay_String *text, Clay_TextElementConfig *config);
+static void render(SDL_Renderer *renderer, Clay_RenderCommandArray renderCommands);
 
 
 int main(void) {
@@ -80,8 +80,8 @@ int main(void) {
         return 1;
     }
     fonts[FONT_ID_BODY_24] = (Font) {
-        .fontId = FONT_ID_BODY_24,
         .font = font,
+        .fontId = FONT_ID_BODY_24,
     };
 
     SDL_Window *window = NULL;
@@ -93,16 +93,16 @@ int main(void) {
     uint64_t totalMemorySize = Clay_MinMemorySize();
     Clay_Arena clayMemory = (Clay_Arena) {
         .label = CLAY_STRING("Clay Memory Arena"),
+        .memory = malloc(totalMemorySize),
         .capacity = totalMemorySize,
-        .memory = (char *)malloc(totalMemorySize),
     };
 
-    Clay_SetMeasureTextFunction(MeasureText);
+    Clay_SetMeasureTextFunction(measureText);
 
     int windowWidth = 0;
     int windowHeight = 0;
     SDL_GetWindowSize(window, &windowWidth, &windowHeight);
-    Clay_Initialize(clayMemory, (Clay_Dimensions) { (float)windowWidth, (float)windowHeight });
+    Clay_Initialize(clayMemory, (Clay_Dimensions) { windowWidth, windowHeight });
 
     while (true) {
         SDL_Event event;
@@ -114,17 +114,17 @@ int main(void) {
         int mouseX = 0;
         int mouseY = 0;
         Uint32 mouseState = SDL_GetMouseState(&mouseX, &mouseY);
-        Clay_Vector2 mousePosition = (Clay_Vector2){ (float)mouseX, (float)mouseY };
-        Clay_SetPointerState(mousePosition, mouseState & SDL_BUTTON(1));
+        Clay_Vector2 mousePosition = (Clay_Vector2){ mouseX, mouseY };
+        Clay_SetPointerState((Clay_Vector2){ mouseX, mouseY }, mouseState & SDL_BUTTON(1));
         
         SDL_GetWindowSize(window, &windowWidth, &windowHeight);
-        Clay_SetLayoutDimensions((Clay_Dimensions) { (float)windowWidth, (float)windowHeight });
+        Clay_SetLayoutDimensions((Clay_Dimensions) { windowWidth, windowHeight });
 
         Clay_RenderCommandArray renderCommands = CreateLayout();
         SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
         SDL_RenderClear(renderer);
 
-        Render(renderer, renderCommands);
+        render(renderer, renderCommands);
 
         SDL_RenderPresent(renderer);
     }
@@ -138,7 +138,7 @@ quit:
 }
 
 
-static Clay_Dimensions MeasureText(Clay_String *text, Clay_TextElementConfig *config)
+static Clay_Dimensions measureText(Clay_String *text, Clay_TextElementConfig *config)
 {
     TTF_Font *font = fonts[config->fontId].font;
     char *chars = (char *)calloc(text->length + 1, 1);
@@ -154,13 +154,13 @@ static Clay_Dimensions MeasureText(Clay_String *text, Clay_TextElementConfig *co
     }
     free(chars);
     return (Clay_Dimensions) {
-        .width = (float)width,
-        .height = (float)height,
+        .width = width,
+        .height = height,
     };
 }
 
 
-static void Render(SDL_Renderer *renderer, Clay_RenderCommandArray renderCommands)
+static void render(SDL_Renderer *renderer, Clay_RenderCommandArray renderCommands)
 {
     for (uint32_t i = 0; i < renderCommands.length; i++)
     {
@@ -188,18 +188,18 @@ static void Render(SDL_Renderer *renderer, Clay_RenderCommandArray renderCommand
                 memcpy(cloned, text.chars, text.length);
                 TTF_Font* font = fonts[config->fontId].font;
                 SDL_Surface *surface = TTF_RenderUTF8_Blended(font, cloned, (SDL_Color) {
-                    .r = (Uint8)config->textColor.r,
-                    .g = (Uint8)config->textColor.g,
-                    .b = (Uint8)config->textColor.b,
-                    .a = (Uint8)config->textColor.a,
+                    .r = config->textColor.r,
+                    .g = config->textColor.g,
+                    .b = config->textColor.b,
+                    .a = config->textColor.a,
                 });
                 SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
 
                 SDL_Rect destination = (SDL_Rect){
-                    .x = (Uint8)boundingBox.x,
-                    .y = (Uint8)boundingBox.y,
-                    .w = (Uint8)boundingBox.width,
-                    .h = (Uint8)boundingBox.height,
+                    .x = boundingBox.x,
+                    .y = boundingBox.y,
+                    .w = boundingBox.width,
+                    .h = boundingBox.height,
                 };
                 SDL_RenderCopy(renderer, texture, NULL, &destination);