Adding some assertions

src/file/assetmanager.c

@@ -11,22 +11,26 @@ assetmanagerloaderdefinition_t ASSET_MANAGER_LOADERS[] = {
   {
     &_assetManagerLoaderTextureAsync,
     &_assetManagerLoaderTextureSync,
-    &_assetManagerLoaderTextureDispose
+    &_assetManagerLoaderTextureDispose,
+    NULL
   },
   {
     &_assetManagerLoaderFontAsync,
     &_assetManagerLoaderFontSync,
-    &_assetManagerLoaderFontDispose
+    &_assetManagerLoaderFontDispose,
+    NULL
   },
   {
     &_assetManagerLoaderShaderAsync,
     &_assetManagerLoaderShaderSync,
-    &_assetManagerLoaderShaderDispose
+    &_assetManagerLoaderShaderDispose,
+    NULL
   },
   {
     &_assetManagerLoaderScaledTextureAsync,
     &_assetManagerLoaderScaledTextureSync,
-    &_assetManagerLoaderScaledTextureDispose
+    &_assetManagerLoaderScaledTextureDispose,
+    NULL
   }
 };
 

src/file/loaders/font.c

@@ -8,7 +8,7 @@
 #include "font.h"
 
 assetmanageritem_t * assetManagerLoadFont(
-  assetmanager_t *manager, assetmanagerowner_t owner, char *fileName
+  assetmanager_t *manager, assetmanagerowner_t owner, const char fileName[]
 ) {
   assetmanageritem_t *item; 
   item = assetManagerItemGet(manager, fileName);

src/file/loaders/font.h

@@ -19,7 +19,7 @@
  * @return A pointer to the asset manager item for tracking.
  */
 assetmanageritem_t * assetManagerLoadFont(
-  assetmanager_t *manager, assetmanagerowner_t owner, char *fileName
+  assetmanager_t *manager, assetmanagerowner_t owner, const char fileName[]
 );
 
 bool _assetManagerLoaderFontAsync(assetmanageritem_t *item);

src/file/loaders/item.c

@@ -7,7 +7,9 @@
 
 #include "item.h"
 
-assetmanageritem_t * assetManagerItemGet(assetmanager_t *man, char *key) {
+assetmanageritem_t * assetManagerItemGet(
+  assetmanager_t *man, const char key[]
+) {
   uint8_t i;
   assetmanageritem_t *item;
 
@@ -19,11 +21,13 @@ assetmanageritem_t * assetManagerItemGet(assetmanager_t *man, char *key) {
   return NULL;
 }
 
-assetmanageritem_t * assetManagerItemAdd(assetmanager_t *manager, char *key) {
+assetmanageritem_t * assetManagerItemAdd(
+  assetmanager_t *manager, const char key[]
+) {
   // Check if key already exists.
   assetmanageritem_t *item = manager->items + manager->itemCount++;
   item->state = ASSET_MANAGER_STATE_NOT_READY;
-  memcpy(item->key, key, strlen(key) + 1);
+  item->key = key;
   item->holderCount = 0x00;
   return item;
 }

src/file/loaders/item.h

@@ -15,7 +15,7 @@
  * @param key Key to search for.
  * @return The matching asset manager item, or NULL if not found.
  */
-assetmanageritem_t * assetManagerItemGet(assetmanager_t *man, char *key);
+assetmanageritem_t * assetManagerItemGet(assetmanager_t *man, const char key[]);
 
 /**
  * Private method, simply adds an item to the manager and resets the state.
@@ -24,7 +24,9 @@ assetmanageritem_t * assetManagerItemGet(assetmanager_t *man, char *key);
  * @param key Key to use when adding.
  * @return The added and reset item.
  */
-assetmanageritem_t * assetManagerItemAdd(assetmanager_t *manager, char *key);
+assetmanageritem_t * assetManagerItemAdd(
+  assetmanager_t *manager, const char key[]
+);
 
 /**
  * Add or get the index that a given holder has as a manager item.

src/file/loaders/scaledtexture.c

@@ -8,7 +8,8 @@
 #include "scaledtexture.h"
 
 assetmanageritem_t * assetManagerLoadScaledTexture(
-  assetmanager_t *manager, assetmanagerowner_t owner, char *path, char *file
+  assetmanager_t *manager, assetmanagerowner_t owner,
+  const char path[], const char file[]
 ) {
   assetmanageritem_t *item;
   texturescale_t *st;

src/file/loaders/scaledtexture.h

@@ -21,7 +21,8 @@
  * @return A pointer to the asset manager item for tracking.
  */
 assetmanageritem_t * assetManagerLoadScaledTexture(
-  assetmanager_t *manager, assetmanagerowner_t owner, char *path, char *file
+  assetmanager_t *manager, assetmanagerowner_t owner,
+  const char path[], const char file[]
 );
 
 bool _assetManagerLoaderScaledTextureAsync(assetmanageritem_t *item);

src/file/loaders/shader.c

@@ -9,7 +9,7 @@
 
 assetmanageritem_t * assetManagerLoadShader(
   assetmanager_t *manager, assetmanagerowner_t owner,
-  char *fileVert, char *fileFrag
+  const char fileVert[], const char fileFrag[]
 ) {
   assetmanageritem_t *item;
   char buffer[ASSET_MANAGER_ITEM_NAME_MAX];

src/file/loaders/shader.h

@@ -21,7 +21,7 @@
  */
 assetmanageritem_t * assetManagerLoadShader(
   assetmanager_t *manager, assetmanagerowner_t owner,
-  char *fileVert, char *fileFrag
+  const char fileVert[], const char fileFrag[]
 );
 
 bool _assetManagerLoaderShaderAsync(assetmanageritem_t *item);

src/file/loaders/texture.c

@@ -8,7 +8,7 @@
 #include "texture.h"
 
 assetmanageritem_t * assetManagerLoadTexture(
-  assetmanager_t *manager, assetmanagerowner_t owner, char *fileName
+  assetmanager_t *manager, assetmanagerowner_t owner, const char fileName[]
 ) {
   assetmanageritem_t *item;
   item = assetManagerItemGet(manager, fileName);

src/file/loaders/texture.h

@@ -19,7 +19,7 @@
  * @return A pointer to the asset manager item for tracking.
  */
 assetmanageritem_t * assetManagerLoadTexture(
-  assetmanager_t *manager, assetmanagerowner_t owner, char *fileName
+  assetmanager_t *manager, assetmanagerowner_t owner, const char fileName[]
 );
 
 bool _assetManagerLoaderTextureAsync(assetmanageritem_t *item);

src/file/types/common.h

@@ -50,7 +50,7 @@ typedef union {
 typedef struct {
   uint8_t type;
   uint8_t state;
-  char key[ASSET_MANAGER_ITEM_NAME_MAX];
+  const char *key;
   assetmanagerassetdata_t data;
   assetmanagerowner_t holders[ASSET_MANAGER_HOLDERS_MAX];
   uint8_t holderCount;
@@ -64,6 +64,7 @@ typedef struct {
   assetmanagerloader_t *loadAsync;
   assetmanagerloader_t *loadSync;
   assetmanagerloader_t *dispose;
+  assetmanagerloader_t *update;
 } assetmanagerloaderdefinition_t;
 
 

src/file/types/font.h

@@ -10,6 +10,6 @@
 
 typedef struct {
   font_t font;
-  char *fileName;
+  const char *fileName;
   char *data;
 } assetmanagerfont_t;

src/file/types/shader.h

@@ -9,8 +9,8 @@
 
 typedef struct {
   shaderprogram_t shader;
-  char *fileVert;
-  char *fileFrag;
+  const char *fileVert;
+  const char *fileFrag;
   char *dataVert;
   char *dataFrag;
 } assetmanagershader_t;

src/file/types/texture.h

@@ -9,7 +9,7 @@
 
 typedef struct {
   texture_t texture;
-  char *fileName;
+  const char *fileName;
   int32_t width, height;
   pixel_t *data;
 } assetmanagertexture_t;