WallyHackenslacker/PhotonMF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added recursion depth as a CL option.

Browse Source
This commit is contained in:
Miguel Angel Astor Romero
2017-01-12 13:03:29 -04:00
parent f93635b03b
commit 8c33e46b3d
8 changed files with 156 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
whitted_tracer.cpp
View File

@@ -58,10 +58,10 @@ vec3 WhittedTracer::trace_ray(Ray & r, vector<Figure *> & v_figures, vector<Ligh
color += (dir_diff_color * (_f->m_mat.m_diffuse / pi<float>())) + (_f->m_mat.m_diffuse * dir_spec_color);
// Determine the specular reflection color.
if (_f->m_mat.m_rho > 0.0f && rec_level < MAX_RECURSION) {
if (_f->m_mat.m_rho > 0.0f && rec_level < m_max_depth) {
rr = Ray(normalize(reflect(r.m_direction, n)), i_pos + n * BIAS);
color += _f->m_mat.m_rho * trace_ray(rr, v_figures, v_lights, rec_level + 1);
} else if (_f->m_mat.m_rho > 0.0f && rec_level >= MAX_RECURSION)
} else if (_f->m_mat.m_rho > 0.0f && rec_level >= m_max_depth)
return vec3(0.0f);
} else {
@@ -69,17 +69,17 @@ vec3 WhittedTracer::trace_ray(Ray & r, vector<Figure *> & v_figures, vector<Ligh
kr = fresnel(r.m_direction, n, r.m_ref_index, _f->m_mat.m_ref_index);
// Determine the specular reflection color.
if (kr > 0.0f && rec_level < MAX_RECURSION) {
if (kr > 0.0f && rec_level < m_max_depth) {
rr = Ray(normalize(reflect(r.m_direction, n)), i_pos + n * BIAS);
color += kr * trace_ray(rr, v_figures, v_lights, rec_level + 1);
} else if (rec_level >= MAX_RECURSION)
} else if (rec_level >= m_max_depth)
return vec3(0.0f);
// Determine the transmission color.
if (_f->m_mat.m_refract && kr < 1.0f && rec_level < MAX_RECURSION) {
if (_f->m_mat.m_refract && kr < 1.0f && rec_level < m_max_depth) {
rr = Ray(normalize(refract(r.m_direction, n, r.m_ref_index / _f->m_mat.m_ref_index)), i_pos - n * BIAS, _f->m_mat.m_ref_index);
color += (1.0f - kr) * trace_ray(rr, v_figures, v_lights, rec_level + 1);
} else if (rec_level >= MAX_RECURSION)
} else if (rec_level >= m_max_depth)
return vec3(0.0f);
}