Fixed attenuation for spot lighting

dorosch · Sep 15, 2022 · 0683f62 · 0683f62
1 parent 20e5aaa
commit 0683f62
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/include/core/ecs/component.hpp b/include/core/ecs/component.hpp
@@ -81,7 +81,7 @@ namespace Engine {
                 // Only for directional and spot lighting
                 glm::vec3 direction = glm::vec3(0.0f, 0.0f, 0.0f);
 
-                // Only for point lighting
+                // Only for point and spot lighting
                 float constant = 1.0f;
                 float linear = 0.35f;
                 float quadratic = 0.44f;

diff --git a/resources/shaders/default.frag b/resources/shaders/default.frag
@@ -124,13 +124,12 @@ vec3 calculateSpotLight(Light light, vec3 normal, vec3 fragPos, vec3 viewDir) {
     diffuse  *= intensity;
     specular *= intensity;
 
-	// TODO: Why it's not work??
     // Attenuation
-    // float distance = length(light.position - FragPos);
-    // float attenuation = 1.0 / (light.constant + light.linear * distance + light.quadratic * (distance * distance));
-    // ambient *= attenuation;
-    // diffuse *= attenuation;
-    // specular *= attenuation;
+    float distance = length(light.position - fragPos);
+    float attenuation = 1.0 / (light.constant + light.linear * distance + light.quadratic * (distance * distance));
+    ambient *= attenuation;
+    diffuse *= attenuation;
+    specular *= attenuation;
 
     return ambient + diffuse + specular;
 }
diff --git a/resources/shaders/material.frag b/resources/shaders/material.frag
@@ -134,13 +134,12 @@ vec3 calculateSpotLight(Light light, Material material, vec3 normal, vec3 fragPo
     diffuse  *= intensity;
     specular *= intensity;
 
-	// TODO: Why it's not work??
     // Attenuation
-    // float distance = length(light.position - FragPos);
-    // float attenuation = 1.0 / (light.constant + light.linear * distance + light.quadratic * (distance * distance));
-    // ambient *= attenuation;
-    // diffuse *= attenuation;
-    // specular *= attenuation;
+    float distance = length(light.position - fragPos);
+    float attenuation = 1.0 / (light.constant + light.linear * distance + light.quadratic * (distance * distance));
+    ambient *= attenuation;
+    diffuse *= attenuation;
+    specular *= attenuation;
 
     return ambient + diffuse + specular;
 }
diff --git a/src/core/render/api.cpp b/src/core/render/api.cpp
@@ -167,6 +167,9 @@ void Render::RenderObject(Object *object, glm::mat4 projection, glm::mat4 view,
                 lighting->light->direction.y,
                 lighting->light->direction.z
             );
+            shader->UniformFloat("light.constant", lighting->light->constant);
+            shader->UniformFloat("light.linear", lighting->light->linear);
+            shader->UniformFloat("light.quadratic", lighting->light->quadratic);
             shader->UniformFloat("light.cutOff", glm::cos(glm::radians(lighting->light->cutOff)));
             shader->UniformFloat("light.outerCutOff", glm::cos(glm::radians(lighting->light->outerCutOff)));
         }

diff --git a/src/editor.cpp b/src/editor.cpp
@@ -169,6 +169,9 @@ namespace Engine {
                                 case Engine::Graphics::Lighting::Type::SPOT:
                                     ImGui::SliderFloat("cutOff", &selectedEntity->light->cutOff, 0, 90.0);
                                     ImGui::SliderFloat("outerCutOff", &selectedEntity->light->outerCutOff, 0, 90.0);
+                                    ImGui::SliderFloat("constant", &selectedEntity->light->constant, 0, 1.0);
+                                    ImGui::SliderFloat("linear", &selectedEntity->light->linear, 0, 1.0);
+                                    ImGui::SliderFloat("quadratic", &selectedEntity->light->quadratic, 0, 1.0);
                                     ImGui::SliderFloat3("direction", &selectedEntity->light->direction[0], -10.0, 10.0);
                                     break;
                                 default: