From 89f3a18dd0c55aeb7cb62f9b07286f692f7b26b5 Mon Sep 17 00:00:00 2001 From: Nipun Ramani Date: Sun, 17 Oct 2021 18:30:59 +0530 Subject: [PATCH] Corrected ambient lighting calculation --- .../3.1.2.shadow_mapping_base/3.1.2.shadow_mapping.fs | 2 +- .../3.1.3.shadow_mapping/3.1.3.shadow_mapping.fs | 2 +- .../3.2.1.point_shadows/3.2.1.point_shadows.fs | 2 +- .../3.2.2.point_shadows_soft/3.2.2.point_shadows.fs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/5.advanced_lighting/3.1.2.shadow_mapping_base/3.1.2.shadow_mapping.fs b/src/5.advanced_lighting/3.1.2.shadow_mapping_base/3.1.2.shadow_mapping.fs index 46bc723..27d9334 100644 --- a/src/5.advanced_lighting/3.1.2.shadow_mapping_base/3.1.2.shadow_mapping.fs +++ b/src/5.advanced_lighting/3.1.2.shadow_mapping_base/3.1.2.shadow_mapping.fs @@ -36,7 +36,7 @@ void main() vec3 normal = normalize(fs_in.Normal); vec3 lightColor = vec3(0.3); // ambient - vec3 ambient = 0.3 * color; + vec3 ambient = 0.3 * lightColor; // diffuse vec3 lightDir = normalize(lightPos - fs_in.FragPos); float diff = max(dot(lightDir, normal), 0.0); diff --git a/src/5.advanced_lighting/3.1.3.shadow_mapping/3.1.3.shadow_mapping.fs b/src/5.advanced_lighting/3.1.3.shadow_mapping/3.1.3.shadow_mapping.fs index b0bc639..40d24df 100644 --- a/src/5.advanced_lighting/3.1.3.shadow_mapping/3.1.3.shadow_mapping.fs +++ b/src/5.advanced_lighting/3.1.3.shadow_mapping/3.1.3.shadow_mapping.fs @@ -56,7 +56,7 @@ void main() vec3 normal = normalize(fs_in.Normal); vec3 lightColor = vec3(0.3); // ambient - vec3 ambient = 0.3 * color; + vec3 ambient = 0.3 * lightColor; // diffuse vec3 lightDir = normalize(lightPos - fs_in.FragPos); float diff = max(dot(lightDir, normal), 0.0); diff --git a/src/5.advanced_lighting/3.2.1.point_shadows/3.2.1.point_shadows.fs b/src/5.advanced_lighting/3.2.1.point_shadows/3.2.1.point_shadows.fs index 500b897..8f1333d 100644 --- a/src/5.advanced_lighting/3.2.1.point_shadows/3.2.1.point_shadows.fs +++ b/src/5.advanced_lighting/3.2.1.point_shadows/3.2.1.point_shadows.fs @@ -41,7 +41,7 @@ void main() vec3 normal = normalize(fs_in.Normal); vec3 lightColor = vec3(0.3); // ambient - vec3 ambient = 0.3 * color; + vec3 ambient = 0.3 * lightColor; // diffuse vec3 lightDir = normalize(lightPos - fs_in.FragPos); float diff = max(dot(lightDir, normal), 0.0); diff --git a/src/5.advanced_lighting/3.2.2.point_shadows_soft/3.2.2.point_shadows.fs b/src/5.advanced_lighting/3.2.2.point_shadows_soft/3.2.2.point_shadows.fs index c72d1d7..33f32a6 100644 --- a/src/5.advanced_lighting/3.2.2.point_shadows_soft/3.2.2.point_shadows.fs +++ b/src/5.advanced_lighting/3.2.2.point_shadows_soft/3.2.2.point_shadows.fs @@ -85,7 +85,7 @@ void main() vec3 normal = normalize(fs_in.Normal); vec3 lightColor = vec3(0.3); // ambient - vec3 ambient = 0.3 * color; + vec3 ambient = 0.3 * lightColor; // diffuse vec3 lightDir = normalize(lightPos - fs_in.FragPos); float diff = max(dot(lightDir, normal), 0.0);