MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Review cubemap uage on PBR

Browse Source
This commit is contained in:
Ray 2017-07-11 10:56:19 +02:00
parent 1b7ff56b73
commit f45d068675
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/models.c
View File

@ -1336,10 +1336,11 @@ Material LoadMaterialPBR(Texture2D hdr, Color albedo, float metalness, float rou
#define BRDF_SIZE 512 // BRDF LUT texture map size #define BRDF_SIZE 512 // BRDF LUT texture map size
// Set up environment materials cubemap // Set up environment materials cubemap
mat.maps[TEXMAP_CUBEMAP].tex = rlGenMapCubemap(hdr, CUBEMAP_SIZE); Texture2D cubemap = rlGenMapCubemap(hdr, CUBEMAP_SIZE);
mat.maps[TEXMAP_IRRADIANCE].tex = rlGenMapIrradiance(mat.maps[TEXMAP_CUBEMAP].tex, IRRADIANCE_SIZE); mat.maps[TEXMAP_IRRADIANCE].tex = rlGenMapIrradiance(cubemap, IRRADIANCE_SIZE);
mat.maps[TEXMAP_PREFILTER].tex = rlGenMapPrefilter(mat.maps[TEXMAP_CUBEMAP].tex, PREFILTERED_SIZE); mat.maps[TEXMAP_PREFILTER].tex = rlGenMapPrefilter(cubemap, PREFILTERED_SIZE);
mat.maps[TEXMAP_BRDF].tex = rlGenMapBRDF(mat.maps[TEXMAP_CUBEMAP].tex, BRDF_SIZE); mat.maps[TEXMAP_BRDF].tex = rlGenMapBRDF(cubemap, BRDF_SIZE);
UnloadTexture(cubemap);
// NOTE: All maps textures are set to { 0 } // NOTE: All maps textures are set to { 0 }

2
src/raylib.h
View File

@ -559,12 +559,12 @@ typedef enum {
typedef enum { typedef enum {
TEXMAP_DIFFUSE = 0, TEXMAP_DIFFUSE = 0,
TEXMAP_SPECULAR = 1, TEXMAP_SPECULAR = 1,
TEXMAP_NORMAL = 2,
} TexmapBasicIndex; } TexmapBasicIndex;
typedef enum { typedef enum {
TEXMAP_ALBEDO = 0, TEXMAP_ALBEDO = 0,
TEXMAP_METALNESS = 1, TEXMAP_METALNESS = 1,
TEXMAP_NORMAL = 2,
TEXMAP_ROUGHNESS = 3, TEXMAP_ROUGHNESS = 3,
TEXMAP_OCCLUSION, TEXMAP_OCCLUSION,
TEXMAP_EMISSION, TEXMAP_EMISSION,