Compare commits

...

2 Commits

Author SHA1 Message Date
Harrison Lambeth
efad3deef8
Copy elementId in Clay__AddHashMapItem() in case underlying stringId has changed (#239)
Some checks are pending
CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Waiting to run
CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Waiting to run
CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Waiting to run
2025-01-30 10:20:14 +13:00
Nic Barker
a1e692b72a
[Core] Add option to hash text contents to text config (#238) 2025-01-30 09:59:42 +13:00
8 changed files with 21 additions and 9 deletions

View File

@ -111,12 +111,13 @@ TextWrapMode :: enum EnumBackingType {
} }
TextElementConfig :: struct { TextElementConfig :: struct {
textColor: Color, textColor: Color,
fontId: u16, fontId: u16,
fontSize: u16, fontSize: u16,
letterSpacing: u16, letterSpacing: u16,
lineHeight: u16, lineHeight: u16,
wrapMode: TextWrapMode, wrapMode: TextWrapMode,
hashStringContents: bool,
} }
ImageElementConfig :: struct { ImageElementConfig :: struct {

Binary file not shown.

Binary file not shown.

Binary file not shown.

17
clay.h
View File

@ -324,6 +324,7 @@ typedef struct {
uint16_t letterSpacing; uint16_t letterSpacing;
uint16_t lineHeight; uint16_t lineHeight;
Clay_TextElementConfigWrapMode wrapMode; Clay_TextElementConfigWrapMode wrapMode;
bool hashStringContents;
#ifdef CLAY_EXTEND_CONFIG_TEXT #ifdef CLAY_EXTEND_CONFIG_TEXT
CLAY_EXTEND_CONFIG_TEXT CLAY_EXTEND_CONFIG_TEXT
#endif #endif
@ -987,9 +988,18 @@ uint32_t Clay__HashTextWithConfig(Clay_String *text, Clay_TextElementConfig *con
uint32_t hash = 0; uint32_t hash = 0;
uintptr_t pointerAsNumber = (uintptr_t)text->chars; uintptr_t pointerAsNumber = (uintptr_t)text->chars;
hash += pointerAsNumber; if (config->hashStringContents) {
hash += (hash << 10); uint32_t maxLengthToHash = CLAY__MIN(text->length, 256);
hash ^= (hash >> 6); for (int i = 0; i < maxLengthToHash; i++) {
hash += text->chars[i];
hash += (hash << 10);
hash ^= (hash >> 6);
}
} else {
hash += pointerAsNumber;
hash += (hash << 10);
hash ^= (hash >> 6);
}
hash += text->length; hash += text->length;
hash += (hash << 10); hash += (hash << 10);
@ -1189,6 +1199,7 @@ Clay_LayoutElementHashMapItem* Clay__AddHashMapItem(Clay_ElementId elementId, Cl
if (hashItem->elementId.id == elementId.id) { // Collision - resolve based on generation if (hashItem->elementId.id == elementId.id) { // Collision - resolve based on generation
item.nextIndex = hashItem->nextIndex; item.nextIndex = hashItem->nextIndex;
if (hashItem->generation <= context->generation) { // First collision - assume this is the "same" element if (hashItem->generation <= context->generation) { // First collision - assume this is the "same" element
hashItem->elementId = elementId; // Make sure to copy this across. If the stringId reference has changed, we should update the hash item to use the new one.
hashItem->generation = context->generation + 1; hashItem->generation = context->generation + 1;
hashItem->layoutElement = layoutElement; hashItem->layoutElement = layoutElement;
hashItem->debugData->collision = false; hashItem->debugData->collision = false;