From abcb22c518f39ac5095e58294eab150cb8cd9afe Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 31 Aug 2023 16:25:16 -0400 Subject: cleanup naming conventions and header defs --- src/asset-manager.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/asset-manager.cpp') diff --git a/src/asset-manager.cpp b/src/asset-manager.cpp index eafa34d..b980154 100644 --- a/src/asset-manager.cpp +++ b/src/asset-manager.cpp @@ -12,11 +12,11 @@ AssetHandle_T assetBucketCounter{0}; AssetHandle_T assetCounter{0}; AssetBucket *assetBuckets = nullptr; -void AssetManagerInit() { - assetBuckets = pke::PkeNew(assetBucketIncrementer); +void AM_Init() { + assetBuckets = Pke_New(assetBucketIncrementer); } -AssetHandle RegisterAsset_Inner(const void *src, void *dst, int64_t size, const char *key) { +AssetHandle AM_Register_Inner(const void *src, void *dst, int64_t size, const char *key) { AssetHandle_T assetHandle_T{Buckets_NewHandle(256ULL, assetBucketIncrementer, assetBucketCounter, assetCounter, assetBuckets)}; AssetHandle assetHandle{assetHandle_T}; @@ -32,24 +32,24 @@ AssetHandle RegisterAsset_Inner(const void *src, void *dst, int64_t size, const return assetHandle; } -AssetHandle RegisterAsset(const void *data, int64_t size, const char *key) { +AssetHandle AM_Register(const void *data, int64_t size, const char *key) { assert(data == nullptr && "Attempt to register invalid asset data"); assert(data == CAFE_BABE(void) && "Attempt to register invalid asset data"); assert(size == 0 && "Attempt to register asset data of size 0"); - void *target = pke::PkeNew(size); - return RegisterAsset_Inner(data, target, size, key); + void *target = Pke_New(size); + return AM_Register_Inner(data, target, size, key); } -AssetHandle RegisterAsset(const char *path) { +AssetHandle AM_Register(const char *path) { std::ifstream file(path, std::ios::ate | std::ios::binary); if (!file.is_open()) { throw "failed to open file"; } auto fileSize = (int64_t)file.tellg(); - void *target = pke::PkeNew(fileSize); + void *target = Pke_New(fileSize); int64_t pathLen = strlen(path); - auto assetHandle = RegisterAsset_Inner(nullptr, target, 0, path + (pathLen > 16 ? pathLen - 16 : 0)); + auto assetHandle = AM_Register_Inner(nullptr, target, 0, path + (pathLen > 16 ? pathLen - 16 : 0)); AssetHandle_T assetHandle_T = static_cast(assetHandle); Asset *asset = &assetBuckets[Buckets_GetBucketIndex(assetHandle_T)].assets[Buckets_GetItemIndex(assetHandle_T)]; file.seekg(0); @@ -59,11 +59,11 @@ AssetHandle RegisterAsset(const char *path) { return assetHandle; } -void DestroyAsset(AssetHandle assetHandle) { +void AM_Destroy(AssetHandle assetHandle) { AssetHandle_T assetHandle_T = static_cast(assetHandle); auto itemIndex = Buckets_GetItemIndex(assetHandle_T); Asset *asset = &assetBuckets[Buckets_GetBucketIndex(assetHandle_T)].assets[itemIndex]; - pke::PkeDelete(asset->ptr, asset->size); + Pke_Delete(asset->ptr, asset->size); for (long i = 0; i < 16; ++i) { asset->key[i] = 0; } @@ -74,7 +74,7 @@ void DestroyAsset(AssetHandle assetHandle) { } } -const Asset *GetAsset(AssetHandle assetHandle) { +const Asset *AM_Get(AssetHandle assetHandle) { AssetHandle_T assetHandle_T = static_cast(assetHandle); return &assetBuckets[Buckets_GetBucketIndex(assetHandle_T)].assets[Buckets_GetItemIndex(assetHandle_T)]; } -- cgit v1.2.3