Displace effect update

5 files changed, 12 insertions, 12 deletions

diff --git a/src/effects/Displace.qml b/src/effects/Displace.qml
index 40c46fe..a03cbd2 100644
--- a/src/effects/Displace.qml
+++ b/src/effects/Displace.qml
@@ -95,7 +95,7 @@ Item {
                 lowp vec4 offset = texture2D(displacementSource, qt_TexCoord0);
                 offset.xy -= vec2(0.5, 0.5);
                 offset.xy = offset.xy * step(vec2(1.0/256.0), abs(offset.xy));
-                highp vec2 tx = qt_TexCoord0 + (offset.xy * displacement);
+                highp vec2 tx = qt_TexCoord0 + (vec2(-offset.x, offset.y) * displacement);
 
                 lowp float e1 = linearstep(0.0, xPixel, tx.x);
                 lowp float e2 = linearstep(0.0, yPixel, tx.y);
diff --git a/tests/manual/testbed/TestDisplace.qml b/tests/manual/testbed/TestDisplace.qml
index 15ef6f0..de8a2a1 100644
--- a/tests/manual/testbed/TestDisplace.qml
+++ b/tests/manual/testbed/TestDisplace.qml
@@ -54,14 +54,14 @@ TestCaseTemplate {
         color: "#8080ff"
         smooth: true
         anchors.fill: parent
-            Image {
-                id: di
-                x: (parent.width - width) / 2
-                y: (parent.height - height) / 2
-                sourceSize: Qt.size(128, 128)
-                source: "images/displacementmap.png"
-                smooth: true
-            }
+        Image {
+            id: di
+            x: (parent.width - width) / 2
+            y: (parent.height - height) / 2
+            sourceSize: Qt.size(128, 128)
+            source: "images/glass_normal.png"
+            smooth: true
+        }
     }
 
     Displace {
@@ -87,8 +87,8 @@ TestCaseTemplate {
             Slider {
                 id: displacementScaleSlider
                 caption: "displacement"
-                minimum: -1.0
-                maximum: 1.0
+                minimum: -0.5
+                maximum: 0.5
                 value: 0.1
             }
         },
diff --git a/tests/manual/testbed/images/displacementmap.png b/tests/manual/testbed/images/displacementmap.png
deleted file mode 100755
index 7614db8..0000000
--- a/tests/manual/testbed/images/displacementmap.png
+++ /dev/null
diff --git a/tests/manual/testbed/images/glass_normal.png b/tests/manual/testbed/images/glass_normal.png
new file mode 100755
index 0000000..ba360ef
--- /dev/null
+++ b/tests/manual/testbed/images/glass_normal.png
diff --git a/tools/pngdumper/pngdumper.qml b/tools/pngdumper/pngdumper.qml
index 0d47b7d..ce7e9b1 100644
--- a/tools/pngdumper/pngdumper.qml
+++ b/tools/pngdumper/pngdumper.qml
@@ -169,7 +169,7 @@ Rectangle {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             sourceSize: Qt.size(128, 128)
-            source: "../../tests/manual/testbed/images/displacementmap.png"
+            source: "../../tests/manual/testbed/images/glass_normal.png"
             smooth: true
         }
     }