Mirrors/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2026-07-26 04:48:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partial commit

Browse source
This commit is contained in:
Nic Barker 2026-02-23 17:07:46 +11:00
parent a5839fe95d
commit 65726b527f
2 changed files with 122 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

146
clay.h
View file

@ -1024,6 +1024,11 @@ arrayName arrayName##_Allocate_Arena(int32_t capacity, Clay_Arena *arena) {
.internalArray = (typeName *)Clay__Array_Allocate_Arena(capacity, sizeof(typeName), arena)}; \
} \
\
arrayName arrayName##_Allocate_Arena_InitialLength(int32_t capacity, int32_t length, Clay_Arena *arena) { \
return CLAY__INIT(arrayName){.capacity = capacity, .length = 0, \
.internalArray = (typeName *)Clay__Array_Allocate_Arena(capacity, sizeof(typeName), arena)}; \
} \
\
typeName *arrayName##_Get(arrayName *array, int32_t index) { \
return Clay__Array_RangeCheck(index, array->length) ? &array->internalArray[index] : &typeName##_DEFAULT; \
} \
@ -1293,6 +1298,8 @@ CLAY__ARRAY_DEFINE(Clay__LayoutElementTreeRoot, Clay__LayoutElementTreeRootArray
struct Clay_Context {
int32_t maxElementCount;
int32_t maxMeasureTextCacheWordCount;
int32_t transitionOutWaitingCount;
int32_t transitionOutActiveCount;
bool warningsEnabled;
Clay_ErrorHandler errorHandler;
Clay_BooleanWarnings booleanWarnings;
@ -1780,6 +1787,15 @@ bool Clay__PointIsInsideRect(Clay_Vector2 point, Clay_BoundingBox rect) {
return point.x >= rect.x && point.x <= rect.x + rect.width && point.y >= rect.y && point.y <= rect.y + rect.height;
}
bool Clay__ElementHasConfig(Clay_LayoutElement *layoutElement, Clay__ElementConfigType type) {
for (int32_t i = 0; i < layoutElement->elementConfigs.length; i++) {
if (Clay__ElementConfigArraySlice_Get(&layoutElement->elementConfigs, i)->type == type) {
return true;
}
}
return false;
}
Clay_LayoutElementHashMapItem* Clay__AddHashMapItem(Clay_ElementId elementId, Clay_LayoutElement* layoutElement) {
Clay_Context* context = Clay_GetCurrentContext();
if (context->layoutElementsHashMapInternal.length == context->layoutElementsHashMapInternal.capacity - 1) {
@ -1849,15 +1865,6 @@ Clay_ElementId Clay__GenerateIdForAnonymousElement(Clay_LayoutElement *openLayou
return elementId;
}
bool Clay__ElementHasConfig(Clay_LayoutElement *layoutElement, Clay__ElementConfigType type) {
for (int32_t i = 0; i < layoutElement->elementConfigs.length; i++) {
if (Clay__ElementConfigArraySlice_Get(&layoutElement->elementConfigs, i)->type == type) {
return true;
}
}
return false;
}
void Clay__UpdateAspectRatioBox(Clay_LayoutElement *layoutElement) {
for (int32_t j = 0; j < layoutElement->elementConfigs.length; j++) {
Clay_ElementConfig *config = Clay__ElementConfigArraySlice_Get(&layoutElement->elementConfigs, j);
@ -2269,29 +2276,30 @@ void Clay__InitializeEphemeralMemory(Clay_Context* context) {
arena->nextAllocation = context->arenaResetOffset;
context->layoutElementChildrenBuffer = Clay__int32_tArray_Allocate_Arena(maxElementCount, arena);
context->layoutElements = Clay_LayoutElementArray_Allocate_Arena(maxElementCount, arena);
int32_t transitionOutTotalCount = context->transitionOutActiveCount + context->transitionOutWaitingCount;
context->layoutElements = Clay_LayoutElementArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->warnings = Clay__WarningArray_Allocate_Arena(100, arena);
context->layoutConfigs = Clay__LayoutConfigArray_Allocate_Arena(maxElementCount, arena);
context->elementConfigs = Clay__ElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->textElementConfigs = Clay__TextElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->aspectRatioElementConfigs = Clay__AspectRatioElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->imageElementConfigs = Clay__ImageElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->floatingElementConfigs = Clay__FloatingElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->clipElementConfigs = Clay__ClipElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->customElementConfigs = Clay__CustomElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->borderElementConfigs = Clay__BorderElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->transitionElementConfigs = Clay__TransitionElementConfigsArray_Allocate_Arena(maxElementCount, arena);
context->sharedElementConfigs = Clay__SharedElementConfigArray_Allocate_Arena(maxElementCount, arena);
context->layoutConfigs = Clay__LayoutConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->elementConfigs = Clay__ElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->textElementConfigs = Clay__TextElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->aspectRatioElementConfigs = Clay__AspectRatioElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->imageElementConfigs = Clay__ImageElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->floatingElementConfigs = Clay__FloatingElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->clipElementConfigs = Clay__ClipElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->customElementConfigs = Clay__CustomElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->borderElementConfigs = Clay__BorderElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->transitionElementConfigs = Clay__TransitionElementConfigsArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->sharedElementConfigs = Clay__SharedElementConfigArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->layoutElementIdStrings = Clay__StringArray_Allocate_Arena(maxElementCount, arena);
context->wrappedTextLines = Clay__WrappedTextLineArray_Allocate_Arena(maxElementCount, arena);
context->layoutElementTreeNodeArray1 = Clay__LayoutElementTreeNodeArray_Allocate_Arena(maxElementCount, arena);
context->layoutElementTreeRoots = Clay__LayoutElementTreeRootArray_Allocate_Arena(maxElementCount, arena);
context->layoutElementChildren = Clay__int32_tArray_Allocate_Arena(maxElementCount, arena);
context->openLayoutElementStack = Clay__int32_tArray_Allocate_Arena(maxElementCount, arena);
context->textElementData = Clay__TextElementDataArray_Allocate_Arena(maxElementCount, arena);
context->aspectRatioElementIndexes = Clay__int32_tArray_Allocate_Arena(maxElementCount, arena);
context->layoutElementIdStrings = Clay__StringArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->wrappedTextLines = Clay__WrappedTextLineArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->layoutElementTreeNodeArray1 = Clay__LayoutElementTreeNodeArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->layoutElementTreeRoots = Clay__LayoutElementTreeRootArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->layoutElementChildren = Clay__int32_tArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->openLayoutElementStack = Clay__int32_tArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->textElementData = Clay__TextElementDataArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->aspectRatioElementIndexes = Clay__int32_tArray_Allocate_Arena_InitialLength(maxElementCount, transitionOutTotalCount, arena);
context->renderCommands = Clay_RenderCommandArray_Allocate_Arena(maxElementCount, arena);
context->treeNodeVisited = Clay__boolArray_Allocate_Arena(maxElementCount, arena);
context->treeNodeVisited.length = context->treeNodeVisited.capacity; // This array is accessed directly rather than behaving as a list
@ -2611,7 +2619,7 @@ bool Clay__ElementIsOffscreen(Clay_BoundingBox *boundingBox) {
(boundingBox->y + boundingBox->height < 0);
}
Clay_TransitionData Clay__GetTransitionDataForElement(Clay_BoundingBox *boundingBox, Clay_LayoutElement* layoutElement) {
Clay_TransitionData Clay__CreateTransitionDataForElement(Clay_BoundingBox *boundingBox, Clay_LayoutElement* layoutElement) {
Clay_SharedElementConfig *shared = Clay__FindElementConfigWithType(layoutElement, CLAY__ELEMENT_CONFIG_TYPE_SHARED).sharedElementConfig;
Clay_TransitionData transitionData = {
.boundingBox = *boundingBox,
@ -2909,12 +2917,11 @@ void Clay__CalculateFinalLayout(float deltaTime) {
if (hashMapItem) {
if (Clay__ElementHasConfig(currentElement, CLAY__ELEMENT_CONFIG_TYPE_TRANSITION)) {
Clay_TransitionElementConfigs *transitionElementConfigs = Clay__FindElementConfigWithType(currentElement, CLAY__ELEMENT_CONFIG_TYPE_TRANSITION).transitionElementConfig;
// This linear scan could theoretically be slow under very strange conditions, but I can't imagine a real UI with more than a few 10's of scroll containers
for (int32_t i = 0; i < context->transitionDatas.length; i++) {
Clay__TransitionDataInternal *transitionData = Clay__TransitionDataInternalArray_Get(&context->transitionDatas, i);
if (transitionData->elementId == currentElement->id) {
Clay_TransitionData currentTransitionData = transitionData->currentState;
Clay_TransitionData targetTransitionData = Clay__GetTransitionDataForElement(&currentElementBoundingBox, currentElement);
Clay_TransitionData targetTransitionData = Clay__CreateTransitionDataForElement(&currentElementBoundingBox, currentElement);
if (transitionData->state == CLAY_TRANSITION_STATE_IDLE) {
if (Clay__ShouldTransition(&currentTransitionData, &targetTransitionData)) {
transitionData->elapsedTime = 0;
@ -2928,6 +2935,7 @@ void Clay__CalculateFinalLayout(float deltaTime) {
case CLAY_TRANSITION_STATE_ENTERING: currentConfig = transitionElementConfigs->enter; break;
case CLAY_TRANSITION_STATE_TRANSITIONING: currentConfig = transitionElementConfigs->move; break;
case CLAY_TRANSITION_STATE_EXITING: currentConfig = transitionElementConfigs->exit; break;
default: break;
}
bool transitionComplete = true;
@ -4395,17 +4403,6 @@ void Clay_BeginLayout(void) {
Clay__LayoutElementTreeRootArray_Add(&context->layoutElementTreeRoots, CLAY__INIT(Clay__LayoutElementTreeRoot) { .layoutElementIndex = 0 });
}
CLAY_WASM_EXPORT("Clay_BeginLayout")
void Clay_CleanupExitTransitions(void) {
Clay_Context* context = Clay_GetCurrentContext();
for (int i = 0; i < context->transitionDatas.length; ++i) {
Clay__TransitionDataInternal *data = Clay__TransitionDataInternalArray_Get(&context->transitionDatas, i);
if (data->state == CLAY_TRANSITION_STATE_EXITING) {
// Copy the entire nested layout
}
}
}
CLAY_WASM_EXPORT("Clay_EndLayout")
Clay_RenderCommandArray Clay_EndLayout(float deltaTime) {
Clay_Context* context = Clay_GetCurrentContext();
@ -4432,15 +4429,75 @@ Clay_RenderCommandArray Clay_EndLayout(float deltaTime) {
for (int i = 0; i < context->transitionDatas.length; ++i) {
Clay__TransitionDataInternal *data = Clay__TransitionDataInternalArray_Get(&context->transitionDatas, i);
if (data->state != CLAY_TRANSITION_STATE_EXITING) {
if (Clay__GetHashMapItem(data->elementId)->generation < context->generation) {
// Element wasn't updated this last frame, mark it as active transition out
Clay_LayoutElementHashMapItem* item = Clay__GetHashMapItem(data->elementId);
Clay_TransitionElementConfigs* config = Clay__FindElementConfigWithType(item->layoutElement, CLAY__ELEMENT_CONFIG_TYPE_TRANSITION).transitionElementConfig;
if (config->exit.handler && item->generation < context->generation) {
int32_t index = 0;
for (int j = context->transitionOutActiveCount; j < context->transitionOutActiveCount + context->transitionOutWaitingCount; ++j) {
if (Clay_LayoutElementArray_Get(&context->layoutElements, j)->id == item->layoutElement->id) {
index = j;
break;
}
}
Clay_LayoutElement swapElement = *Clay_LayoutElementArray_Get(&context->layoutElements, index);
context->transitionOutActiveCount++;
context->transitionOutWaitingCount--;
data->state = CLAY_TRANSITION_STATE_EXITING;
data->elapsedTime = 0;
data->initialState = data->currentState;
data->targetState = data->currentState;
}
}
if (data->state == CLAY_TRANSITION_STATE_EXITING) {
bool transitionComplete = true;
Clay_LayoutElementHashMapItem* item = Clay__GetHashMapItem(data->elementId);
Clay_TransitionElementConfigs* config = Clay__FindElementConfigWithType(item->layoutElement, CLAY__ELEMENT_CONFIG_TYPE_TRANSITION).transitionElementConfig;
Clay_TransitionData currentTransitionData = data->currentState;
Clay_TransitionData targetTransitionData = Clay__CreateTransitionDataForElement(&item->boundingBox, item->layoutElement);
if (config->exit.handler) {
transitionComplete = config->exit.handler((Clay_TransitionCallbackArguments) {
data->state,
data->initialState,
&currentTransitionData,
targetTransitionData,
data->elapsedTime,
config->exit.duration,
config->exit.properties
});
}
if (!transitionComplete) {
Clay__UpdateElementWithTransitionData(&item->boundingBox, item->layoutElement, &currentTransitionData);
data->elapsedTime += deltaTime;
data->currentState = currentTransitionData;
} else {
Clay__TransitionDataInternalArray_RemoveSwapback(&context->transitionDatas, i--);
context->transitionOutActiveCount--;
}
}
}
Clay__CalculateFinalLayout(deltaTime);
for (int i = 0; i < context->transitionDatas.length; ++i) {
Clay__TransitionDataInternal *data = Clay__TransitionDataInternalArray_Get(&context->transitionDatas, i);
Clay_LayoutElementHashMapItem* item = Clay__GetHashMapItem(data->elementId);
Clay_TransitionElementConfigs* config = Clay__FindElementConfigWithType(item->layoutElement, CLAY__ELEMENT_CONFIG_TYPE_TRANSITION).transitionElementConfig;
if (config->exit.handler) {
bool found = false;
for (int j = context->transitionOutActiveCount; j < context->transitionOutActiveCount + context->transitionOutWaitingCount; ++j) {
if (Clay_LayoutElementArray_Get(&context->layoutElements, j)->id == item->layoutElement->id) {
found = true;
break;
}
}
if (!found) {
Clay_LayoutElementArray_Set(&context->layoutElements, context->transitionOutActiveCount + context->transitionOutWaitingCount, *item->layoutElement);
context->transitionOutWaitingCount++;
}
}
}
}
if (context->openLayoutElementStack.length > 1) {
context->errorHandler.errorHandlerFunction(CLAY__INIT(Clay_ErrorData) {
@ -4448,7 +4505,6 @@ Clay_RenderCommandArray Clay_EndLayout(float deltaTime) {
.errorText = CLAY_STRING("There were still open layout elements when EndLayout was called. This results from an unequal number of calls to Clay__OpenElement and Clay__CloseElement."),
.userData = context->errorHandler.userData });
}
Clay__CalculateFinalLayout(0);
return context->renderCommands;
}

32
examples/raylib-transitions/main.c
View file

@ -75,6 +75,9 @@ Clay_String* FrameAllocateString(Clay_String string) {
}
bool Clay_EaseOut(Clay_TransitionCallbackArguments arguments) {
if (arguments.transitionState == CLAY_TRANSITION_STATE_EXITING) {
int x = 5;
}
float ratio = arguments.elapsedTime / arguments.duration;
if (arguments.elapsedTime < arguments.duration) {
float lerpAmount = (1 - powf(1 - ratio, 3.0f));
@ -139,13 +142,13 @@ void shuffle(SortableBox *array, size_t n) {
}
}
void HandleRandomiseButtonInteraction(Clay_ElementId elementId, Clay_PointerData pointerData, intptr_t userData) {
void HandleRandomiseButtonInteraction(Clay_ElementId elementId, Clay_PointerData pointerData, void *userData) {
if (pointerData.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
shuffle(colors, cellCount);
}
}
void HandlePinkButtonInteraction(Clay_ElementId elementId, Clay_PointerData pointerData, intptr_t userData) {
void HandlePinkButtonInteraction(Clay_ElementId elementId, Clay_PointerData pointerData, void *userData) {
if (pointerData.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
for (int i = 0; i < cellCount; i++) {
int index = colors[i].id;
@ -157,7 +160,7 @@ void HandlePinkButtonInteraction(Clay_ElementId elementId, Clay_PointerData poin
}
}
void HandleBlueButtonInteraction(Clay_ElementId elementId, Clay_PointerData pointerData, intptr_t userData) {
void HandleBlueButtonInteraction(Clay_ElementId elementId, Clay_PointerData pointerData, void *userData) {
if (pointerData.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
for (int i = 0; i < cellCount; i++) {
int index = colors[i].id;
@ -169,9 +172,9 @@ void HandleBlueButtonInteraction(Clay_ElementId elementId, Clay_PointerData poin
}
}
void HandleCellButtonInteraction(Clay_ElementId elementId, Clay_PointerData pointerData, intptr_t userData) {
void HandleCellButtonInteraction(Clay_ElementId elementId, Clay_PointerData pointerData, void *userData) {
if (pointerData.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
for (int i = userData; i < cellCount; i++) {
for (int i = (uintptr_t)userData; i < cellCount; i++) {
colors[i] = colors[i + 1];
}
cellCount = CLAY__MAX(cellCount - 1, 0);
@ -227,13 +230,20 @@ Clay_RenderCommandArray CreateLayout(void) {
.backgroundColor = Clay_Hovered() ? darkerStill : boxColor,
.cornerRadius = {12, 12, 12, 12},
.border = { darker, CLAY_BORDER_OUTSIDE(3) },
.transitions.move = {
.handler = Clay_EaseOut,
.duration = 0.5,
.properties = CLAY_TRANSITION_PROPERTY_BACKGROUND_COLOR | CLAY_TRANSITION_PROPERTY_BOUNDING_BOX,
.transitions = {
.move = {
.handler = Clay_EaseOut,
.duration = 0.5,
.properties = CLAY_TRANSITION_PROPERTY_BACKGROUND_COLOR | CLAY_TRANSITION_PROPERTY_BOUNDING_BOX,
},
.exit = {
.handler = Clay_EaseOut,
.duration = 0.5,
.properties = CLAY_TRANSITION_PROPERTY_BACKGROUND_COLOR,
}
}
}) {
Clay_OnHover(HandleCellButtonInteraction, index);
Clay_OnHover(HandleCellButtonInteraction, (void*)index);
char *idString = (char *)(frameArena.memory + frameArena.offset);
snprintf(idString, 3, "%02d", colors[index].id);
frameArena.offset += 2;
@ -332,7 +342,7 @@ void HandleClayErrors(Clay_ErrorData errorData) {
int main(void) {
uint64_t totalMemorySize = Clay_MinMemorySize();
Clay_Arena clayMemory = Clay_CreateArenaWithCapacityAndMemory(totalMemorySize, malloc(totalMemorySize));
Clay_Initialize(clayMemory, (Clay_Dimensions) { (float)GetScreenWidth(), (float)GetScreenHeight() }, (Clay_ErrorHandler) { HandleClayErrors, 0 });
Clay_Context *context = Clay_Initialize(clayMemory, (Clay_Dimensions) { (float)GetScreenWidth(), (float)GetScreenHeight() }, (Clay_ErrorHandler) { HandleClayErrors, 0 });
Clay_Raylib_Initialize(1024, 768, "Clay - Raylib Renderer Example", FLAG_VSYNC_HINT | FLAG_WINDOW_RESIZABLE | FLAG_MSAA_4X_HINT);
profilePicture = LoadTexture("resources/profile-picture.png");