summaryrefslogtreecommitdiffstats
path: root/basicsuite
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-05-02 10:47:39 +0200
committerGunnar Sletta <gunnar.sletta@digia.com>2013-05-02 11:48:19 +0300
commit727337263490dd232a543f5c514bb515a9986612 (patch)
tree9bd820d05f0818ce6024f1b8f68bcac296a0ab9b /basicsuite
parent709e75fc4a4b315bda312b3d874762338ec7b792 (diff)
implement opacity
Change-Id: I756d3d57d3afa6c8130155b80bad573fcd4994a9 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'basicsuite')
-rw-r--r--basicsuite/Graphical Effects/effect_CustomDissolve.qml6
1 files changed, 3 insertions, 3 deletions
diff --git a/basicsuite/Graphical Effects/effect_CustomDissolve.qml b/basicsuite/Graphical Effects/effect_CustomDissolve.qml
index ae92f9f..b1c07a9 100644
--- a/basicsuite/Graphical Effects/effect_CustomDissolve.qml
+++ b/basicsuite/Graphical Effects/effect_CustomDissolve.qml
@@ -9,7 +9,7 @@ Item {
property real inputX: 0.5;
property real feedbackX: inputX
- property string nameX: "Displacement"
+ property string nameX: "Dissolution"
property real inputY: 0.5;
property real feedbackY: effect.amplitude
@@ -68,7 +68,6 @@ Item {
uniform lowp float t;
uniform lowp float tlength;
uniform highp float amplitude;
- uniform lowp float qt_Opacity;
attribute highp vec4 qt_Vertex;
attribute highp vec2 qt_MultiTexCoord0;
@@ -102,6 +101,7 @@ Item {
uniform lowp float t;
uniform lowp float tlength;
+ uniform lowp float qt_Opacity;
varying highp vec2 vTexCoord;
varying lowp float vOpacity;
@@ -118,7 +118,7 @@ Item {
float particlify = smoothstep(1.0 - vOpacity, 1.0, rand(vTexCoord)) * vOpacity;
- gl_FragColor = tex * mix(vOpacity, particlify, opacity);
+ gl_FragColor = tex * mix(vOpacity, particlify, opacity) * qt_Opacity;
}
"