From cb8613078fab39a8e34d33551b38bf67280e11c3 Mon Sep 17 00:00:00 2001 From: onelin Date: Sun, 16 Mar 2025 22:29:58 +0100 Subject: Fix some resources warnings --- src/resources/src/model.c | 3 +++ src/resources/src/resources.c | 24 +++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'src/resources') diff --git a/src/resources/src/model.c b/src/resources/src/model.c index 3c3ee83..65bb614 100644 --- a/src/resources/src/model.c +++ b/src/resources/src/model.c @@ -8,6 +8,7 @@ Model load_model(const Asset_ModelSpec *restrict ms) { ModelType format = Model_error; + /* isize vertices_len = 0; vec3 *vertices = malloc(sizeof(vec3) * 512); usize *vertices_idx = malloc(sizeof(usize) * 512); @@ -19,6 +20,7 @@ Model load_model(const Asset_ModelSpec *restrict ms) { isize normals_len = 0; vec3 *normals = malloc(sizeof(vec3) * 512); usize *normals_idx = malloc(sizeof(usize) * 512); + */ // For now, just default to obj format = Model_obj; @@ -29,6 +31,7 @@ Model load_model(const Asset_ModelSpec *restrict ms) { return (Model){.format = format}; } const isize filesz = f_get_sz(f); + char* filecontets = calloc(filesz, sizeof(char)); fread(filecontets, sizeof(char), filesz, f); diff --git a/src/resources/src/resources.c b/src/resources/src/resources.c index 89769c8..ba28cd8 100644 --- a/src/resources/src/resources.c +++ b/src/resources/src/resources.c @@ -36,17 +36,17 @@ void* get_asset(Resources* r, u32 idx) { i32 resources_load(Resources *resources) { resources->get = calloc(resources->assets_len, sizeof(usize)); - isize audio_len = 0; - isize font_len = 0; - isize shader_len = 0; - isize shaderprog_len = 0; - isize texture_len = 0; + usize audio_len = 0; + usize font_len = 0; + usize shader_len = 0; + usize shaderprog_len = 0; + usize texture_len = 0; - isize i = 0; + usize i = 0; // Count each type of resource so we can allocate appropriate sizes. for (i = 0; i < resources->assets_len; i++) { - isize idx = 0; + usize idx = 0; switch (resources->assets[i].type) { case Asset_audio: idx = audio_len++; WARN("Audio resource type not implemented!"); break; @@ -80,8 +80,6 @@ i32 resources_load(Resources *resources) { texture_len = 0; for (i = 0; i < resources->assets_len; i++) { - isize idx = 0; - switch (resources->assets[i].type) { case Asset_audio: //resources->audio_len++; @@ -101,11 +99,11 @@ i32 resources_load(Resources *resources) { shader_len++; } break; case Asset_shaderprog: { - const isize sz = resources->assets[i].shaderprog.shader_len; + const usize sz = resources->assets[i].shaderprog.shader_len; const u32* shader_ids = resources->assets[i].shaderprog.shader; Shader* shaders = calloc(sz, sizeof(Shader)); - for (int j = 0; j < sz; j++) { + for (usize j = 0; j < sz; j++) { //DEBUG("shader[%d] = %d\n", j, imm_shader[resources->assets[i].shaderprog.shader[j]].program); //shaders[j] = imm_shader[resources->assets[i].shaderprog.shader[j]]; u32 shader_idx = shader_ids[j]; @@ -139,12 +137,12 @@ i32 resources_load(Resources *resources) { LOG(" Textures: %lu", resources->texture_len); // Delete the immediate shaders - for (int i = 0; i < shader_len; i++) { + for (i = 0; i < shader_len; i++) { // glDeleteShader() } - free(imm_shader); shaders_delete(imm_shader, shader_len); + free(imm_shader); return 0; } -- cgit v1.3