diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-07-01 15:47:07 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-07-02 07:53:54 +0300 |
commit | 4e9ed2481a1960a2fc4a31ecd14d1904b76cad2e (patch) | |
tree | 5d0a04cb52161ec5370fdb15dc12e7f22a78f34f /src/datavisualization/engine/shaders/surfaceFlat.frag | |
parent | a1293a58e0909d56e34654549ba719bacfdda1bb (diff) |
Fix labels and grid lines changing size when aspect ratio is changed
Since shaders needed fixing anyway for surface because of this,
also implements the support for object gradients for surface,
which was missing.
Task-number: QTRD-2666
Task-number: QTRD-3211
Change-Id: I0c5da7fdfef308a96ec0bae4750fd22035da4e82
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/shaders/surfaceFlat.frag')
-rw-r--r-- | src/datavisualization/engine/shaders/surfaceFlat.frag | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/datavisualization/engine/shaders/surfaceFlat.frag b/src/datavisualization/engine/shaders/surfaceFlat.frag index 748fb3dd..1a0bbdeb 100644 --- a/src/datavisualization/engine/shaders/surfaceFlat.frag +++ b/src/datavisualization/engine/shaders/surfaceFlat.frag @@ -13,9 +13,11 @@ uniform highp vec3 lightPosition_wrld; uniform highp float lightStrength; uniform highp float ambientStrength; uniform highp vec4 lightColor; +uniform highp float gradMin; +uniform highp float gradHeight; void main() { - highp vec2 gradientUV = vec2(0.0, (coords_mdl.y + 1.0) / 2.0); + highp vec2 gradientUV = vec2(0.0, gradMin + coords_mdl.y * gradHeight); highp vec3 materialDiffuseColor = texture2D(textureSampler, gradientUV).xyz; highp vec3 materialAmbientColor = lightColor.rgb * ambientStrength * materialDiffuseColor; highp vec3 materialSpecularColor = lightColor.rgb; |