small changes

Author: patriciogonzalezvivo

lighting/common/envBRDFApprox.glsl

@@ -1,6 +1,7 @@
 #ifndef FNC_ENVBRDFAPPROX
 #define FNC_ENVBRDFAPPROX
 
+//https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
 vec3 envBRDFApprox(const in vec3 _specularColor, const in float _NoV, const in float _roughness) {
     vec4 c0 = vec4(-1.0, -0.0275, -0.572,  0.022 );
     vec4 c1 = vec4( 1.0,  0.0425,  1.040, -0.040 );
@@ -10,4 +11,14 @@ vec3 envBRDFApprox(const in vec3 _specularColor, const in float _NoV, const in f
     return _specularColor * AB.x + AB.y;
 }
 
+//https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
+vec2 envBRDFApprox(const in float _NoV, in float _roughness ) {
+	const vec4 c0 = vec4( -1.0, -0.0275, -0.572, 0.022 );
+	const vec4 c1 = vec4( 1.0, 0.0425, 1.04, -0.04 );
+	vec4 r = _roughness * c0 + c1;
+	float a004 = min( r.x * r.x, exp2( -9.28 * _NoV ) ) * r.x + r.y;
+	vec2 AB = vec2( -1.04, 1.04 ) * a004 + r.zw;
+	return vec2(AB.x, AB.y);
+}
+
 #endif

lighting/fresnelReflection.glsl

@@ -24,12 +24,12 @@ vec3 fresnelReflection(const in vec3 R, const in vec3 f0, const in float NoV) {
     #elif defined(ENVMAP_FNC) 
     reflectColor = ENVMAP_FNC(R, 0.001, 0.001);
 
-    #elif defined(SCENE_CUBEMAP)
-    reflectColor = SAMPLE_CUBE_FNC( SCENE_CUBEMAP, R, ENVMAP_MAX_MIP_LEVEL ).rgb;
-
     #elif defined(SCENE_SH_ARRAY)
     reflectColor = sphericalHarmonics(R);
 
+    #elif defined(SCENE_CUBEMAP)
+    reflectColor = SAMPLE_CUBE_FNC( SCENE_CUBEMAP, R, ENVMAP_MAX_MIP_LEVEL ).rgb;
+
     #else
     reflectColor = fakeCube(R);
     #endif

lighting/pbr.glsl

@@ -61,18 +61,11 @@ vec4 pbr(const in Material _mat) {
     // Global Ilumination ( Image Based Lighting )
     // ------------------------
     vec3 E = envBRDFApprox(specularColor, NoV, _mat.roughness);
-
-    // This is a bit of a hack to pop the metalics
-    float specIntensity =   (2.0 * _mat.metallic) * 
-                            saturate(-1.1 + NoV + _mat.metallic) *          // Fresnel
-                            (_mat.metallic + (.95 - _mat.roughness) * 2.0); // make smaller highlights brighter
-                            // (_mat.metallic + (1.0 - _mat.roughness)); // make smaller highlights brighter
-
     float diffuseAO = min(_mat.ambientOcclusion, ssao);
 
     vec3 Fr = vec3(0.0, 0.0, 0.0);
-    Fr = envMap(R, _mat.roughness, _mat.metallic) * E * specIntensity;
-    #if defined(PLATFORM_RPI)
+    Fr = envMap(R, _mat.roughness, _mat.metallic) * E * 2.0;
+    #if !defined(PLATFORM_RPI)
     Fr += tonemap( fresnelReflection(R, _mat.f0, NoV) ) * _mat.metallic * (1.0-_mat.roughness) * 0.2;
     #endif
     Fr *= specularAO(NoV, diffuseAO, _mat.roughness);
@@ -81,7 +74,7 @@ vec4 pbr(const in Material _mat) {
     #if defined(SCENE_SH_ARRAY)
     Fd *= tonemap( sphericalHarmonics(N) );
     #endif
-    Fd *= diffuseAO; // diffuseAO
+    Fd *= diffuseAO;
     Fd *= (1.0 - E);
 
     // Local Ilumination

lighting/pbrClearCoat.glsl

@@ -75,30 +75,31 @@ vec4 pbrClearCoat(const Material _mat) {
 //     vec2 pixel = 1.0/RESOLUTION;
 //     ssao = ssao(SCENE_DEPTH, gl_FragCoord.xy*pixel, pixel, 1.);
 // #endif 
-    float diffuseAO = min(_mat.ambientOcclusion, ssao);
-    float specularAO = specularAO(NoV, diffuseAO, _mat.roughness);
 
     // Global Ilumination ( mage Based Lighting )
     // ------------------------
     vec3 E = envBRDFApprox(specularColor, NoV, _mat.roughness);
 
-    // This is a bit of a hack to pop the metalics
-    float specIntensity =   (2.0 * _mat.metallic) * 
-                            saturate(-1.1 + NoV + _mat.metallic) *          // Fresnel
-                            (_mat.metallic + (.95 - _mat.roughness) * 2.0); // make smaller highlights brighter
+    // // This is a bit of a hack to pop the metalics
+    // float specIntensity =   (2.0 * _mat.metallic) * 
+    //                         saturate(-1.1 + NoV + _mat.metallic) *          // Fresnel
+    //                         (_mat.metallic + (.95 - _mat.roughness) * 2.0); // make smaller highlights brighter
 
+    float diffAO = min(_mat.ambientOcclusion, ssao);
+    float specAO = specularAO(NoV, diffAO, _mat.roughness);
 
     vec3 Fr = vec3(0.0, 0.0, 0.0);
-    Fr = envMap(R, _mat.roughness, _mat.metallic) * E * specIntensity;
+    Fr = envMap(R, _mat.roughness, _mat.metallic) * E * 2.0;
+    #if !defined(PLATFORM_RPI)
     Fr += tonemap( fresnelReflection(R, f0, NoV) ) * _mat.metallic * (1.0-_mat.roughness) * 0.2;
-    Fr *= specularAO;
+    #endif
+    Fr *= specAO;
 
-    vec3 Fd = vec3(0.0, 0.0, 0.0);
-    Fd = diffuseColor;
+    vec3 Fd = diffuseColor;
     #if defined(SCENE_SH_ARRAY)
     Fd *= tonemap( sphericalHarmonics(N) );
     #endif
-    Fd *= diffuseAO;
+    Fd *= diffAO;
     Fd *= (1.0 - E);
 
     vec3 Fc = fresnel(f0, clearCoatNoV) * _mat.clearCoat;
@@ -111,8 +112,8 @@ vec4 pbrClearCoat(const Material _mat) {
     vec3 clearCoatE = envBRDFApprox(f0, clearCoatNoV, _mat.clearCoatRoughness);
     vec3 clearCoatLobe = vec3(0.0, 0.0, 0.0);
     clearCoatLobe += envMap(clearCoatR, _mat.clearCoatRoughness, 1.0) * clearCoatE * 3.;
-    clearCoatLobe += tonemap( fresnelReflection(clearCoatR, f0, clearCoatNoV) ) * (1.0-_mat.clearCoatRoughness);
-    Fr += clearCoatLobe * (specularAO * _mat.clearCoat);
+    clearCoatLobe += tonemap( fresnelReflection(clearCoatR, f0, clearCoatNoV) ) * (1.0-_mat.clearCoatRoughness) * 0.2;
+    Fr += clearCoatLobe * (specAO * _mat.clearCoat);
 
     vec4 color  = vec4(0.0, 0.0, 0.0, 1.0);
     color.rgb  += Fd * IBL_LUMINANCE;    // Diffuse
@@ -136,8 +137,9 @@ vec4 pbrClearCoat(const Material _mat) {
     color.rgb  += lightDiffuse;     // Diffuse
     color.rgb  += lightSpecular;    // Specular
 
-    // Clear Coat
+    // Clear Coat Local ilumination
     #if defined(LIGHT_DIRECTION) || defined(LIGHT_POSITION)
+
     #if defined(LIGHT_DIRECTION)
     vec3 L = normalize(LIGHT_DIRECTION);
     #elif defined(LIGHT_POSITION)

lighting/pbrGlass.glsl

@@ -63,8 +63,8 @@ vec4 pbrGlass(const Material _mat) {
 
     vec3 Fr = vec3(0.0, 0.0, 0.0);
     Fr = envMap(Re, roughness) * E;
-    #if defined(PLATFORM_RPI)
-    Fr += tonemap( fresnelReflection(Re, _mat.f0, NoV) ) * (1.0-roughness);
+    #if !defined(PLATFORM_RPI)
+    Fr += tonemap( fresnelReflection(Re, _mat.f0, NoV) ) * (1.0-roughness) * 0.2;
     #endif
 
     vec4 color  = vec4(0.0, 0.0, 0.0, 1.0);