From 01367fcb1e1c9e00a74cbbe146d415fd64110d30 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 11 Apr 2019 16:11:54 +0200 Subject: [PATCH] Review cubemap generation --- src/rlgl.h | 6 +++--- src/textures.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/rlgl.h b/src/rlgl.h index a4a481f2..048c75da 100644 --- a/src/rlgl.h +++ b/src/rlgl.h @@ -2027,10 +2027,10 @@ unsigned int rlLoadTextureCubemap(void *data, int size, int format) unsigned int glInternalFormat, glFormat, glType; rlGetGlTextureFormats(format, &glInternalFormat, &glFormat, &glType); - // Load cubemap faces - for (unsigned int i = 0; i < 6; i++) + if (glInternalFormat != -1) { - if (glInternalFormat != -1) + // Load cubemap faces + for (unsigned int i = 0; i < 6; i++) { if (format < COMPRESSED_DXT1_RGB) glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, 0, glInternalFormat, size, size, 0, glFormat, glType, (unsigned char *)data + i*dataSize); #if !defined(GRAPHICS_API_OPENGL_11) diff --git a/src/textures.c b/src/textures.c index 169f8f86..7059fabb 100644 --- a/src/textures.c +++ b/src/textures.c @@ -1206,12 +1206,9 @@ TextureCubemap LoadTextureCubemap(Image image, int layoutType) cubemap.height = cubemap.width; } - int size = cubemap.width; - if (layoutType != CUBEMAP_AUTO_DETECT) { - //unsigned int dataSize = GetPixelDataSize(size, size, format); - //void *facesData = malloc(size*size*dataSize*6); // Get memory for 6 faces in a column + int size = cubemap.width; Image faces = { 0 }; // Vertical column image Rectangle faceRecs[6] = { 0 }; // Face source rectangles @@ -1225,6 +1222,7 @@ TextureCubemap LoadTextureCubemap(Image image, int layoutType) else if (layoutType == CUBEMAP_PANORAMA) { // TODO: Convert panorama image to square faces... + // Ref: https://github.com/denivip/panorama/blob/master/panorama.cpp } else {