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

Merge branch 'master' into mesh_loader

Browse Source
This commit is contained in:
Youssef Assem
2021-06-08 14:35:41 +02:00
committed by GitHub
parent c1671c75d0 af7136199b
commit 9c1e68b7b0
9 changed files with 237 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mod.c
View File

@@ -10,6 +10,7 @@
#include "loaders/TextLoader/TextLoader.h"
#include "loaders/JSONLoader/JSONLoader.h"
#include "loaders/MeshLoader/MeshLoader.h"
#include "loaders/ShaderLoader/ShaderLoader.h"
#define AssetSysCheck(...) do { \
assetsys_error_t res = __VA_ARGS__; \
@@ -32,7 +33,7 @@ onRemoveAssetComponent(
ECSQuery query)
{
Asset *assets = ECS->getQueryColumn(query, sizeof(Asset), 1);
for(int i = 0; i < ECS->getQueryMatchCount(query); i++) {
for(U32 i = 0; i < ECS->getQueryMatchCount(query); i++) {
aligned_free(assets[i].data);
}
}
@@ -42,7 +43,7 @@ onRemoveTextAsset(
ECSQuery query)
{
TextAsset *assets = ECS->getQueryColumn(query, sizeof(TextAsset), 1);
for(int i = 0; i < ECS->getQueryMatchCount(query); i++) {
for(U32 i = 0; i < ECS->getQueryMatchCount(query); i++) {
ev_textloader_textasset_destr(assets[i]);
}
}
@@ -52,11 +53,12 @@ onRemoveJSONAsset(
ECSQuery query)
{
JSONAsset *assets = ECS->getQueryColumn(query, sizeof(JSONAsset), 1);
for(int i = 0; i < ECS->getQueryMatchCount(query); i++) {
for(U32 i = 0; i < ECS->getQueryMatchCount(query); i++) {
ev_jsonloader_jsonasset_destr(assets[i]);
}
}
// void
// onRemoveMeshAsset(
// ECSQuery query)
@@ -67,8 +69,19 @@ onRemoveJSONAsset(
// }
// }
void
onRemoveShaderAsset(
ECSQuery query)
{
ShaderAsset *assets = ECS->getQueryColumn(query, sizeof(ShaderAsset), 1);
for(U32 i = 0; i < ECS->getQueryMatchCount(query); i++) {
ev_shaderloader_shaderasset_destr(assets[i]);
}
}
EV_CONSTRUCTOR
{
ev_log_trace("evmod_asset constructor");
static_assert(sizeof(AssetEntityID) == sizeof(AssetHandle), "AssetEntityID not the same size of AssetHandle");
AssetManagerData.sys = assetsys_create( 0 );
@@ -88,11 +101,17 @@ EV_CONSTRUCTOR
ev_jsonloader_setassettype(AssetECS->registerComponent("JSONAsset", sizeof(JSONAsset), EV_ALIGNOF(JSONAsset)));
AssetECS->setOnRemoveTrigger("JSONAssetOnRemove", "JSONAsset", onRemoveJSONAsset);
ev_jsonloader_setassettype(AssetECS->registerComponent("MeshAsset", sizeof(MeshAsset), EV_ALIGNOF(MeshAsset)));
// AssetECS->setOnRemoveTrigger("MeshAssetOnRemove", "MeshAsset", onRemoveMeshAsset);
ev_shaderloader_setassettype(AssetECS->registerComponent("ShaderAsset", sizeof(ShaderAsset), EV_ALIGNOF(ShaderAsset)));
AssetECS->setOnRemoveTrigger("ShaderAssetOnRemove", "ShaderAsset", onRemoveShaderAsset);
}
}
ev_shaderloader_init();
return AssetManagerData.sys == NULL;
}
@@ -106,6 +125,8 @@ EV_DESTRUCTOR
if(AssetManagerData.ecs_mod) {
evol_unloadmodule(AssetManagerData.ecs_mod);
}
ev_shaderloader_deinit();
return 0;
}
@@ -179,6 +200,7 @@ ev_asset_markas(
EV_BINDINGS
{
ev_log_debug("Binding functions in evmod_asset");
EV_NS_BIND_FN(AssetManager, mount, ev_assetmanager_mount);
EV_NS_BIND_FN(Asset, load, ev_asset_load);
@@ -191,5 +213,7 @@ EV_BINDINGS
EV_NS_BIND_FN(MeshLoader, loadAsset, ev_meshloader_loadasset);
EV_NS_BIND_FN(ShaderLoader, loadAsset, ev_shaderloader_loadasset);
return 0;
}