diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-13 10:19:28 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-13 10:26:17 +0200 |
| commit | bbb874d0591215164b2030db60dc9d6a95f4c8fe (patch) | |
| tree | 50c5db87bb39cd8d021656be5bf7f1fd14487635 /src | |
| parent | fbde3692cc63fe2d8b2f5b2b42226c110a354fc7 (diff) | |
Slice render out-of-sync fixed
Task-number: QTRD-2555
Change-Id: I443f990a16a3d662332ac4021d3c22cb428875f1
Change-Id: I443f990a16a3d662332ac4021d3c22cb428875f1
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 14 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 12 |
2 files changed, 7 insertions, 19 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 2a9a5090..be844a43 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -47,7 +47,7 @@ const int smallerVPSize = 5; const bool sliceGridLabels = true; // TODO: Make this user controllable (QTRD-2546) // TODO: These will be based on sets (QTRD-2548) -const int seriesCount = 3; +const int seriesCount = 1; const float seriesScale = 1.0f / float(seriesCount); const float seriesStep = 1.0f / float(seriesCount); const float seriesStart = -((float(seriesCount) - 1.0f) / 2.0f) * seriesStep; @@ -280,15 +280,9 @@ void Bars3DRenderer::render(GLuint defaultFboHandle) // Handle GL state setup for FBO buffers and clearing of the render surface Abstract3DRenderer::render(defaultFboHandle); - if (m_cachedScene->isSecondarySubviewOnTop()) { - drawScene(defaultFboHandle); - if (m_cachedIsSlicingActivated) - drawSlicedScene(m_axisCacheX.titleItem(), m_axisCacheY.titleItem(), m_axisCacheZ.titleItem()); - } else { - if (m_cachedIsSlicingActivated) - drawSlicedScene(m_axisCacheX.titleItem(), m_axisCacheY.titleItem(), m_axisCacheZ.titleItem()); - drawScene(defaultFboHandle); - } + drawScene(defaultFboHandle); + if (m_cachedIsSlicingActivated) + drawSlicedScene(m_axisCacheX.titleItem(), m_axisCacheY.titleItem(), m_axisCacheZ.titleItem()); } void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel, diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 6ee12369..8bb16f86 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -453,15 +453,9 @@ void Surface3DRenderer::render(GLuint defaultFboHandle) // Handle GL state setup for FBO buffers and clearing of the render surface Abstract3DRenderer::render(defaultFboHandle); - if (m_cachedScene->isSecondarySubviewOnTop()) { - drawScene(defaultFboHandle); - if (m_cachedIsSlicingActivated) - drawSlicedScene(); - } else { - if (m_cachedIsSlicingActivated) - drawSlicedScene(); - drawScene(defaultFboHandle); - } + drawScene(defaultFboHandle); + if (m_cachedIsSlicingActivated) + drawSlicedScene(); // Render selection ball if (m_selectionPointer && m_selectionActive |