josh/wfobj-view
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update correct uniforms

Browse Source
This commit is contained in:
Josh Holtrop 2011-05-05 13:39:03 -04:00
parent b2fdaedf70
commit 0d70153bf9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wfobj-view.cc
View File

@ -343,9 +343,9 @@ void Viewer::renderMaterial(const WFObj::Material & m)
if (m.flags & WFObj::Material::AMBIENT_BIT) if (m.flags & WFObj::Material::AMBIENT_BIT)
glUniform4fv(m_ambient_loc, 4, &m.ambient[0]); glUniform4fv(m_ambient_loc, 4, &m.ambient[0]);
if (m.flags & WFObj::Material::DIFFUSE_BIT) 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) 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) if (m.flags & WFObj::Material::TEXTURE_BIT)
{ {
cerr << "error: textured materials not implemented yet" << endl; cerr << "error: textured materials not implemented yet" << endl;