clean up to use single image

This commit is contained in:
Tyler Bezera 2020-02-21 23:01:40 -08:00
parent 3a3bb46c8c
commit aef330dddf

View File

@ -3406,7 +3406,7 @@ static Image LoadImageFromCgltfImage(cgltf_image *image, const char *texPath, Co
int w, h; int w, h;
unsigned char *raw = stbi_load_from_memory(data, size, &w, &h, NULL, 4); unsigned char *raw = stbi_load_from_memory(data, size, &w, &h, NULL, 4);
Image rimage = LoadImagePro(raw, w, h, UNCOMPRESSED_R8G8B8A8); rimage = LoadImagePro(raw, w, h, UNCOMPRESSED_R8G8B8A8);
// TODO: Tint shouldn't be applied here! // TODO: Tint shouldn't be applied here!
ImageColorTint(&rimage, tint); ImageColorTint(&rimage, tint);
@ -3414,7 +3414,7 @@ static Image LoadImageFromCgltfImage(cgltf_image *image, const char *texPath, Co
} }
else else
{ {
Image rimage = LoadImage(TextFormat("%s/%s", texPath, image->uri)); rimage = LoadImage(TextFormat("%s/%s", texPath, image->uri));
// TODO: Tint shouldn't be applied here! // TODO: Tint shouldn't be applied here!
ImageColorTint(&rimage, tint); ImageColorTint(&rimage, tint);
@ -3436,7 +3436,7 @@ static Image LoadImageFromCgltfImage(cgltf_image *image, const char *texPath, Co
unsigned char *raw = stbi_load_from_memory(data, image->buffer_view->size, &w, &h, NULL, 4); unsigned char *raw = stbi_load_from_memory(data, image->buffer_view->size, &w, &h, NULL, 4);
free(data); free(data);
Image rimage = LoadImagePro(raw, w, h, UNCOMPRESSED_R8G8B8A8); rimage = LoadImagePro(raw, w, h, UNCOMPRESSED_R8G8B8A8);
free(raw); free(raw);
// TODO: Tint shouldn't be applied here! // TODO: Tint shouldn't be applied here!
@ -3444,7 +3444,7 @@ static Image LoadImageFromCgltfImage(cgltf_image *image, const char *texPath, Co
} }
else else
{ {
Image rimage = LoadImageEx(&tint, 1, 1); rimage = LoadImageEx(&tint, 1, 1);
} }
return rimage; return rimage;