From ab9a160cf4a9dadada6aacc069dc53c954d4d929 Mon Sep 17 00:00:00 2001
From: Miguel Angel Astor Romero <sonofgrendel@gmail.com>
Date: Thu, 16 Mar 2017 17:05:28 -0400
Subject: [PATCH] More photons.

---
 kd_tree.hpp       |  4 ++++
 photon_tracer.cpp | 26 +++++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/kd_tree.hpp b/kd_tree.hpp
index 2a3e6eb..01948c7 100644
--- a/kd_tree.hpp
+++ b/kd_tree.hpp
@@ -21,6 +21,10 @@ struct Vec3
   Vec3(float _x = 0.0f, float _y = 0.0f, float _z = 0.0f): x(_x), y(_y), z(_z) { }
 
   Vec3(const Vec3 & other) = default;
+
+  glm::vec3 toVec3() {
+    return glm::vec3(x, y, z);
+  }
   
   inline bool equalFloat(const float x, const float y)
   {
diff --git a/photon_tracer.cpp b/photon_tracer.cpp
index 8abfa25..be9772d 100644
--- a/photon_tracer.cpp
+++ b/photon_tracer.cpp
@@ -32,7 +32,7 @@ using namespace glm;
 PhotonTracer::~PhotonTracer() { }
 
 vec3 PhotonTracer::trace_ray(Ray & r, Scene * s, unsigned int rec_level) const {
-  float t, _t, radius, red, green, blue, kr;
+  float t, _t, radius, red, green, blue, kr, w;
   Figure * _f;
   vec3 n, color, i_pos, ref, dir_diff_color, dir_spec_color, p_contrib;
   Ray mv_r, sr, rr;
@@ -122,19 +122,27 @@ vec3 PhotonTracer::trace_ray(Ray & r, Scene * s, unsigned int rec_level) const {
       // }
       m_photon_map.find_by_distance(photons, i_pos, n, m_h_radius, 1000);
       m_caustics_map.find_by_distance(caustics, i_pos, n, m_h_radius, 1000);
-      
+      photons.insert(photons.end(), caustics.begin(), caustics.end());
+
       for (Photon p : photons) {
+	w = max(0.0f, -dot(n, -p.direction.toVec3()));
+	w *= (1.0f - m_h_radius) / 25.0f;
 	p.getColor(red, green, blue);
-	p_contrib += vec3(red, green, blue);
+	p_contrib += vec3(red, green, blue) * w;
       }
-      for (Photon p : caustics) {
-	p.getColor(red, green, blue);
-	p_contrib += vec3(red, green, blue);
-      }
-      p_contrib *= (1.0f / pi<float>()) / (m_h_radius * m_h_radius);
+      
+      // for (Photon p : photons) {
+      // 	p.getColor(red, green, blue);
+      // 	p_contrib += vec3(red, green, blue);
+      // }
+      // for (Photon p : caustics) {
+      // 	p.getColor(red, green, blue);
+      // 	p_contrib += vec3(red, green, blue);
+      // }
+      // p_contrib *= (1.0f / pi<float>()) / (m_h_radius * m_h_radius);
       // color += (1.0f - _f->m_mat->m_rho) * (((dir_diff_color + p_contrib) * (_f->m_mat->m_diffuse / pi<float>())) +
       // 					    (_f->m_mat->m_specular * dir_spec_color));
-      color += p_contrib;
+      color += (1.0f - _f->m_mat->m_rho) * p_contrib;
 
       // Determine the specular reflection color.
       if (_f->m_mat->m_rho > 0.0f && rec_level < m_max_depth) {