mo7sen/evol-mod-assetmanager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed AssetsysCheck for more detailed error messages.

Browse Source 
Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
This commit is contained in:
Robear Selwans
2021-06-08 19:18:18 +02:00
parent edb995b86c
commit 400bd2558d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod.c
View File

@@ -12,10 +12,10 @@
#include "loaders/MeshLoader/MeshLoader.h" #include "loaders/MeshLoader/MeshLoader.h"
#include "loaders/ShaderLoader/ShaderLoader.h" #include "loaders/ShaderLoader/ShaderLoader.h"
#define AssetSysCheck(...) do { \ #define AssetSysCheck(errmsg_fmt, vars, ...) do { \
assetsys_error_t res = __VA_ARGS__; \ assetsys_error_t res = __VA_ARGS__; \
if(res != ASSETSYS_SUCCESS) { \ if(res != ASSETSYS_SUCCESS) { \
ev_log_error("`%s` failed. Error Message: %s", EV_STRINGIZE(__VA_ARGS__), assetsys_error_strings[res]); \ ev_log_error(errmsg_fmt"`%s` failed. Error Message: %s", EV_EXPAND(vars), EV_STRINGIZE(__VA_ARGS__), assetsys_error_strings[res]); \
} \ } \
} while (0) } while (0)
@@ -135,12 +135,12 @@ ev_asset_load(
CONST_STR path) CONST_STR path)
{ {
assetsys_file_t file; assetsys_file_t file;
AssetSysCheck(assetsys_file(AssetManagerData.sys, path, &file)); AssetSysCheck("Failed to find file %s. ", (path), assetsys_file(AssetManagerData.sys, path, &file));
Asset a; Asset a;
a.size = (I64)assetsys_file_size(AssetManagerData.sys, file); a.size = (I64)assetsys_file_size(AssetManagerData.sys, file);
a.data = aligned_malloc(a.size + 1, 16); a.data = aligned_malloc(a.size + 1, 16);
int loaded_size = 0; int loaded_size = 0;
AssetSysCheck(assetsys_file_load(AssetManagerData.sys, file, &loaded_size, a.data, a.size)); AssetSysCheck("Failed to load file %s. ", (path), assetsys_file_load(AssetManagerData.sys, file, &loaded_size, a.data, a.size));
a.size = (I64) loaded_size; a.size = (I64) loaded_size;
((char*)a.data)[a.size] = '\0'; ((char*)a.data)[a.size] = '\0';
@@ -179,7 +179,7 @@ ev_assetmanager_mount(
evstring *as) evstring *as)
{ {
evstring_pushstr(as, ":/"); evstring_pushstr(as, ":/");
AssetSysCheck(assetsys_mount(AssetManagerData.sys, *path, *as)); AssetSysCheck("Failed to mount %s as %s. ", (*path, *as), assetsys_mount(AssetManagerData.sys, *path, *as));
} }
const Asset * const Asset *