mirror of
https://github.com/nicbarker/clay.git
synced 2025-05-12 13:28:07 +00:00
Compare commits
2 Commits
5fae7a6249
...
efad3deef8
Author | SHA1 | Date | |
---|---|---|---|
|
efad3deef8 | ||
|
a1e692b72a |
@ -111,12 +111,13 @@ TextWrapMode :: enum EnumBackingType {
|
||||
}
|
||||
|
||||
TextElementConfig :: struct {
|
||||
textColor: Color,
|
||||
fontId: u16,
|
||||
fontSize: u16,
|
||||
letterSpacing: u16,
|
||||
lineHeight: u16,
|
||||
wrapMode: TextWrapMode,
|
||||
textColor: Color,
|
||||
fontId: u16,
|
||||
fontSize: u16,
|
||||
letterSpacing: u16,
|
||||
lineHeight: u16,
|
||||
wrapMode: TextWrapMode,
|
||||
hashStringContents: bool,
|
||||
}
|
||||
|
||||
ImageElementConfig :: struct {
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
17
clay.h
17
clay.h
@ -324,6 +324,7 @@ typedef struct {
|
||||
uint16_t letterSpacing;
|
||||
uint16_t lineHeight;
|
||||
Clay_TextElementConfigWrapMode wrapMode;
|
||||
bool hashStringContents;
|
||||
#ifdef CLAY_EXTEND_CONFIG_TEXT
|
||||
CLAY_EXTEND_CONFIG_TEXT
|
||||
#endif
|
||||
@ -987,9 +988,18 @@ uint32_t Clay__HashTextWithConfig(Clay_String *text, Clay_TextElementConfig *con
|
||||
uint32_t hash = 0;
|
||||
uintptr_t pointerAsNumber = (uintptr_t)text->chars;
|
||||
|
||||
hash += pointerAsNumber;
|
||||
hash += (hash << 10);
|
||||
hash ^= (hash >> 6);
|
||||
if (config->hashStringContents) {
|
||||
uint32_t maxLengthToHash = CLAY__MIN(text->length, 256);
|
||||
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 += (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
|
||||
item.nextIndex = hashItem->nextIndex;
|
||||
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->layoutElement = layoutElement;
|
||||
hashItem->debugData->collision = false;
|
||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user