From f45d068675184695d603b45879a99fdf477cd58a Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Tue, 11 Jul 2017 10:56:19 +0200
Subject: [PATCH] Review cubemap uage on PBR

---
 src/models.c | 9 +++++----
 src/raylib.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/models.c b/src/models.c
index cb42fca5f..bd283e8fa 100644
--- a/src/models.c
+++ b/src/models.c
@@ -1336,10 +1336,11 @@ Material LoadMaterialPBR(Texture2D hdr, Color albedo, float metalness, float rou
     #define BRDF_SIZE            512        // BRDF LUT texture map size
 
     // Set up environment materials cubemap
-    mat.maps[TEXMAP_CUBEMAP].tex = rlGenMapCubemap(hdr, CUBEMAP_SIZE);
-    mat.maps[TEXMAP_IRRADIANCE].tex = rlGenMapIrradiance(mat.maps[TEXMAP_CUBEMAP].tex, IRRADIANCE_SIZE);
-    mat.maps[TEXMAP_PREFILTER].tex = rlGenMapPrefilter(mat.maps[TEXMAP_CUBEMAP].tex, PREFILTERED_SIZE);
-    mat.maps[TEXMAP_BRDF].tex = rlGenMapBRDF(mat.maps[TEXMAP_CUBEMAP].tex, BRDF_SIZE);
+    Texture2D cubemap = rlGenMapCubemap(hdr, CUBEMAP_SIZE);
+    mat.maps[TEXMAP_IRRADIANCE].tex = rlGenMapIrradiance(cubemap, IRRADIANCE_SIZE);
+    mat.maps[TEXMAP_PREFILTER].tex = rlGenMapPrefilter(cubemap, PREFILTERED_SIZE);
+    mat.maps[TEXMAP_BRDF].tex = rlGenMapBRDF(cubemap, BRDF_SIZE);
+    UnloadTexture(cubemap);
     
     // NOTE: All maps textures are set to { 0 }
     
diff --git a/src/raylib.h b/src/raylib.h
index 89065df2d..2ee40a695 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -559,12 +559,12 @@ typedef enum {
 typedef enum {
     TEXMAP_DIFFUSE  = 0,
     TEXMAP_SPECULAR = 1,
-    TEXMAP_NORMAL   = 2,
 } TexmapBasicIndex;
 
 typedef enum {
     TEXMAP_ALBEDO    = 0,
     TEXMAP_METALNESS = 1,
+    TEXMAP_NORMAL    = 2,
     TEXMAP_ROUGHNESS = 3,
     TEXMAP_OCCLUSION,
     TEXMAP_EMISSION,