lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent 1.0 - cosTheta from becoming negative due to small FP inaccuracies. This can cause NaNs otherwise.

Browse Source
This commit is contained in:
Joey de Vries
2020-12-13 13:53:56 +01:00
parent d444d98da7
commit 9a46ecf526
6 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/6.pbr/1.1.lighting/1.1.pbr.fs
View File

@@ -55,7 +55,7 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlick(float cosTheta, vec3 F0) vec3 fresnelSchlick(float cosTheta, vec3 F0)
{ {
return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0); return F0 + (1.0 - F0) * pow(max(1.0 - cosTheta, 0.0), 5.0);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void main() void main()

2
src/6.pbr/1.2.lighting_textured/1.2.pbr.fs
View File

@@ -77,7 +77,7 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlick(float cosTheta, vec3 F0) vec3 fresnelSchlick(float cosTheta, vec3 F0)
{ {
return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0); return F0 + (1.0 - F0) * pow(max(1.0 - cosTheta, 0.0), 5.0);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void main() void main()

7
src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.pbr.fs
View File

@@ -55,14 +55,9 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlick(float cosTheta, vec3 F0) vec3 fresnelSchlick(float cosTheta, vec3 F0)
{ {
return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0); return F0 + (1.0 - F0) * pow(max(1.0 - cosTheta, 0.0), 5.0);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlickRoughness(float cosTheta, vec3 F0, float roughness)
{
return F0 + (max(vec3(1.0 - roughness), F0) - F0) * pow(1.0 - cosTheta, 5.0);
}
// ----------------------------------------------------------------------------
void main() void main()
{ {
vec3 N = Normal; vec3 N = Normal;

2
src/6.pbr/2.1.2.ibl_irradiance/2.1.2.pbr.fs
View File

@@ -58,7 +58,7 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlick(float cosTheta, vec3 F0) vec3 fresnelSchlick(float cosTheta, vec3 F0)
{ {
return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0); return F0 + (1.0 - F0) * pow(max(1.0 - cosTheta, 0.0), 5.0);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void main() void main()

4
src/6.pbr/2.2.1.ibl_specular/2.2.1.pbr.fs
View File

@@ -60,12 +60,12 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlick(float cosTheta, vec3 F0) vec3 fresnelSchlick(float cosTheta, vec3 F0)
{ {
return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0); return F0 + (1.0 - F0) * pow(max(1.0 - cosTheta, 0.0), 5.0);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlickRoughness(float cosTheta, vec3 F0, float roughness) vec3 fresnelSchlickRoughness(float cosTheta, vec3 F0, float roughness)
{ {
return F0 + (max(vec3(1.0 - roughness), F0) - F0) * pow(1.0 - cosTheta, 5.0); return F0 + (max(vec3(1.0 - roughness), F0) - F0) * pow(max(1.0 - cosTheta, 0.0), 5.0);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void main() void main()

6
src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.pbr.fs
View File

@@ -82,13 +82,13 @@ float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlick(float cosTheta, vec3 F0) vec3 fresnelSchlick(float cosTheta, vec3 F0)
{ {
return F0 + (1.0 - F0) * pow(1.0 - cosTheta, 5.0); return F0 + (1.0 - F0) * pow(max(1.0 - cosTheta, 0.0), 5.0);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
vec3 fresnelSchlickRoughness(float cosTheta, vec3 F0, float roughness) vec3 fresnelSchlickRoughness(float cosTheta, vec3 F0, float roughness)
{ {
return F0 + (max(vec3(1.0 - roughness), F0) - F0) * pow(1.0 - cosTheta, 5.0); return F0 + (max(vec3(1.0 - roughness), F0) - F0) * pow(max(1.0 - cosTheta, 0.0), 5.0);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void main() void main()
{ {