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

Merge pull request #264 from RandomErrorMessage/bugfix

Browse Source 
bugfix: (int)4 -> (float)4.0
This commit is contained in:
Joey de Vries
2022-01-17 18:59:36 +01:00
committed by GitHub
parent d57df39bf5 63362578f2
commit cf70474732
6 changed files with 6 additions and 6 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

@@ -85,7 +85,7 @@ void main()
vec3 F = fresnelSchlick(clamp(dot(H, V), 0.0, 1.0), F0); vec3 F = fresnelSchlick(clamp(dot(H, V), 0.0, 1.0), F0);
vec3 numerator = 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 float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = numerator / denominator; vec3 specular = numerator / denominator;
// kS is equal to Fresnel // kS is equal to Fresnel

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

@@ -112,7 +112,7 @@ void main()
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0); vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 numerator = 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 float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = numerator / denominator; vec3 specular = numerator / denominator;
// kS is equal to Fresnel // kS is equal to Fresnel

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

@@ -86,7 +86,7 @@ void main()
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0); vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 numerator = 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 float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = numerator / denominator; vec3 specular = numerator / denominator;
// kS is equal to Fresnel // kS is equal to Fresnel

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

@@ -89,7 +89,7 @@ void main()
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0); vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 numerator = 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 float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = numerator / denominator; vec3 specular = numerator / denominator;
// kS is equal to Fresnel // kS is equal to Fresnel

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

@@ -96,7 +96,7 @@ void main()
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0); vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 numerator = 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 float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = numerator / denominator; vec3 specular = numerator / denominator;
// kS is equal to Fresnel // kS is equal to Fresnel

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

@@ -125,7 +125,7 @@ void main()
vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0); vec3 F = fresnelSchlick(max(dot(H, V), 0.0), F0);
vec3 numerator = 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 float denominator = 4.0 * max(dot(N, V), 0.0) * max(dot(N, L), 0.0) + 0.0001; // + 0.0001 to prevent divide by zero
vec3 specular = numerator / denominator; vec3 specular = numerator / denominator;
// kS is equal to Fresnel // kS is equal to Fresnel