summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-06-09 09:58:15 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-06-09 10:01:31 +0300
commite9dc0f74f5cc06eb5edc3c16a63c9e6e89422584 (patch)
tree11096593d1bf958c549088034d1056e7444c7d1c
parent5aa705f448900cfe9e6a31dca1c0cd5d3e95df7e (diff)
Revert surface shadow cull disable
The fix caused weird self-shadowing issues in some cases, needs to be done differently. Change-Id: Ie66b03b6d8c7f480a5822774de76b033586b6a3a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--dist/changes-1.1.01
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/dist/changes-1.1.0 b/dist/changes-1.1.0
index 8a470ccb..7d27438b 100644
--- a/dist/changes-1.1.0
+++ b/dist/changes-1.1.0
@@ -57,7 +57,6 @@ General:
- Surface3D: Fixed a crash when shadows were supported by OpenGL but flat shading was not.
- Surface3D: Selection texture no longer gets corrupted in case there are multiple surfaces
visible and the axis ranges are adjusted.
-- Surface3D: Fixed shadow culling, improving the shadow cast on the surface itself.
New examples
------------
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index e4dfebfc..38c8d8fe 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -1126,6 +1126,9 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle)
}
}
+ glEnable(GL_CULL_FACE);
+ glCullFace(GL_FRONT);
+
Abstract3DRenderer::drawCustomItems(RenderingDepth, m_depthShader, viewMatrix,
projectionViewMatrix, depthProjectionViewMatrix,
m_depthTexture, m_shadowQualityToShader);