80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

resource/material: support live reload

Browse source
This commit is contained in:
Andrei Alexeyev 2021-11-29 22:51:51 +02:00
parent 8974f952f5
commit 560391e58d
No known key found for this signature in database
GPG key ID: 72D26128040B9690
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/resource/material.c
View file

@ -65,6 +65,13 @@ static void free_mat_load_data(struct mat_load_data *ld) {
static void material_load_stage2(ResourceLoadState *st);
static void material_load_stage1(ResourceLoadState *st) {
SDL_RWops *rw = res_open_file(st, st->path, VFS_MODE_READ);
if(UNLIKELY(!rw)) {
log_error("VFS error: %s", vfs_get_error());
res_load_failed(st);
}
struct mat_load_data *ld = calloc(1, sizeof(*ld));
ld->mat = calloc(1, sizeof(*ld->mat));
*ld->mat = (PBRMaterial) {
@ -75,7 +82,7 @@ static void material_load_stage1(ResourceLoadState *st) {
.depth_scale = 0,
};
if(!parse_keyvalue_file_with_spec(st->path, (KVSpec[]) {
bool ok = parse_keyvalue_stream_with_spec(rw, (KVSpec[]) {
{ "diffuse_map", .out_str = &ld->diffuse_map },
{ "normal_map", .out_str = &ld->normal_map },
{ "ambient_map", .out_str = &ld->ambient_map },
@ -88,7 +95,11 @@ static void material_load_stage1(ResourceLoadState *st) {
{ "metallic", .out_float = &ld->mat->metallic_value },
{ "depth_scale", .out_float = &ld->mat->depth_scale },
{ NULL },
})) {
});
SDL_RWclose(rw);
if(!ok) {
free_mat_load_data(ld);
log_error("Failed to parse material file '%s'", st->path);
res_load_failed(st);