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/engine/shaders/surface.frag | |
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/engine/shaders/surface.frag')
-rw-r--r-- | src/datavisualization/engine/shaders/surface.frag | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/datavisualization/engine/shaders/surface.frag b/src/datavisualization/engine/shaders/surface.frag index 576cc51f..b5205d2d 100644 --- a/src/datavisualization/engine/shaders/surface.frag +++ b/src/datavisualization/engine/shaders/surface.frag @@ -10,12 +10,13 @@ uniform sampler2D textureSampler; uniform highp vec3 lightPosition_wrld; uniform highp float lightStrength; uniform highp float ambientStrength; +uniform highp vec3 lightColor; void main() { highp vec2 gradientUV = vec2(0.0, (coords_mdl.y + 1.0) / 2.0); highp vec3 materialDiffuseColor = texture2D(textureSampler, gradientUV).xyz; - highp vec3 materialAmbientColor = vec3(ambientStrength, ambientStrength, ambientStrength) * materialDiffuseColor; - highp vec3 materialSpecularColor = vec3(1.0, 1.0, 1.0); + highp vec3 materialAmbientColor = lightColor * ambientStrength * materialDiffuseColor; + highp vec3 materialSpecularColor = lightColor; highp float distance = length(lightPosition_wrld - position_wrld); |