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

Moved BRDF to material definition.

Browse Source
This commit is contained in:
Miguel Angel Astor Romero
2017-01-12 13:38:42 -04:00
parent 8c33e46b3d
commit f7f912ff82
13 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
directional_light.cpp
View File

@@ -21,9 +21,9 @@ inline float DirectionalLight::distance(vec3 point) {
}
vec3 DirectionalLight::diffuse(vec3 normal, Ray & r, vec3 i_pos, Material & m) const {
return m_brdf->diffuse(m_position, normal, r, m_diffuse);
return m.m_brdf->diffuse(m_position, normal, r, m_diffuse);
}
vec3 DirectionalLight::specular(vec3 normal, Ray & r, vec3 i_pos, Material & m) const {
return m_brdf->specular(m_position, normal, r, m_specular, m.m_shininess);
return m.m_brdf->specular(m_position, normal, r, m_specular, m.m_shininess);
}