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

Merge pull request #251 from BhayanakMoth/fix-ambient

Browse Source 
Corrected ambient lighting calculation
This commit is contained in:
Joey de Vries
2021-10-18 10:24:26 +02:00
committed by GitHub
parent a11954e474 89f3a18dd0
commit 279e6be7fa
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/5.advanced_lighting/3.1.2.shadow_mapping_base/3.1.2.shadow_mapping.fs
View File

@@ -36,7 +36,7 @@ void main()
vec3 normal = normalize(fs_in.Normal); vec3 normal = normalize(fs_in.Normal);
vec3 lightColor = vec3(0.3); vec3 lightColor = vec3(0.3);
// ambient // ambient
vec3 ambient = 0.3 * color; vec3 ambient = 0.3 * lightColor;
// diffuse // diffuse
vec3 lightDir = normalize(lightPos - fs_in.FragPos); vec3 lightDir = normalize(lightPos - fs_in.FragPos);
float diff = max(dot(lightDir, normal), 0.0); float diff = max(dot(lightDir, normal), 0.0);

2
src/5.advanced_lighting/3.1.3.shadow_mapping/3.1.3.shadow_mapping.fs
View File

@@ -56,7 +56,7 @@ void main()
vec3 normal = normalize(fs_in.Normal); vec3 normal = normalize(fs_in.Normal);
vec3 lightColor = vec3(0.3); vec3 lightColor = vec3(0.3);
// ambient // ambient
vec3 ambient = 0.3 * color; vec3 ambient = 0.3 * lightColor;
// diffuse // diffuse
vec3 lightDir = normalize(lightPos - fs_in.FragPos); vec3 lightDir = normalize(lightPos - fs_in.FragPos);
float diff = max(dot(lightDir, normal), 0.0); float diff = max(dot(lightDir, normal), 0.0);

2
src/5.advanced_lighting/3.2.1.point_shadows/3.2.1.point_shadows.fs
View File

@@ -41,7 +41,7 @@ void main()
vec3 normal = normalize(fs_in.Normal); vec3 normal = normalize(fs_in.Normal);
vec3 lightColor = vec3(0.3); vec3 lightColor = vec3(0.3);
// ambient // ambient
vec3 ambient = 0.3 * color; vec3 ambient = 0.3 * lightColor;
// diffuse // diffuse
vec3 lightDir = normalize(lightPos - fs_in.FragPos); vec3 lightDir = normalize(lightPos - fs_in.FragPos);
float diff = max(dot(lightDir, normal), 0.0); float diff = max(dot(lightDir, normal), 0.0);

2
src/5.advanced_lighting/3.2.2.point_shadows_soft/3.2.2.point_shadows.fs
View File

@@ -85,7 +85,7 @@ void main()
vec3 normal = normalize(fs_in.Normal); vec3 normal = normalize(fs_in.Normal);
vec3 lightColor = vec3(0.3); vec3 lightColor = vec3(0.3);
// ambient // ambient
vec3 ambient = 0.3 * color; vec3 ambient = 0.3 * lightColor;
// diffuse // diffuse
vec3 lightDir = normalize(lightPos - fs_in.FragPos); vec3 lightDir = normalize(lightPos - fs_in.FragPos);
float diff = max(dot(lightDir, normal), 0.0); float diff = max(dot(lightDir, normal), 0.0);