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

Added more image formats

Browse Source 
Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
This commit is contained in:
Robear Selwans
2021-07-09 05:00:38 +02:00
parent 76fb4bf8d3
commit eb5f44e298
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/evmod.types
View File

@@ -21,7 +21,11 @@ TYPE(MeshAsset, struct {
}) })
typedef enum { typedef enum {
EV_IMAGEFORMAT_RGBA8, EV_IMAGEFORMAT_R8G8B8_SRGB,
EV_IMAGEFORMAT_R8G8B8_UNORM,
EV_IMAGEFORMAT_R8G8B8A8_SRGB,
EV_IMAGEFORMAT_R8G8B8A8_UNORM,
EV_IMAGEFORMAT_R32G32B32A32_SFLOAT,
EV_IMAGEFORMAT_INVALID EV_IMAGEFORMAT_INVALID
} EvImageFormat; } EvImageFormat;

16
src/loaders/ImageLoader/ImageLoader.c
View File

@@ -62,9 +62,17 @@ EvImageFormat
strToFormat( strToFormat(
evstr_ref str_ref) evstr_ref str_ref)
{ {
if(!strncmp(str_ref.data + str_ref.offset, "RGBA8", str_ref.len)) if(!strncmp(str_ref.data + str_ref.offset, "R8G8B8A8_SRGB", str_ref.len)) {
return EV_IMAGEFORMAT_RGBA8; return EV_IMAGEFORMAT_R8G8B8A8_SRGB;
} else if(!strncmp(str_ref.data + str_ref.offset, "R8G8B8A8_UNORM", str_ref.len)) {
else return EV_IMAGEFORMAT_R8G8B8A8_UNORM;
} else if(!strncmp(str_ref.data + str_ref.offset, "R8G8B8_UNORM", str_ref.len)) {
return EV_IMAGEFORMAT_R8G8B8_UNORM;
} else if(!strncmp(str_ref.data + str_ref.offset, "R8G8B8_SRGB", str_ref.len)) {
return EV_IMAGEFORMAT_R8G8B8_SRGB;
} else if(!strncmp(str_ref.data + str_ref.offset, "R32G32B32A32_SFLOAT", str_ref.len)) {
return EV_IMAGEFORMAT_R32G32B32A32_SFLOAT;
} else {
return EV_IMAGEFORMAT_INVALID; return EV_IMAGEFORMAT_INVALID;
}
} }

3
src/loaders/MeshLoader/MeshLoader.c
View File

@@ -22,6 +22,7 @@ ev_meshloader_loadasset(
uint32_t jsonLength = ((U32*)asset->data)[0]; uint32_t jsonLength = ((U32*)asset->data)[0];
uint32_t blobLength = ((U32*)asset->data)[1]; uint32_t blobLength = ((U32*)asset->data)[1];
(void)blobLength;
const char *json = (PTR)(&((U32*)asset->data)[2]); const char *json = (PTR)(&((U32*)asset->data)[2]);
const void *data = json + jsonLength; const void *data = json + jsonLength;
@@ -51,7 +52,7 @@ void
ev_meshloader_textasset_destr( ev_meshloader_textasset_destr(
MeshAsset mesh) MeshAsset mesh)
{ {
EV_UNUSED_PARAMS(mesh);
} }
void void