diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-12-02 08:43:02 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-12-02 09:01:25 +0200 |
| commit | 94235c2e633845951ce6c947965789bb3f8ee7c4 (patch) | |
| tree | 60f902b9defe670736dff4bf33d13ef5bfb57804 /src/datavisualization/engine/scatter3drenderer.cpp | |
| parent | 91c9f6791af049b873b7c60a88aa226eaec70c18 (diff) | |
Theme documented
Task-number: QTRD-2633
Change-Id: Ib274ec236f50145df8fd4c2d83f62d4a9154687a
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, 6 insertions, 6 deletions
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 27262c4c..627fc88a 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -561,8 +561,8 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) dotShader->setUniformValue(dotShader->lightP(), lightPos); dotShader->setUniformValue(dotShader->view(), viewMatrix); dotShader->setUniformValue(dotShader->ambientS(), m_cachedTheme->ambientLightStrength()); - if (m_cachedColorStyle != QDataVis::ColorStyleUniform) { - if (m_cachedColorStyle == QDataVis::ColorStyleObjectGradient) { + if (m_cachedColorStyle != Q3DTheme::ColorStyleUniform) { + if (m_cachedColorStyle == Q3DTheme::ColorStyleObjectGradient) { dotShader->setUniformValue(dotShader->gradientMin(), 0.0f); dotShader->setUniformValue(dotShader->gradientHeight(), 0.5f); } else { @@ -624,14 +624,14 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) MVPMatrix = projectionViewMatrix * modelMatrix; #endif - if (m_cachedColorStyle == QDataVis::ColorStyleUniform || drawingPoints) + if (m_cachedColorStyle == Q3DTheme::ColorStyleUniform || drawingPoints) dotColor = baseColor; else gradientTexture = m_objectGradientTexture; GLfloat lightStrength = m_cachedTheme->lightStrength(); if (m_cachedSelectionMode > QDataVis::SelectionNone && (m_selectedItemTotalIndex == dotNo)) { - if (m_cachedColorStyle == QDataVis::ColorStyleUniform || drawingPoints) + if (m_cachedColorStyle == Q3DTheme::ColorStyleUniform || drawingPoints) dotColor = Utils::vectorFromColor(m_cachedSingleHighlightColor); else gradientTexture = m_singleHighlightGradientTexture; @@ -648,9 +648,9 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle) itModelMatrix.inverted().transposed()); } dotShader->setUniformValue(dotShader->MVP(), MVPMatrix); - if (m_cachedColorStyle == QDataVis::ColorStyleUniform || drawingPoints) { + if (m_cachedColorStyle == Q3DTheme::ColorStyleUniform || drawingPoints) { dotShader->setUniformValue(dotShader->color(), dotColor); - } else if (m_cachedColorStyle == QDataVis::ColorStyleRangeGradient) { + } else if (m_cachedColorStyle == Q3DTheme::ColorStyleRangeGradient) { dotShader->setUniformValue(dotShader->gradientMin(), (item.position().y() + 1.0f) / 2.0f); } |