diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-03 12:45:17 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-03 13:36:50 +0300 |
commit | f667d18c842088d72b1b7a8f7b73d720e7647be3 (patch) | |
tree | ea08a5ed2eae3a013088b449db43171abc50f76c /src | |
parent | 0dedc62bbc09514a50400182402df46a273a7c3b (diff) |
Fix surface shadows and other misc fixes
- Remove culling from surface shadows to make them look correct
- Remove unnecessary metatype registration from qmloscilloscope
- itemmodeltest multi-change fixed
- Valgrind fixes
Task-number: QTRD-3160
Change-Id: I2da8b3e024dae56c52afb6b915535f49c6c987fc
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 3 | ||||
-rw-r--r-- | src/datavisualization/input/qabstract3dinputhandler.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index c7856834..f65ec634 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -1126,9 +1126,6 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) } } - glEnable(GL_CULL_FACE); - glCullFace(GL_FRONT); - Abstract3DRenderer::drawCustomItems(RenderingDepth, m_depthShader, viewMatrix, projectionViewMatrix, depthProjectionViewMatrix, m_depthTexture, m_shadowQualityToShader); diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index cb7d576b..c063ae58 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -230,7 +230,8 @@ QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputH m_previousInputPos(QPoint(0,0)), m_inputView(QAbstract3DInputHandler::InputViewNone), m_inputPosition(QPoint(0,0)), - m_scene(0) + m_scene(0), + m_isDefaultHandler(false) { } |