diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-11 09:25:33 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-11 09:27:13 +0300 |
| commit | 25aec9632325d49f1f2aa838823fb97366e08b25 (patch) | |
| tree | b05bec418d61e0c9eeb72f628ca4b1cc195b64b5 /src | |
| parent | a4e9246ab8ac23b40984c65e55f2aa2184fc28f8 (diff) | |
Mac hack fix for slice issue
Task-number: QTRD-2390
Change-Id: I807f85b765b62de4592f505c8511a3aad0501c73
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 38c4aa6a..8083a896 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -350,9 +350,13 @@ void Bars3DRenderer::drawSlicedScene(const LabelItem &xLabel, 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) + // Mac slice issue hack fix. TODO: Fix correctly + m_drawer->drawObject(m_barShader, m_barObj, 0, -1); +#else m_drawer->drawObject(m_barShader, m_barObj); +#endif } } @@ -897,7 +901,8 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) m_barShader->setUniformValue(m_barShader->ambientS(), m_cachedTheme.m_ambientStrength); #if !defined(QT_OPENGL_ES_2) - if (m_cachedShadowQuality > QDataVis::ShadowQualityNone) { + if (m_cachedShadowQuality > QDataVis::ShadowQualityNone + && !m_cachedIsSlicingActivated) { // Set shadow shader bindings m_barShader->setUniformValue(m_barShader->shadowQ(), m_shadowQualityToShader); m_barShader->setUniformValue(m_barShader->depth(), depthMVPMatrix); @@ -912,7 +917,12 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) m_barShader->setUniformValue(m_barShader->lightS(), lightStrength); // Draw the object +#if defined (Q_OS_MAC) + // Mac slice issue hack fix. TODO: Fix correctly + m_drawer->drawObject(m_barShader, m_barObj, 0, -1); +#else m_drawer->drawObject(m_barShader, m_barObj); +#endif } } } |