From ee552901d2886efb264e7635fda9863840230e6c Mon Sep 17 00:00:00 2001
From: redstrate <54911369+redstrate@users.noreply.github.com>
Date: Tue, 18 Feb 2020 12:32:57 -0500
Subject: [PATCH] Add configurable model color

---
 src/main.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index c7d9808..160ac01 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,7 @@ const Camera camera = [] {
     return camera;
 }();
 constexpr std::string_view model_path = "suzanne.obj";
+constexpr glm::vec3 model_color = glm::vec3(1.0f, 1.0f, 1.0f);
 
 // internal variables
 constexpr float light_bias = 0.01f;
@@ -46,20 +47,18 @@ bool calculate_tile(const int32_t from_x, const int32_t to_width, const int32_t
                 const float diffuse = lighting::point_light(hit->position, light_position, hit->normal);
                 
                 //shadow calculation
-                bool blocked = false;
+                float shadow = 0.0f;
                 if(glm::dot(light_position - hit->position, hit->normal) > 0) {
                     const glm::vec3 light_dir = glm::normalize(light_position - hit->position);
                     
                     const Ray shadow_ray(hit->position + (hit->normal * light_bias), light_dir);
                     
                     if(test_scene(shadow_ray, scene))
-                        blocked = true;
-                } else {
-                    blocked = true;
+                        shadow = 1.0f;
                 }
                 
-                const int32_t finalColor = diffuse * 255 * !blocked;
-                colors.get(x, y) = glm::ivec4(finalColor, finalColor, finalColor, 1);
+                const glm::vec3 finalColor = model_color * diffuse * (1.0f - shadow);
+                colors.get(x, y) = glm::ivec4(finalColor * 255.0f, 255.0f);
             }
         }
     }