diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-05-02 15:10:05 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-05-02 16:10:45 +0300 |
| commit | 24b79c99072217e430f4687bfc7a3cc978838698 (patch) | |
| tree | 42cac1a9425c806662f6b393efdb4b4b01cf8547 /basicsuite | |
| parent | 727337263490dd232a543f5c514bb515a9986612 (diff) | |
Make new dissolve work on tegra and missing descriptions
Change-Id: Icc2d8c1beff0e4b24b1efee14fa267f685af3f44
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'basicsuite')
| -rw-r--r-- | basicsuite/Graphical Effects/effect_CustomDissolve.qml | 7 | ||||
| -rw-r--r-- | basicsuite/Photo Gallery/description.txt | 1 | ||||
| -rw-r--r-- | basicsuite/Qt5 Particles Demo/description.txt | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/basicsuite/Graphical Effects/effect_CustomDissolve.qml b/basicsuite/Graphical Effects/effect_CustomDissolve.qml index b1c07a9..bd843bd 100644 --- a/basicsuite/Graphical Effects/effect_CustomDissolve.qml +++ b/basicsuite/Graphical Effects/effect_CustomDissolve.qml @@ -107,17 +107,14 @@ Item { varying lowp float vOpacity; // Noise function from: http://stackoverflow.com/questions/4200224/random-noise-functions-for-glsl - float rand(vec2 n) { + highp float rand(vec2 n) { return fract(sin(dot(n.xy, vec2(12.9898, 78.233))) * 43758.5453); } void main() { lowp vec4 tex = texture2D(source, vTexCoord); - lowp float opacity = 1.0 - smoothstep(0.9, 1.0, vOpacity); - - float particlify = smoothstep(1.0 - vOpacity, 1.0, rand(vTexCoord)) * vOpacity; - + lowp float particlify = smoothstep(1.0 - vOpacity, 1.0, rand(vTexCoord)) * vOpacity; gl_FragColor = tex * mix(vOpacity, particlify, opacity) * qt_Opacity; } diff --git a/basicsuite/Photo Gallery/description.txt b/basicsuite/Photo Gallery/description.txt new file mode 100644 index 0000000..a619aee --- /dev/null +++ b/basicsuite/Photo Gallery/description.txt @@ -0,0 +1 @@ +This is simple photo gallery, indexing images found in /data/images. diff --git a/basicsuite/Qt5 Particles Demo/description.txt b/basicsuite/Qt5 Particles Demo/description.txt new file mode 100644 index 0000000..6fd5320 --- /dev/null +++ b/basicsuite/Qt5 Particles Demo/description.txt @@ -0,0 +1 @@ +This demo offers a few samples of what Qt Quick 2.0's new particle system can do. |