diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-28 13:58:02 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-28 14:02:07 +0200 |
commit | 5c4592ea5bb3a4c98a5fe1846c8b3082bd33e678 (patch) | |
tree | 0f3e4094c0443c7a93821a9f87dcdbc4393277ac /src/datavisualization/engine/scatter3drenderer.cpp | |
parent | a7e8a3279547dbea4b5343f44f3b7563c0212f1e (diff) |
Theme sync
Task-number: QTRD-2538
Change-Id: I12dfb562dc59ae1df3b5127f0f675a3796ba3f00
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/scatter3drenderer.cpp')
-rw-r--r-- | src/datavisualization/engine/scatter3drenderer.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 73864643..24e33ba6 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -679,7 +679,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) glCullFace(GL_BACK); // Draw background - if (m_cachedIsBackgroundEnabled && m_backgroundObj) { + if (m_cachedTheme->isBackgroundEnabled() && m_backgroundObj) { QMatrix4x4 modelMatrix; QMatrix4x4 MVPMatrix; QMatrix4x4 itModelMatrix; @@ -760,7 +760,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) axisCacheMax = &m_axisCacheX; #endif - if (m_cachedIsGridEnabled && m_heightNormalizer) { + if (m_cachedTheme->isGridEnabled() && m_heightNormalizer) { ShaderHelper *lineShader = m_backgroundShader; // Bind line shader @@ -1455,14 +1455,6 @@ void Scatter3DRenderer::handleResize() Abstract3DRenderer::handleResize(); } -void Scatter3DRenderer::updateBackgroundEnabled(bool enable) -{ - if (enable != m_cachedIsBackgroundEnabled) { - Abstract3DRenderer::updateBackgroundEnabled(enable); - loadMeshFile(); // Load changed dot type - } -} - void Scatter3DRenderer::updateShadowQuality(QDataVis::ShadowQuality quality) { m_cachedShadowQuality = quality; |