diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-14 12:44:23 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-14 12:44:23 +0300 |
commit | ca476759926f3315fc9325c5fb42a0dee9d8227e (patch) | |
tree | 109d4910feb071dcb1fc9e7230cd0fe27947af86 /src/datavisualization/engine/bars3drenderer.cpp | |
parent | 275127c08d876b9dca53735d07140feae34bcee4 (diff) | |
parent | d5443469d35cd2f67a538838a979e4e0b47c58cd (diff) |
Merge remote-tracking branch 'origin/develop'
Change-Id: Ic5c1bd060688efeec4c2568338d4da370c716a91
Diffstat (limited to 'src/datavisualization/engine/bars3drenderer.cpp')
-rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 32a23da5..cbe0446c 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -295,6 +295,12 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel, // Bind bar shader m_barShader->bind(); + // Set common bar shader bindings + m_barShader->setUniformValue(m_barShader->lightP(), lightPos); + m_barShader->setUniformValue(m_barShader->view(), viewMatrix); + m_barShader->setUniformValue(m_barShader->lightS(), 0.5f); + m_barShader->setUniformValue(m_barShader->ambientS(), + m_cachedTheme.m_ambientStrength * 2.0f); // Draw bars // Draw the selected row / column for (int bar = startBar; bar != stopBar; bar += stepBar) { @@ -345,22 +351,14 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel, if (item->height() != 0) { // Set shader bindings - m_barShader->setUniformValue(m_barShader->lightP(), lightPos); - m_barShader->setUniformValue(m_barShader->view(), viewMatrix); m_barShader->setUniformValue(m_barShader->model(), modelMatrix); m_barShader->setUniformValue(m_barShader->nModel(), itModelMatrix.inverted().transposed()); m_barShader->setUniformValue(m_barShader->MVP(), MVPMatrix); m_barShader->setUniformValue(m_barShader->color(), barColor); - m_barShader->setUniformValue(m_barShader->lightS(), 0.5f); - m_barShader->setUniformValue(m_barShader->ambientS(), - m_cachedTheme.m_ambientStrength * 2.0f); + // Draw the object -#if defined (Q_OS_MAC) - m_drawer->drawObject(m_barShader, m_barObj, 0, -1); -#else m_drawer->drawObject(m_barShader, m_barObj); -#endif } } @@ -412,7 +410,7 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel, m_labelObj, m_cachedScene->activeCamera(), false, false, Drawer::LabelLeft); // Draw labels for bars - for (int col = 0; col < m_sliceSelection->size(); col++) { + for (int col = 0; col < stopBar; col++) { BarRenderItem *item = m_sliceSelection->at(col); // Draw values if (negativesComp == 1.0f) { @@ -760,6 +758,12 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) // Bind bar shader m_barShader->bind(); + // Set common bar shader bindings + m_barShader->setUniformValue(m_barShader->lightP(), lightPos); + m_barShader->setUniformValue(m_barShader->view(), viewMatrix); + m_barShader->setUniformValue(m_barShader->ambientS(), + m_cachedTheme.m_ambientStrength); + bool selectionDirty = (m_selection != m_previousSelection || (m_selection != selectionSkipColor && QDataVis::InputStateOnScene == m_controller->inputState() @@ -896,15 +900,11 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) // Skip drawing of 0 -height bars if (item.height() != 0) { // Set shader bindings - m_barShader->setUniformValue(m_barShader->lightP(), lightPos); - m_barShader->setUniformValue(m_barShader->view(), viewMatrix); m_barShader->setUniformValue(m_barShader->model(), modelMatrix); m_barShader->setUniformValue(m_barShader->nModel(), itModelMatrix.transposed().inverted()); m_barShader->setUniformValue(m_barShader->MVP(), MVPMatrix); m_barShader->setUniformValue(m_barShader->color(), barColor); - m_barShader->setUniformValue(m_barShader->ambientS(), - m_cachedTheme.m_ambientStrength); #if !defined(QT_OPENGL_ES_2) if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { |