lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use numerator instead of nominator (re-applied previous commit).

Browse Source
This commit is contained in:
Joey de Vries
2021-09-01 12:43:10 +02:00
parent 2ef9c55f16
commit 0d538f002d
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,9 +84,9 @@ void main()
float G = GeometrySmith(N, V, L, roughness);
vec3 F = fresnelSchlick(clamp(dot(H, V), 0.0, 1.0), F0);
vec3 nominator = NDF * G * F;
vec3 numerator = NDF * G * F;
float denominator = 4 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = nominator / denominator;
vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kS = F;

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

@@ -111,9 +111,9 @@ void main()
float G = GeometrySmith(N, V, L, roughness);
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 nominator = NDF * G * F;
vec3 numerator = NDF * G * F;
float denominator = 4 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = nominator / denominator;
vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kS = F;

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

@@ -85,9 +85,9 @@ void main()
float G = GeometrySmith(N, V, L, roughness);
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 nominator = NDF * G * F;
vec3 numerator = NDF * G * F;
float denominator = 4 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = nominator / denominator;
vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kS = F;

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

@@ -88,9 +88,9 @@ void main()
float G = GeometrySmith(N, V, L, roughness);
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 nominator = NDF * G * F;
vec3 numerator = NDF * G * F;
float denominator = 4 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = nominator / denominator;
vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kS = F;

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

@@ -95,9 +95,9 @@ void main()
float G = GeometrySmith(N, V, L, roughness);
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 nominator = NDF * G * F;
vec3 numerator = NDF * G * F;
float denominator = 4 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = nominator / denominator;
vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kS = F;

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

@@ -124,9 +124,9 @@ void main()
float G = GeometrySmith(N, V, L, roughness);
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 nominator = NDF * G * F;
vec3 numerator = NDF * G * F;
float denominator = 4 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = nominator / denominator;
vec3 specular = numerator / denominator;
// kS is equal to Fresnel
vec3 kS = F;