mirror of
https://github.com/nicbarker/clay.git
synced 2025-04-22 06:08:03 +00:00
Compare commits
1 Commits
e998c16bb6
...
4359b458e7
Author | SHA1 | Date | |
---|---|---|---|
|
4359b458e7 |
@ -38,6 +38,3 @@ if(NOT MSVC AND (CLAY_INCLUDE_ALL_EXAMPLES OR CLAY_INCLUDE_SDL3_EXAMPLES))
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# add_subdirectory("examples/cairo-pdf-rendering") Some issue with github actions populating cairo, disable for now
|
# add_subdirectory("examples/cairo-pdf-rendering") Some issue with github actions populating cairo, disable for now
|
||||||
|
|
||||||
#add_library(${PROJECT_NAME} INTERFACE)
|
|
||||||
#target_include_directories(${PROJECT_NAME} INTERFACE .)
|
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -495,7 +495,7 @@ main :: proc() {
|
|||||||
clay.Initialize(arena, {cast(f32)raylib.GetScreenWidth(), cast(f32)raylib.GetScreenHeight()}, { handler = errorHandler })
|
clay.Initialize(arena, {cast(f32)raylib.GetScreenWidth(), cast(f32)raylib.GetScreenHeight()}, { handler = errorHandler })
|
||||||
clay.SetMeasureTextFunction(measureText, nil)
|
clay.SetMeasureTextFunction(measureText, nil)
|
||||||
|
|
||||||
raylib.SetConfigFlags({.VSYNC_HINT, .WINDOW_RESIZABLE, .MSAA_4X_HINT})
|
raylib.SetConfigFlags({.VSYNC_HINT, .WINDOW_RESIZABLE, .WINDOW_HIGHDPI, .MSAA_4X_HINT})
|
||||||
raylib.InitWindow(windowWidth, windowHeight, "Raylib Odin Example")
|
raylib.InitWindow(windowWidth, windowHeight, "Raylib Odin Example")
|
||||||
raylib.SetTargetFPS(raylib.GetMonitorRefreshRate(0))
|
raylib.SetTargetFPS(raylib.GetMonitorRefreshRate(0))
|
||||||
loadFont(FONT_ID_TITLE_56, 56, "resources/Calistoga-Regular.ttf")
|
loadFont(FONT_ID_TITLE_56, 56, "resources/Calistoga-Regular.ttf")
|
||||||
|
10
clay.h
10
clay.h
@ -1401,9 +1401,13 @@ uint64_t Clay__HashData(const uint8_t* data, size_t length) {
|
|||||||
return result[0] ^ result[1];
|
return result[0] ^ result[1];
|
||||||
}
|
}
|
||||||
#elif !defined(CLAY_DISABLE_SIMD) && defined(__aarch64__)
|
#elif !defined(CLAY_DISABLE_SIMD) && defined(__aarch64__)
|
||||||
|
static inline uint64x2_t Clay__SIMDRotateLeft(uint64x2_t x, int r) {
|
||||||
|
return vorrq_u64(vshlq_n_u64(x, 17), vshrq_n_u64(x, 64 - 17));
|
||||||
|
}
|
||||||
|
|
||||||
static inline void Clay__SIMDARXMix(uint64x2_t* a, uint64x2_t* b) {
|
static inline void Clay__SIMDARXMix(uint64x2_t* a, uint64x2_t* b) {
|
||||||
*a = vaddq_u64(*a, *b);
|
*a = vaddq_u64(*a, *b);
|
||||||
*b = veorq_u64(vorrq_u64(vshlq_n_u64(*b, 17), vshrq_n_u64(*b, 64 - 17)), *a);
|
*b = veorq_u64(Clay__SIMDRotateLeft(*b, 17), *a);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t Clay__HashData(const uint8_t* data, size_t length) {
|
uint64_t Clay__HashData(const uint8_t* data, size_t length) {
|
||||||
@ -1672,8 +1676,6 @@ Clay_LayoutElementHashMapItem* Clay__AddHashMapItem(Clay_ElementId elementId, Cl
|
|||||||
hashItem->generation = context->generation + 1;
|
hashItem->generation = context->generation + 1;
|
||||||
hashItem->layoutElement = layoutElement;
|
hashItem->layoutElement = layoutElement;
|
||||||
hashItem->debugData->collision = false;
|
hashItem->debugData->collision = false;
|
||||||
hashItem->onHoverFunction = NULL;
|
|
||||||
hashItem->hoverFunctionUserData = 0;
|
|
||||||
} else { // Multiple collisions this frame - two elements have the same ID
|
} else { // Multiple collisions this frame - two elements have the same ID
|
||||||
context->errorHandler.errorHandlerFunction(CLAY__INIT(Clay_ErrorData) {
|
context->errorHandler.errorHandlerFunction(CLAY__INIT(Clay_ErrorData) {
|
||||||
.errorType = CLAY_ERROR_TYPE_DUPLICATE_ID,
|
.errorType = CLAY_ERROR_TYPE_DUPLICATE_ID,
|
||||||
@ -1981,7 +1983,7 @@ Clay_ElementId Clay__AttachId(Clay_ElementId elementId) {
|
|||||||
uint32_t idAlias = openLayoutElement->id;
|
uint32_t idAlias = openLayoutElement->id;
|
||||||
openLayoutElement->id = elementId.id;
|
openLayoutElement->id = elementId.id;
|
||||||
Clay__AddHashMapItem(elementId, openLayoutElement, idAlias);
|
Clay__AddHashMapItem(elementId, openLayoutElement, idAlias);
|
||||||
Clay__StringArray_Set(&context->layoutElementIdStrings, context->layoutElements.length - 1, elementId.stringId);
|
Clay__StringArray_Add(&context->layoutElementIdStrings, elementId.stringId);
|
||||||
return elementId;
|
return elementId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,7 +226,7 @@ int main(void) {
|
|||||||
uint64_t totalMemorySize = Clay_MinMemorySize();
|
uint64_t totalMemorySize = Clay_MinMemorySize();
|
||||||
Clay_Arena clayMemory = Clay_CreateArenaWithCapacityAndMemory(totalMemorySize, malloc(totalMemorySize));
|
Clay_Arena clayMemory = Clay_CreateArenaWithCapacityAndMemory(totalMemorySize, malloc(totalMemorySize));
|
||||||
Clay_Initialize(clayMemory, (Clay_Dimensions) { (float)GetScreenWidth(), (float)GetScreenHeight() }, (Clay_ErrorHandler) { HandleClayErrors, 0 });
|
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);
|
Clay_Raylib_Initialize(1024, 768, "Clay - Raylib Renderer Example", FLAG_VSYNC_HINT | FLAG_WINDOW_RESIZABLE | FLAG_WINDOW_HIGHDPI | FLAG_MSAA_4X_HINT);
|
||||||
profilePicture = LoadTexture("resources/profile-picture.png");
|
profilePicture = LoadTexture("resources/profile-picture.png");
|
||||||
|
|
||||||
Font fonts[2];
|
Font fonts[2];
|
||||||
|
Loading…
Reference in New Issue
Block a user