Added image-based lighting with HDR images.
This commit is contained in:
@@ -9,7 +9,7 @@ using namespace glm;
|
||||
|
||||
WhittedTracer::~WhittedTracer() { }
|
||||
|
||||
vec3 WhittedTracer::trace_ray(Ray & r, vector<Figure *> & v_figures, vector<Light *> & v_lights, unsigned int rec_level) const {
|
||||
vec3 WhittedTracer::trace_ray(Ray & r, vector<Figure *> & v_figures, vector<Light *> & v_lights, Environment * e, unsigned int rec_level) const {
|
||||
float t, _t;
|
||||
Figure * _f;
|
||||
vec3 n, color, i_pos, ref, dir_diff_color, dir_spec_color;
|
||||
@@ -60,7 +60,7 @@ vec3 WhittedTracer::trace_ray(Ray & r, vector<Figure *> & v_figures, vector<Ligh
|
||||
// Determine the specular reflection color.
|
||||
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);
|
||||
color += _f->m_mat->m_rho * trace_ray(rr, v_figures, v_lights, e, rec_level + 1);
|
||||
} else if (_f->m_mat->m_rho > 0.0f && rec_level >= m_max_depth)
|
||||
return vec3(0.0f);
|
||||
|
||||
@@ -71,14 +71,14 @@ vec3 WhittedTracer::trace_ray(Ray & r, vector<Figure *> & v_figures, vector<Ligh
|
||||
// Determine the specular reflection color.
|
||||
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);
|
||||
color += kr * trace_ray(rr, v_figures, v_lights, e, rec_level + 1);
|
||||
} 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 < 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);
|
||||
color += (1.0f - kr) * trace_ray(rr, v_figures, v_lights, e, rec_level + 1);
|
||||
} else if (rec_level >= m_max_depth)
|
||||
return vec3(0.0f);
|
||||
|
||||
@@ -87,6 +87,10 @@ vec3 WhittedTracer::trace_ray(Ray & r, vector<Figure *> & v_figures, vector<Ligh
|
||||
// Return final color.
|
||||
return color;
|
||||
|
||||
} else
|
||||
return BCKG_COLOR;
|
||||
} else {
|
||||
if (e != NULL)
|
||||
return e->get_color(r);
|
||||
else
|
||||
return vec3(0.0f);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user