From 2188c2efdf2b226cb1b97f469cc8ec5fd11ac018 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 16 Oct 2019 21:30:23 +0100 Subject: [PATCH] fixed seg faults and leaks --- src/models.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/models.c b/src/models.c index 9981c4e19..7360b4fc0 100644 --- a/src/models.c +++ b/src/models.c @@ -3341,10 +3341,11 @@ static unsigned char *DecodeBase64(char *input, int *size) return buf; } -static Texture LoadTextureFromCGLTFTextureView(cgltf_texture_view* view, Color tint, char* texPath) +//static Texture LoadTextureFromCGLTFTextureView(cgltf_texture_view* view, Color tint, char* texPath) +static Texture LoadTextureFromCGLTFTextureView(cgltf_image* image, Color tint, const char* texPath) { Texture texture = {0}; - cgltf_image *image = view->texture->image; + //cgltf_image *image = view->texture->image; if (image->uri) { @@ -3413,6 +3414,8 @@ static Texture LoadTextureFromCGLTFTextureView(cgltf_texture_view* view, Color t ImageColorTint(&rimage, tint); texture = LoadTextureFromImage(rimage); UnloadImage(rimage); + free(raw); + free(data); } else { @@ -3503,35 +3506,44 @@ static Model LoadGLTF(const char *fileName) for (int i = 0; i < model.meshCount; i++) model.meshes[i].vboId = (unsigned int *)RL_CALLOC(MAX_MESH_VBO, sizeof(unsigned int)); - //For each material + //For each material for (int i = 0; i < model.materialCount - 1; i++) { model.materials[i] = LoadMaterialDefault(); Color tint = (Color){ 1.0f, 1.0f, 1.0f, 1.0f }; const char *texPath = GetDirectoryPath(fileName); - + //Ensure material follows raylib support for PBR (metallic/roughness flow) if (data->materials[i].has_pbr_metallic_roughness) { float roughness = data->materials[i].pbr_metallic_roughness.roughness_factor; float metallic = data->materials[i].pbr_metallic_roughness.metallic_factor; - strcpy(model.materials[i].name, data->materials[i].name); + if (model.materials[i].name && data->materials[i].name) { + strcpy(model.materials[i].name, data->materials[i].name); + } + // shouldn't these be *255 ??? tint.r = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[0]*255.99f); tint.g = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[1]*255.99f); tint.b = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[2]*255.99f); tint.a = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[3]*255.99f); model.materials[i].maps[MAP_ALBEDO].texture = LoadTextureFromCGLTFTextureView(data->materials[i].pbr_metallic_roughness.base_color_texture.texture->image, tint, texPath); - + //tint isn't need for other textures.. pass null or clear? tint = (Color){ 0.0f, 0.0f, 0.0f, 0.0f }; - model.materials[i].maps[MAP_ROUGHNESS].texture = LoadTextureFromCGLTFTextureView(data->materials[i].pbr_metallic_roughness.metallic_roughness_texture.texture->image, tint, texPath); + if (data->materials[i].pbr_metallic_roughness.metallic_roughness_texture.texture) { + model.materials[i].maps[MAP_ROUGHNESS].texture = LoadTextureFromCGLTFTextureView(data->materials[i].pbr_metallic_roughness.metallic_roughness_texture.texture->image, tint, texPath); + } model.materials[i].maps[MAP_ROUGHNESS].value = roughness; model.materials[i].maps[MAP_METALNESS].value = metallic; - - model.materials[i].maps[MAP_NORMAL].texture = LoadTextureFromCGLTFTextureView(data->materials[i].normal_texture.texture->image, tint, texPath); - model.materials[i].maps[MAP_OCCLUSION].texture = LoadTextureFromCGLTFTextureView(data->materials[i].occlusion_texture.texture->image, tint, texPath); + + if (data->materials[i].normal_texture.texture) { + model.materials[i].maps[MAP_NORMAL].texture = LoadTextureFromCGLTFTextureView(data->materials[i].normal_texture.texture->image, tint, texPath); + } + if (data->materials[i].occlusion_texture.texture) { + model.materials[i].maps[MAP_OCCLUSION].texture = LoadTextureFromCGLTFTextureView(data->materials[i].occlusion_texture.texture->image, tint, texPath); + } } }