diff options
| author | 0scar <qgt268@alumni.ku.dk> | 2024-02-19 10:52:50 +0000 |
|---|---|---|
| committer | 0scar <qgt268@alumni.ku.dk> | 2024-02-19 11:05:13 +0000 |
| commit | cbbc317a5f95e6f21b052b8ce8a9df3a4a22d580 (patch) | |
| tree | 2a68b4d44030d01d8d813cdc4af5dda8b986d592 /src/resources | |
| parent | 46788a4a246249110ebd1db3162a43fcfa436976 (diff) | |
Add texture to renderobject
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/src/resources.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/resources/src/resources.c b/src/resources/src/resources.c index 8d99861..ece8c65 100644 --- a/src/resources/src/resources.c +++ b/src/resources/src/resources.c @@ -22,6 +22,8 @@ void* get_asset(Resources* r, u32 idx) { return &r->shader[r->get[idx]]; case Asset_texture: + return &r->texture[r->get[idx]]; + case Asset_error: case Asset_audio: case Asset_font: @@ -109,10 +111,11 @@ i32 resources_load(Resources *resources) { const Shader s = compose_shader(shaders, sz); DEBUG("shader = %d -- %s\n", s.program, ShaderType_str[s.type]); - resources->shader[resources->shader_len++] = s; + resources->shader[resources->shader_len] = s; + resources->shader_len++; } break; case Asset_texture: - resources->texture[resources->texture_len++] = load_texture(&resources->assets[i].texture); + resources->texture[resources->texture_len] = load_texture(&resources->assets[i].texture); resources->texture_len++; break; @@ -124,7 +127,7 @@ i32 resources_load(Resources *resources) { break; } - resources->get[i] = idx; + //resources->get[i] = idx; } free(imm_shader); |
