KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ...New/...Free to ...Create/...Destroy

Browse Source
This commit is contained in:
Klemen Plestenjak
2023-11-16 06:26:24 +01:00
parent 581da2b990
commit 9e6c836207
11 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/breeze/utils/array.c
View File

@@ -10,7 +10,7 @@ typedef struct BzArrayHead {
#define ARRAY_HEAD(array) (((BzArrayHead *) array) -1) #define ARRAY_HEAD(array) (((BzArrayHead *) array) -1)
void *_bzArrayNew(i32 startCapacity, i32 stride) { void *_bzArrayCreate(i32 startCapacity, i32 stride) {
BzArrayHead *head = bzAlloc(sizeof(*head) + startCapacity * stride); BzArrayHead *head = bzAlloc(sizeof(*head) + startCapacity * stride);
BZ_ASSERT(startCapacity > 0); BZ_ASSERT(startCapacity > 0);
head[0] = (BzArrayHead) { head[0] = (BzArrayHead) {
@@ -20,7 +20,7 @@ void *_bzArrayNew(i32 startCapacity, i32 stride) {
}; };
return &head[1]; return &head[1];
} }
void _bzArrayFree(void *arr) { void _bzArrayDestroy(void *arr) {
bzFree(ARRAY_HEAD(arr)); bzFree(ARRAY_HEAD(arr));
} }
void _bzArrayClear(void *arr) { void _bzArrayClear(void *arr) {

10
engine/breeze/utils/array.h
View File

@@ -3,8 +3,8 @@
#include "../defines.h" #include "../defines.h"
void *_bzArrayNew(i32 startCapacity, i32 stride); void *_bzArrayCreate(i32 startCapacity, i32 stride);
void _bzArrayFree(void *arr); void _bzArrayDestroy(void *arr);
void _bzArrayClear(void *arr); void _bzArrayClear(void *arr);
i32 _bzArraySize(void *arr); i32 _bzArraySize(void *arr);
@@ -21,9 +21,9 @@ i32 _bzArrayIns(void *arr, i32 idx);
i32 _bzArraySet(void *arr, i32 idx); i32 _bzArraySet(void *arr, i32 idx);
i32 _bzArrayPop(void *arr); i32 _bzArrayPop(void *arr);
#define bzArrayNew(T, n) (T*) _bzArrayNew(n, sizeof(T)) #define bzArrayCreate(T, n) (T*) _bzArrayCreate(n, sizeof(T))
#define bzArrayFree(arr) do { \ #define bzArrayDestroy(arr) do { \
_bzArrayFree(arr); \ _bzArrayDestroy(arr); \
arr = NULL; \ arr = NULL; \
} while(0) } while(0)
#define bzArrayClear(arr) _bzArrayClear(arr) #define bzArrayClear(arr) _bzArrayClear(arr)

4
engine/breeze/utils/heap.c
View File

@@ -20,7 +20,7 @@ static void heapSiftDown(BzHeapHead *head, void *heap);
void *_bzHeapNew(i32 startCapacity, i32 stride, i32 weightOffset) { void *_bzHeapCreate(i32 startCapacity, i32 stride, i32 weightOffset) {
i32 numBytes = sizeof(BzHeapHead) + (startCapacity + 1) * stride; i32 numBytes = sizeof(BzHeapHead) + (startCapacity + 1) * stride;
BzHeapHead *heap = bzAlloc(numBytes); BzHeapHead *heap = bzAlloc(numBytes);
heap[0] = (BzHeapHead) { heap[0] = (BzHeapHead) {
@@ -33,7 +33,7 @@ void *_bzHeapNew(i32 startCapacity, i32 stride, i32 weightOffset) {
return &heap[1]; return &heap[1];
} }
void _bzHeapFree(void *heap) { void _bzHeapDestroy(void *heap) {
bzFree(HEAP_HEAD(heap)); bzFree(HEAP_HEAD(heap));
} }
void _bzHeapClear(void *heap) { void _bzHeapClear(void *heap) {

8
engine/breeze/utils/heap.h
View File

@@ -3,8 +3,8 @@
#include "../defines.h" #include "../defines.h"
void *_bzHeapNew(i32 startCapacity, i32 stride, i32 weightOffset); void *_bzHeapCreate(i32 startCapacity, i32 stride, i32 weightOffset);
void _bzHeapFree(void *heap); void _bzHeapDestroy(void *heap);
void _bzHeapClear(void *heap); void _bzHeapClear(void *heap);
i32 _bzHeapSize(void *heap); i32 _bzHeapSize(void *heap);
@@ -13,8 +13,8 @@ i32 _bzHeapPop(void *heap);
void _bzHeapPush(void *heap); void _bzHeapPush(void *heap);
i32 _bzHeapPushTmpIdx(void *heap); i32 _bzHeapPushTmpIdx(void *heap);
#define bzHeapNew(T, n) (T *) ((T *)_bzHeapNew((n), sizeof(T), offsetof(T, weight))) #define bzHeapCreate(T, n) (T *) ((T *)_bzHeapCreate((n), sizeof(T), offsetof(T, weight)))
#define bzHeapFree(heap) _bzHeapFree((void *) (heap)) #define bzHeapDestroy(heap) _bzHeapDestroy((void *) (heap))
#define bzHeapClear(heap) _bzHeapClear((void *) (heap)) #define bzHeapClear(heap) _bzHeapClear((void *) (heap))
#define bzHeapSize(heap) _bzHeapSize((void *) (heap)) #define bzHeapSize(heap) _bzHeapSize((void *) (heap))

4
engine/breeze/utils/tokenizer.c
View File

@@ -1,6 +1,6 @@
#include "tokenizer.h" #include "tokenizer.h"
Tokenizer initTokenizer(const char *source) { Tokenizer tokenizerCreate(const char *source) {
int line = source ? 1 : 0; int line = source ? 1 : 0;
return (Tokenizer) {source, line}; return (Tokenizer) {source, line};
} }
@@ -29,7 +29,7 @@ static void skipWhitespace(Tokenizer *tokenizer) {
} }
} }
Token scanToken(Tokenizer *tokenizer) { Token tokenizerScan(Tokenizer *tokenizer) {
skipWhitespace(tokenizer); skipWhitespace(tokenizer);
Token token = {tokenizer->current, 0, tokenizer->line}; Token token = {tokenizer->current, 0, tokenizer->line};

4
engine/breeze/utils/tokenizer.h
View File

@@ -14,7 +14,7 @@ typedef struct Tokenizer {
int line; int line;
} Tokenizer; } Tokenizer;
Tokenizer initTokenizer(const char *source); Tokenizer tokenizerCreate(const char *source);
Token scanToken(Tokenizer *tokenizer); Token tokenizerScan(Tokenizer *tokenizer);
#endif //BREEZE_TOKENIZER_H #endif //BREEZE_TOKENIZER_H

20
engine/tests/array_test.c
View File

@@ -4,7 +4,7 @@
int main(void) { int main(void) {
bzLoggerInit(); bzLoggerInit();
int *arr = bzArrayNew(int, 5); int *arr = bzArrayCreate(int, 5);
int i, j; int i, j;
@@ -12,8 +12,8 @@ int main(void) {
for (i = 0; i < 20000; i += 50) { for (i = 0; i < 20000; i += 50) {
for (j = 0; j < i; ++j) for (j = 0; j < i; ++j)
bzArrayPush(arr, j); bzArrayPush(arr, j);
bzArrayFree(arr); bzArrayDestroy(arr);
arr = bzArrayNew(int, 5); arr = bzArrayCreate(int, 5);
} }
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
@@ -22,15 +22,15 @@ int main(void) {
bzArrayPush(arr, 3); bzArrayPush(arr, 3);
bzArrayPush(arr, 4); bzArrayPush(arr, 4);
bzArrayDel(arr, i); bzArrayDel(arr, i);
bzArrayFree(arr); bzArrayDestroy(arr);
arr = bzArrayNew(int, 5); arr = bzArrayCreate(int, 5);
bzArrayPush(arr, 1); bzArrayPush(arr, 1);
bzArrayPush(arr, 2); bzArrayPush(arr, 2);
bzArrayPush(arr, 3); bzArrayPush(arr, 3);
bzArrayPush(arr, 4); bzArrayPush(arr, 4);
//darray_delswap(arr, i); //darray_delswap(arr, i);
bzArrayFree(arr); bzArrayDestroy(arr);
arr = bzArrayNew(int, 5); arr = bzArrayCreate(int, 5);
} }
for (i = 0; i < 5; ++i) { for (i = 0; i < 5; ++i) {
@@ -50,10 +50,10 @@ int main(void) {
printf("\n\n"); printf("\n\n");
if (i < 4) if (i < 4)
BZ_ASSERT(bzArrayGet(arr, 4) == 4); BZ_ASSERT(bzArrayGet(arr, 4) == 4);
bzArrayFree(arr); bzArrayDestroy(arr);
arr = bzArrayNew(int, 5); arr = bzArrayCreate(int, 5);
} }
bzArrayFree(arr); bzArrayDestroy(arr);
return 0; return 0;

4
engine/tests/heap_test.c
View File

@@ -8,7 +8,7 @@ int main() {
i32 weight; i32 weight;
} Node; } Node;
Node *heap = bzHeapNew(Node, 20); Node *heap = bzHeapCreate(Node, 20);
bzHeapPush(heap, (Node) {3}); bzHeapPush(heap, (Node) {3});
bzHeapPush(heap, (Node) {2}); bzHeapPush(heap, (Node) {2});
bzHeapPush(heap, (Node) {1}); bzHeapPush(heap, (Node) {1});
@@ -29,7 +29,7 @@ int main() {
printf("%d\n", node.weight); printf("%d\n", node.weight);
} }
bzHeapFree(heap); bzHeapDestroy(heap);
return 0; return 0;

4
game/entity_map.c
View File

@@ -15,14 +15,14 @@ EntityMap entityMapCreate(const EntityMapDesc *desc) {
size_t numBytes = sizeof(EntityMapCell) * map.width * map.height * map.cellDepth; size_t numBytes = sizeof(EntityMapCell) * map.width * map.height * map.cellDepth;
map.cells = bzAlloc(numBytes); map.cells = bzAlloc(numBytes);
bzMemSet(map.cells, 0, numBytes); bzMemSet(map.cells, 0, numBytes);
map.entities = bzArrayNew(EntityMapEntry, 512); map.entities = bzArrayCreate(EntityMapEntry, 512);
return map; return map;
} }
void entityMapDestroy(EntityMap *entityMap) { void entityMapDestroy(EntityMap *entityMap) {
bzFree(entityMap->cells); bzFree(entityMap->cells);
entityMap->cells = NULL; entityMap->cells = NULL;
bzArrayFree(entityMap->entities); bzArrayDestroy(entityMap->entities);
entityMap->entities = NULL; entityMap->entities = NULL;
} }

2
game/main.c
View File

@@ -206,7 +206,7 @@ void render(float dt, void *userData) {
static PathNode *heap = NULL; static PathNode *heap = NULL;
if (!heap) if (!heap)
heap = bzHeapNew(PathNode, game->map.width * game->map.height); heap = bzHeapCreate(PathNode, game->map.width * game->map.height);
game->path.waypoints = game->waypoints; game->path.waypoints = game->waypoints;
game->path.maxWaypoints = 128; game->path.maxWaypoints = 128;
findPath(&(PathfindingDesc) { findPath(&(PathfindingDesc) {

4
game/pathfinding.c
View File

@@ -26,7 +26,7 @@ bool findPath(const PathfindingDesc *desc) {
bzMemSet(visited, 0, sizeof(visited)); bzMemSet(visited, 0, sizeof(visited));
PathNode *heap = desc->heap; PathNode *heap = desc->heap;
if (!heap) heap = bzHeapNew(PathNode, map->width * map->height); if (!heap) heap = bzHeapCreate(PathNode, map->width * map->height);
else bzHeapClear(heap); else bzHeapClear(heap);
i32 toTargetCost = dst(desc->start, desc->target); i32 toTargetCost = dst(desc->start, desc->target);
@@ -115,7 +115,7 @@ bool findPath(const PathfindingDesc *desc) {
} }
if (!desc->heap) { if (!desc->heap) {
bzHeapFree(heap); bzHeapDestroy(heap);
heap = NULL; heap = NULL;
} }