summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-04 08:39:20 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-04 09:21:54 +0200
commita95495413e36e3f3770a69156e648a5018bf7d0e (patch)
tree7e688acff861d7ae8ff523550308503b44d4b551
parent69b0c64460dba18589ba7ef813c5871b390cf023 (diff)
Remove unnecessary render cycle for slicing mode.
Change-Id: I685352180bd7c17783c1f8a131b2d1877106622c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--src/datavisualization/engine/bars3drenderer.cpp7
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp7
2 files changed, 0 insertions, 14 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 4f8d60b1..21be9da4 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -259,8 +259,6 @@ void Bars3DRenderer::updateScene(Q3DScene *scene)
void Bars3DRenderer::render(GLuint defaultFboHandle)
{
- bool slicingChanged = m_cachedIsSlicingActivated != m_cachedScene->isSlicingActive();
-
// Handle GL state setup for FBO buffers and clearing of the render surface
Abstract3DRenderer::render(defaultFboHandle);
@@ -270,11 +268,6 @@ void Bars3DRenderer::render(GLuint defaultFboHandle)
// If slice selection is on, draw the sliced scene
if (m_cachedIsSlicingActivated)
drawSlicedScene(m_axisCacheX.titleItem(), m_axisCacheY.titleItem(), m_axisCacheZ.titleItem());
-
- // Trigger another render always when slicing changes in general to ensure
- // final draw is correct.
- if (slicingChanged)
- emit needRender();
}
void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel,
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 72f7db1d..063ddd7e 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -449,8 +449,6 @@ void Surface3DRenderer::updateInputState(QDataVis::InputState state)
void Surface3DRenderer::render(GLuint defaultFboHandle)
{
- bool slicingChanged = m_cachedIsSlicingActivated != m_cachedScene->isSlicingActive();
-
// Handle GL state setup for FBO buffers and clearing of the render surface
Abstract3DRenderer::render(defaultFboHandle);
@@ -466,11 +464,6 @@ void Surface3DRenderer::render(GLuint defaultFboHandle)
&& m_cachedSelectionMode.testFlag(QDataVis::SelectionItem)) {
m_selectionPointer->render(defaultFboHandle);
}
-
- // Trigger another render always when slicing changes in general to ensure
- // final draw is correct.
- if (slicingChanged)
- emit needRender();
}
void Surface3DRenderer::drawSlicedScene()