diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-24 07:37:58 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-24 09:22:01 +0300 |
commit | 2b19a3ae8b8c34ea674058c7b82de44397e29df2 (patch) | |
tree | c910d61096b99cf2271b61ac3050644b302cf299 /src/datavisualization/engine/shaders/colorOnY.frag | |
parent | 555acef736a72cdc92113a268826a6bba77fbe40 (diff) |
Color problem fixed
Task-number: QTRD-3001
Changed all colors to QVector4Ds to avoid mixups with vec4 and vec3 colors
in shaders.
Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5
Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/shaders/colorOnY.frag')
-rw-r--r-- | src/datavisualization/engine/shaders/colorOnY.frag | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/engine/shaders/colorOnY.frag b/src/datavisualization/engine/shaders/colorOnY.frag index 8c610cd7..7a5eb46b 100644 --- a/src/datavisualization/engine/shaders/colorOnY.frag +++ b/src/datavisualization/engine/shaders/colorOnY.frag @@ -6,7 +6,7 @@ uniform highp float ambientStrength; uniform sampler2D textureSampler; uniform highp float gradMin; uniform highp float gradHeight; -uniform highp vec3 lightColor; +uniform highp vec4 lightColor; varying highp vec3 position_wrld; varying highp vec3 normal_cmr; @@ -17,8 +17,8 @@ varying highp vec2 coords_mdl; void main() { highp vec2 gradientUV = vec2(0.0, gradMin + ((coords_mdl.y + 1.0) * gradHeight)); highp vec3 materialDiffuseColor = texture2D(textureSampler, gradientUV).xyz; - highp vec3 materialAmbientColor = lightColor * ambientStrength * materialDiffuseColor; - highp vec3 materialSpecularColor = lightColor; + highp vec3 materialAmbientColor = lightColor.rgb * ambientStrength * materialDiffuseColor; + highp vec3 materialSpecularColor = lightColor.rgb; highp float distance = length(lightPosition_wrld - position_wrld); highp vec3 n = normalize(normal_cmr); |