diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-20 09:43:57 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-20 09:49:03 +0200 |
commit | 51deca1429e1097be3108a5dc28a4897944fed1a (patch) | |
tree | 2c6f5240c2a01d6e793aa03249c17d0cbaa9b455 /src/datavisualization/utils | |
parent | 631b1913f4115fc163a21fc8aba85b87b10a666a (diff) |
References to alpha and TP removed
+ implemented the rest of lightColor
Task-number: QTRD-2405
Change-Id: I38402b45cc4a567a79d07b23983567551d06b4fe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/utils')
-rw-r--r-- | src/datavisualization/utils/shaderhelper.cpp | 8 | ||||
-rw-r--r-- | src/datavisualization/utils/shaderhelper_p.h | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp index adc24e8d..37027e6f 100644 --- a/src/datavisualization/utils/shaderhelper.cpp +++ b/src/datavisualization/utils/shaderhelper.cpp @@ -92,6 +92,7 @@ void ShaderHelper::initialize() m_shadowUniform = m_program->uniformLocation("shadowMap"); m_gradientMinUniform = m_program->uniformLocation("gradMin"); m_gradientHeightUniform = m_program->uniformLocation("gradHeight"); + m_lightColorUniform = m_program->uniformLocation("lightColor"); m_initialized = true; } @@ -247,6 +248,13 @@ GLuint ShaderHelper::gradientHeight() return m_gradientHeightUniform; } +GLuint ShaderHelper::lightColor() +{ + if (!m_initialized) + qFatal("Shader not initialized"); + return m_lightColorUniform; +} + GLuint ShaderHelper::posAtt() { if (!m_initialized) diff --git a/src/datavisualization/utils/shaderhelper_p.h b/src/datavisualization/utils/shaderhelper_p.h index b4c71ca2..2984f7d6 100644 --- a/src/datavisualization/utils/shaderhelper_p.h +++ b/src/datavisualization/utils/shaderhelper_p.h @@ -73,6 +73,7 @@ class ShaderHelper GLuint shadow(); GLuint gradientMin(); GLuint gradientHeight(); + GLuint lightColor(); GLuint posAtt(); GLuint uvAtt(); @@ -106,6 +107,7 @@ class ShaderHelper GLuint m_shadowUniform; GLuint m_gradientMinUniform; GLuint m_gradientHeightUniform; + GLuint m_lightColorUniform; GLboolean m_initialized; }; |