TheZone/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2025-01-23 01:46:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Core] Standardise number types to int32_t for array indices, lengths and capacities (#152)
Some checks failed
CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Failing after 1m44s
Details
CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Failing after 13s
Details
CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Nic Barker 2025-01-03 11:24:32 +13:00 committed by GitHub
parent a44423a133
commit cf12cd6af8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 227 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/odin/clay-odin/clay.odin
View File

@ -18,7 +18,7 @@ when ODIN_OS == .Windows {
} }
String :: struct { String :: struct {
length: c.int, length: c.int32_t,
chars: [^]c.char, chars: [^]c.char,
} }
@ -258,8 +258,8 @@ LayoutConfig :: struct {
} }
ClayArray :: struct($type: typeid) { ClayArray :: struct($type: typeid) {
capacity: u32, capacity: i32,
length: u32, length: i32,
internalArray: [^]type, internalArray: [^]type,
} }

BIN
bindings/odin/clay-odin/linux/clay.a
View File

Binary file not shown.

BIN
bindings/odin/clay-odin/macos-arm64/clay.a
View File

Binary file not shown.

BIN
bindings/odin/clay-odin/macos/clay.a
View File

Binary file not shown.

BIN
bindings/odin/clay-odin/wasm/clay.o
View File

Binary file not shown.

BIN
bindings/odin/clay-odin/windows/clay.lib
View File

Binary file not shown.

420
clay.h
View File

File diff suppressed because it is too large Load Diff

7
examples/clay-official-website/index.html
View File

@ -178,6 +178,7 @@
} }
case 'float': return 4; case 'float': return 4;
case 'uint32_t': return 4; case 'uint32_t': return 4;
case 'int32_t': return 4;
case 'uint16_t': return 2; case 'uint16_t': return 2;
case 'uint8_t': return 1; case 'uint8_t': return 1;
case 'bool': return 1; case 'bool': return 1;
@ -206,6 +207,7 @@
} }
case 'float': return { value: memoryDataView.getFloat32(address, true), __size: 4 }; case 'float': return { value: memoryDataView.getFloat32(address, true), __size: 4 };
case 'uint32_t': return { value: memoryDataView.getUint32(address, true), __size: 4 }; case 'uint32_t': return { value: memoryDataView.getUint32(address, true), __size: 4 };
case 'int32_t': return { value: memoryDataView.getUint32(address, true), __size: 4 };
case 'uint16_t': return { value: memoryDataView.getUint16(address, true), __size: 2 }; case 'uint16_t': return { value: memoryDataView.getUint16(address, true), __size: 2 };
case 'uint8_t': return { value: memoryDataView.getUint8(address, true), __size: 1 }; case 'uint8_t': return { value: memoryDataView.getUint8(address, true), __size: 1 };
case 'bool': return { value: memoryDataView.getUint8(address, true), __size: 1 }; case 'bool': return { value: memoryDataView.getUint8(address, true), __size: 1 };
@ -312,7 +314,6 @@
const importObject = { const importObject = {
clay: { clay: {
measureTextFunction: (addressOfDimensions, textToMeasure, addressOfConfig) => { measureTextFunction: (addressOfDimensions, textToMeasure, addressOfConfig) => {
let stringLength = memoryDataView.getUint32(textToMeasure, true); let stringLength = memoryDataView.getUint32(textToMeasure, true);
let pointerToString = memoryDataView.getUint32(textToMeasure + 4, true); let pointerToString = memoryDataView.getUint32(textToMeasure + 4, true);
@ -358,8 +359,8 @@
} }
function renderLoopHTML() { function renderLoopHTML() {
let capacity = memoryDataView.getUint32(scratchSpaceAddress, true); let capacity = memoryDataView.getInt32(scratchSpaceAddress, true);
let length = memoryDataView.getUint32(scratchSpaceAddress + 4, true); let length = memoryDataView.getInt32(scratchSpaceAddress + 4, true);
let arrayOffset = memoryDataView.getUint32(scratchSpaceAddress + 8, true); let arrayOffset = memoryDataView.getUint32(scratchSpaceAddress + 8, true);
let scissorStack = [{ nextAllocation: { x: 0, y: 0 }, element: htmlRoot, nextElementIndex: 0 }]; let scissorStack = [{ nextAllocation: { x: 0, y: 0 }, element: htmlRoot, nextElementIndex: 0 }];
let previousId = 0; let previousId = 0;

2
generator/array_allocate.template.c
View File

@ -1,3 +1,3 @@
$NAME$ $NAME$_Allocate_Arena(uint32_t capacity, Clay_Arena *arena) { $NAME$ $NAME$_Allocate_Arena(int32_t capacity, Clay_Arena *arena) {
return CLAY__INIT($NAME$){.capacity = capacity, .length = 0, .internalArray = ($TYPE$ *)Clay__Array_Allocate_Arena(capacity, sizeof($TYPE$), CLAY__ALIGNMENT($TYPE$), arena)}; return CLAY__INIT($NAME$){.capacity = capacity, .length = 0, .internalArray = ($TYPE$ *)Clay__Array_Allocate_Arena(capacity, sizeof($TYPE$), CLAY__ALIGNMENT($TYPE$), arena)};
} }

2
generator/array_allocate_pointer.template.c
View File

@ -1,3 +1,3 @@
$NAME$ $NAME$_Allocate_Arena(uint32_t capacity, Clay_Arena *arena) { $NAME$ $NAME$_Allocate_Arena(int32_t capacity, Clay_Arena *arena) {
return CLAY__INIT($NAME$){.capacity = capacity, .length = 0, .internalArray = ($TYPE$ *)Clay__Array_Allocate_Arena(capacity, sizeof($TYPE$), CLAY__POINTER_ALIGNMENT, arena)}; return CLAY__INIT($NAME$){.capacity = capacity, .length = 0, .internalArray = ($TYPE$ *)Clay__Array_Allocate_Arena(capacity, sizeof($TYPE$), CLAY__POINTER_ALIGNMENT, arena)};
} }

4
generator/array_define.template.c
View File

@ -1,6 +1,6 @@
CLAY__TYPEDEF($NAME$, struct CLAY__TYPEDEF($NAME$, struct
{ {
uint32_t capacity; int32_t capacity;
uint32_t length; int32_t length;
$TYPE$ *internalArray; $TYPE$ *internalArray;
}); });

2
generator/array_define_slice.template.c
View File

@ -1,5 +1,5 @@
CLAY__TYPEDEF($NAME$Slice, struct CLAY__TYPEDEF($NAME$Slice, struct
{ {
uint32_t length; int32_t length;
$TYPE$ *internalArray; $TYPE$ *internalArray;
}); });

2
generator/array_get.template.c
View File

@ -1,3 +1,3 @@
$TYPE$ *$NAME$_Get($NAME$ *array, int index) { $TYPE$ *$NAME$_Get($NAME$ *array, int32_t index) {
return Clay__Array_RangeCheck(index, array->length) ? &array->internalArray[index] : $DEFAULT_VALUE$; return Clay__Array_RangeCheck(index, array->length) ? &array->internalArray[index] : $DEFAULT_VALUE$;
} }

2
generator/array_get_slice.template.c
View File

@ -1,3 +1,3 @@
$TYPE$ *$NAME$Slice_Get($NAME$Slice *slice, int index) { $TYPE$ *$NAME$Slice_Get($NAME$Slice *slice, int32_t index) {
return Clay__Array_RangeCheck(index, slice->length) ? &slice->internalArray[index] : $DEFAULT_VALUE$; return Clay__Array_RangeCheck(index, slice->length) ? &slice->internalArray[index] : $DEFAULT_VALUE$;
} }

2
generator/array_get_value.template.c
View File

@ -1,3 +1,3 @@
$TYPE$ $NAME$_Get($NAME$ *array, int index) { $TYPE$ $NAME$_Get($NAME$ *array, int32_t index) {
return Clay__Array_RangeCheck(index, array->length) ? array->internalArray[index] : $DEFAULT_VALUE$; return Clay__Array_RangeCheck(index, array->length) ? array->internalArray[index] : $DEFAULT_VALUE$;
} }

2
generator/array_remove_swapback.template.c
View File

@ -1,4 +1,4 @@
$TYPE$ $NAME$_RemoveSwapback($NAME$ *array, int index) { $TYPE$ $NAME$_RemoveSwapback($NAME$ *array, int32_t index) {
if (Clay__Array_RangeCheck(index, array->length)) { if (Clay__Array_RangeCheck(index, array->length)) {
array->length--; array->length--;
$TYPE$ removed = array->internalArray[index]; $TYPE$ removed = array->internalArray[index];

2
generator/array_set.template.c
View File

@ -1,4 +1,4 @@
void $NAME$_Set($NAME$ *array, int index, $TYPE$ value) { void $NAME$_Set($NAME$ *array, int32_t index, $TYPE$ value) {
if (Clay__Array_RangeCheck(index, array->capacity)) { if (Clay__Array_RangeCheck(index, array->capacity)) {
array->internalArray[index] = value; array->internalArray[index] = value;
array->length = index < array->length ? array->length : index + 1; array->length = index < array->length ? array->length : index + 1;