Commit b8887a91 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'GlutPrimitveNode' into 'master'

Proper shading for GlutPrimitve in Shader Pipeline.



See merge request !54
parents 7b1f0cfa 99b1f1ce
Pipeline #687 passed with stage
......@@ -435,13 +435,14 @@ getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawM
Material localMaterial = *_mat;
if (setColor_)
{
localMaterial.color(primitives_[i].color);
localMaterial.ambientColor(primitives_[i].color);
//localMaterial.color(primitives_[i].color);
//localMaterial.ambientColor(primitives_[i].color);
localMaterial.diffuseColor(primitives_[i].color);
localMaterial.baseColor(primitives_[i].color);
localMaterial.baseColor(primitives_[i].color * .5);
}
ro.setMaterial(&localMaterial);
ro.shaderDesc.shadeMode = SG_SHADE_PHONG;
switch (primitives_[i].type) {
case SPHERE:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment