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/default.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/default.frag')
-rw-r--r-- | src/datavisualization/engine/shaders/default.frag | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualization/engine/shaders/default.frag b/src/datavisualization/engine/shaders/default.frag index ca6fefb9..d16055a3 100644 --- a/src/datavisualization/engine/shaders/default.frag +++ b/src/datavisualization/engine/shaders/default.frag @@ -8,15 +8,15 @@ varying highp vec3 eyeDirection_cmr; varying highp vec3 lightDirection_cmr; uniform highp vec3 lightPosition_wrld; -uniform highp vec3 color_mdl; +uniform highp vec4 color_mdl; uniform highp float lightStrength; uniform highp float ambientStrength; -uniform highp vec3 lightColor; +uniform highp vec4 lightColor; void main() { highp vec3 materialDiffuseColor = color_mdl.rgb; - 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); |