Merge branch 'master' into mesh_loader

This commit is contained in:
Youssef Assem
2021-06-08 14:35:41 +02:00
committed by GitHub
9 changed files with 237 additions and 5 deletions

View File

@@ -30,3 +30,10 @@ EV_NS_DEF_BEGIN(MeshLoader)
EV_NS_DEF_FN(MeshAsset, loadAsset, (AssetHandle, handle))
EV_NS_DEF_END(MeshLoader)
EV_NS_DEF_BEGIN(ShaderLoader)
EV_NS_DEF_FN(ShaderAsset, loadAsset, (AssetHandle, handle), (ShaderAssetStage, stage), (CONST_STR, shader_name), (CONST_STR, entrypoint), (CompiledShaderType, type))
EV_NS_DEF_END(ShaderLoader)

View File

@@ -10,6 +10,7 @@ TYPE(JSONAsset, struct {
PTR json_data;
})
TYPE(MeshAsset, struct {
uint32_t vertexBuferSize;
uint32_t vertexCount;
@@ -18,4 +19,26 @@ TYPE(MeshAsset, struct {
uint32_t indexBuferSize;
uint32_t indexCount;
uint32_t *indexData;
TYPE(ShaderAssetStage, enum {
EV_SHADERASSETSTAGE_VERTEX,
EV_SHADERASSETSTAGE_FRAGMENT,
EV_SHADERASSETSTAGE_COMPUTE,
EV_SHADERASSETSTAGE_GEOMETRY,
EV_SHADERASSETSTAGE_DETECT,
EV_SHADERASSETSTAGE_COUNT
})
TYPE(CompiledShaderType, enum {
EV_SHADER_ASM,
EV_SHADER_BIN
})
TYPE(ShaderAsset, struct {
PTR binary;
U64 len;
GenericHandle internal_handle;
CompiledShaderType type;
})