diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-22 07:56:04 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-22 08:30:09 +0200 |
commit | 3ce4ae10e54e9c5d73826f4d6f8c5e442ac2d525 (patch) | |
tree | 6ae0bb7c1ff8720f6340453b39d481ffcf526127 /src/datavisualization/engine/selectionpointer.cpp | |
parent | d12f993ca802ff02091d6a5141d2847641bc65a8 (diff) |
User-modifiable themes, part 1
Task-number: QTRD-2120
+ old functionality remade
- new functionality to be added
+ fixed a compilation error in qbarseries for mingw
Change-Id: I710c97b5d4023861be8e8cc5cc61c05bb4644964
Signed-off-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/selectionpointer.cpp')
-rw-r--r-- | src/datavisualization/engine/selectionpointer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index fd24da4f..7065ea8b 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -143,10 +143,10 @@ void SelectionPointer::render(GLuint defaultFboHandle) m_pointShader->setUniformValue(m_pointShader->model(), modelMatrix); m_pointShader->setUniformValue(m_pointShader->nModel(), itModelMatrix.inverted().transposed()); m_pointShader->setUniformValue(m_pointShader->color(), - Utils::vectorFromColor(m_cachedTheme.m_singleHighlightColor)); + Utils::vectorFromColor(m_cachedTheme->singleHighlightColor())); m_pointShader->setUniformValue(m_pointShader->MVP(), MVPMatrix); - m_pointShader->setUniformValue(m_pointShader->ambientS(), m_cachedTheme.m_ambientStrength); - m_pointShader->setUniformValue(m_pointShader->lightS(), m_cachedTheme.m_lightStrength * 2.0f); + m_pointShader->setUniformValue(m_pointShader->ambientS(), m_cachedTheme->ambientLightStrength()); + m_pointShader->setUniformValue(m_pointShader->lightS(), m_cachedTheme->lightStrength() * 2.0f); m_drawer->drawObject(m_pointShader, m_pointObj); |