From 2603add03c355399809df1da0d046abe77f82bc0 Mon Sep 17 00:00:00 2001
From: Nic Barker <contact+github@nicbarker.com>
Date: Thu, 26 Dec 2024 19:40:44 +1300
Subject: [PATCH] fixes for html renderer
---
clay.h | 9 +++---
examples/clay-official-website/index.html | 35 ++++++++++++-----------
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/clay.h b/clay.h
index 6e09064..9c75a9c 100644
--- a/clay.h
+++ b/clay.h
@@ -1569,6 +1569,7 @@ Clay__MeasuredWord *Clay__AddMeasuredWord(Clay__MeasuredWord word, Clay__Measure
}
Clay__MeasureTextCacheItem *Clay__MeasureTextCached(Clay_String *text, Clay_TextElementConfig *config) {
+ #ifndef CLAY_WASM
if (!Clay__MeasureText) {
Clay__errorHandler.errorHandlerFunction(CLAY__INIT(Clay_ErrorData) {
.errorType = CLAY_ERROR_TYPE_TEXT_MEASUREMENT_FUNCTION_NOT_PROVIDED,
@@ -1576,8 +1577,9 @@ Clay__MeasureTextCacheItem *Clay__MeasureTextCached(Clay_String *text, Clay_Text
.userData = Clay__errorHandler.userData });
return NULL;
}
+ #endif
uint32_t id = Clay__HashTextWithConfig(text, config);
- uint32_t hashBucket = id % (Clay__maxMeasureTextCacheWordCount / 8);
+ uint32_t hashBucket = id % (Clay__maxMeasureTextCacheWordCount / 32);
int32_t elementIndexPrevious = 0;
int32_t elementIndex = Clay__measureTextHashMap.internalArray[hashBucket];
while (elementIndex != 0) {
@@ -3474,7 +3476,7 @@ void Clay__RenderDebugView() {
CLAY_WASM_EXPORT("Clay_MinMemorySize")
uint32_t Clay_MinMemorySize() {
- Clay_Arena fakeArena = CLAY__INIT(Clay_Arena) { .capacity = INT64_MAX };
+ Clay_Arena fakeArena = CLAY__INIT(Clay_Arena) { .capacity = SIZE_MAX };
Clay__InitializePersistentMemory(&fakeArena);
Clay__InitializeEphemeralMemory(&fakeArena);
return fakeArena.nextAllocation;
@@ -3493,9 +3495,6 @@ Clay_Arena Clay_CreateArenaWithCapacityAndMemory(uint32_t capacity, void *offset
void Clay_SetMeasureTextFunction(Clay_Dimensions (*measureTextFunction)(Clay_String *text, Clay_TextElementConfig *config)) {
Clay__MeasureText = measureTextFunction;
}
-#endif
-
-#ifndef CLAY_WASM
void Clay_SetQueryScrollOffsetFunction(Clay_Vector2 (*queryScrollOffsetFunction)(uint32_t elementId)) {
Clay__QueryScrollOffset = queryScrollOffsetFunction;
}
diff --git a/examples/clay-official-website/index.html b/examples/clay-official-website/index.html
index 2645c6a..d4764c4 100644
--- a/examples/clay-official-website/index.html
+++ b/examples/clay-official-website/index.html
@@ -311,23 +311,26 @@
});
const importObject = {
- clay: { measureTextFunction: (addressOfDimensions, textToMeasure, addressOfConfig) => {
- let stringLength = memoryDataView.getUint32(textToMeasure, true);
- let pointerToString = memoryDataView.getUint32(textToMeasure + 4, true);
- let textConfig = readStructAtAddress(addressOfConfig, textConfigDefinition);
- let textDecoder = new TextDecoder("utf-8");
- let text = textDecoder.decode(memoryDataView.buffer.slice(pointerToString, pointerToString + stringLength));
- let sourceDimensions = getTextDimensions(text, `${Math.round(textConfig.fontSize.value * GLOBAL_FONT_SCALING_FACTOR)}px ${fontsById[textConfig.fontId.value]}`);
- memoryDataView.setFloat32(addressOfDimensions, sourceDimensions.width, true);
- memoryDataView.setFloat32(addressOfDimensions + 4, sourceDimensions.height, true);
- },
- queryScrollOffsetFunction: (addressOfOffset, elementId) => {
- let container = document.getElementById(elementId.toString());
- if (container) {
- memoryDataView.setFloat32(addressOfOffset, -container.scrollLeft, true);
- memoryDataView.setFloat32(addressOfOffset + 4, -container.scrollTop, true);
+ clay: {
+
+ measureTextFunction: (addressOfDimensions, textToMeasure, addressOfConfig) => {
+ let stringLength = memoryDataView.getUint32(textToMeasure, true);
+ let pointerToString = memoryDataView.getUint32(textToMeasure + 4, true);
+ let textConfig = readStructAtAddress(addressOfConfig, textConfigDefinition);
+ let textDecoder = new TextDecoder("utf-8");
+ let text = textDecoder.decode(memoryDataView.buffer.slice(pointerToString, pointerToString + stringLength));
+ let sourceDimensions = getTextDimensions(text, `${Math.round(textConfig.fontSize.value * GLOBAL_FONT_SCALING_FACTOR)}px ${fontsById[textConfig.fontId.value]}`);
+ memoryDataView.setFloat32(addressOfDimensions, sourceDimensions.width, true);
+ memoryDataView.setFloat32(addressOfDimensions + 4, sourceDimensions.height, true);
+ },
+ queryScrollOffsetFunction: (addressOfOffset, elementId) => {
+ let container = document.getElementById(elementId.toString());
+ if (container) {
+ memoryDataView.setFloat32(addressOfOffset, -container.scrollLeft, true);
+ memoryDataView.setFloat32(addressOfOffset + 4, -container.scrollTop, true);
+ }
}
- }},
+ },
};
const { instance } = await WebAssembly.instantiateStreaming(
fetch("/clay/index.wasm"), importObject