From 0d70153bf94131ae56370daf652dcd3531466529 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 5 May 2011 13:39:03 -0400 Subject: [PATCH] update correct uniforms --- wfobj-view.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wfobj-view.cc b/wfobj-view.cc index 0bebee6..b730df1 100644 --- a/wfobj-view.cc +++ b/wfobj-view.cc @@ -343,9 +343,9 @@ void Viewer::renderMaterial(const WFObj::Material & m) if (m.flags & WFObj::Material::AMBIENT_BIT) glUniform4fv(m_ambient_loc, 4, &m.ambient[0]); if (m.flags & WFObj::Material::DIFFUSE_BIT) - glUniform4fv(m_diffuse_loc, 4, &m.ambient[0]); + glUniform4fv(m_diffuse_loc, 4, &m.diffuse[0]); if (m.flags & WFObj::Material::SPECULAR_BIT) - glUniform4fv(m_specular_loc, 4, &m.ambient[0]); + glUniform4fv(m_specular_loc, 4, &m.specular[0]); if (m.flags & WFObj::Material::TEXTURE_BIT) { cerr << "error: textured materials not implemented yet" << endl;