Commit 1438b673 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'render-fixes' into 'master'

Render fixes

See merge request !18
parents eab2727f b20f7e9f
......@@ -352,7 +352,9 @@ void VolumeMeshBufferManager<VolumeMesh>::setOptionsFromDrawMode(ACG::SceneGraph
else if (_drawMode & (mDrawModes.facesFlatShaded | mDrawModes.facesTexturedShaded | mDrawModes.facesColoredPerFaceFlatShaded))
enablePerFaceNormals();
else if (_drawMode & (mDrawModes.cellsSmoothShaded | mDrawModes.facesSmoothShaded | mDrawModes.halffacesSmoothShaded |
mDrawModes.cellsPhongShaded | mDrawModes.facesPhongShaded | mDrawModes.halffacesPhongShaded))
mDrawModes.cellsPhongShaded | mDrawModes.facesPhongShaded | mDrawModes.halffacesPhongShaded |
mDrawModes.cellsColoredPerCell | mDrawModes.cellsColoredPerFace | mDrawModes.cellsColoredPerHalfface |
mDrawModes.cellsColoredPerVertex | mDrawModes.cellsTransparent))
enablePerVertexNormals();
else
disableNormals();
......
......@@ -757,7 +757,7 @@ void VolumeMeshNodeT<VolumeMeshT>::getCellRenderObjects(IRenderer* _renderer, GL
ro.shaderDesc.clearTextures();
ro.shaderDesc.shadeMode = SG_SHADE_GOURAUD;
ro.shaderDesc.shadeMode = SG_SHADE_UNLIT;
ro.depthRange = Vec2f(0.01f, 1.0f);
......@@ -765,8 +765,7 @@ void VolumeMeshNodeT<VolumeMeshT>::getCellRenderObjects(IRenderer* _renderer, GL
{
ro.shaderDesc.vertexColors = true;
ro.shaderDesc.numLights = -1;
ro.shaderDesc.shadeMode = SG_SHADE_GOURAUD;
ro.shaderDesc.shadeMode = SG_SHADE_UNLIT;
}
else if (_drawMode & drawModes_.cellsSmoothShaded)
{
......
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