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
point_light.cpp
View File

@@ -28,7 +28,7 @@ vec3 PointLight::diffuse(vec3 normal, Ray & r, vec3 i_pos, Material & m) const {
l_dir = normalize(l_dir);
att = 1.0f / (m_const_att + (m_lin_att * d) + (m_quad_att * (d * d)));
return att * m_brdf->diffuse(l_dir, normal, r, m_diffuse);
return att * m.m_brdf->diffuse(l_dir, normal, r, m_diffuse);
}
vec3 PointLight::specular(vec3 normal, Ray & r, vec3 i_pos, Material & m) const {
@@ -40,5 +40,5 @@ vec3 PointLight::specular(vec3 normal, Ray & r, vec3 i_pos, Material & m) const
l_dir = normalize(l_dir);
att = 1.0f / (m_const_att + (m_lin_att * d) + (m_quad_att * (d * d)));
return att * m_brdf->specular(l_dir, normal, r, m_specular, m.m_shininess);
return att * m.m_brdf->specular(l_dir, normal, r, m_specular, m.m_shininess);
}