From 099cd3b45f6f0f2acf01b0497c61046f16df7c0c Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 24 Aug 2020 16:37:38 -0400 Subject: return ref to texture --- src/objects/pass.c | 4 ++-- src/objects/pass.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/objects') diff --git a/src/objects/pass.c b/src/objects/pass.c index c2107aa..c90eb92 100644 --- a/src/objects/pass.c +++ b/src/objects/pass.c @@ -9,8 +9,8 @@ void mri_pass_parse(mri_pass *pass, json_t *root) { json_t *textures = json_object_get(root, "textures"); json_array(texture, textures) { if (json_is_string(texture)) { - //mri_texture_load(&pass->textures[0], mri_asset_manager_get(json_string_value(texture), TEXTURE)); - //mri_texture_unload(&pass->textures[0]); + pass->textures[i] = mri_texture_load(mri_asset_manager_get(json_string_value(texture), TEXTURE)); + mri_texture_unload(pass->textures[i]); } } } diff --git a/src/objects/pass.h b/src/objects/pass.h index fca8bac..aa8e2fb 100644 --- a/src/objects/pass.h +++ b/src/objects/pass.h @@ -8,7 +8,7 @@ typedef struct { // mri_shader *shader; // mri_material *material; - mri_texture textures[7]; + mri_texture *textures[7]; // mvec(mri_uniform) uniforms; // mvec(mri_combo) combos; -- cgit v1.2.3-101-g0448