diff options
| author | 2020-08-24 16:37:38 -0400 | |
|---|---|---|
| committer | 2020-08-24 16:37:38 -0400 | |
| commit | 099cd3b45f6f0f2acf01b0497c61046f16df7c0c (patch) | |
| tree | 391349f5327436b460c7dfd04408fa4538c7adbf /src/objects | |
| parent | c5ab6fd0e37cfb8c5ba65ade8eb076e980010048 (diff) | |
| download | mauri-099cd3b45f6f0f2acf01b0497c61046f16df7c0c.tar.gz mauri-099cd3b45f6f0f2acf01b0497c61046f16df7c0c.tar.bz2 mauri-099cd3b45f6f0f2acf01b0497c61046f16df7c0c.zip | |
return ref to texture
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/pass.c | 4 | ||||
| -rw-r--r-- | src/objects/pass.h | 2 |
2 files changed, 3 insertions, 3 deletions
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; |