Polish and fix qmlvideofx example

Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6 Reviewed-by: hjk <qthjk@ovi.com>
2012-12-18 15:11:44 +01:00
parent 5739d43eef
commit 416168db8a
33 changed files with 122 additions and 123 deletions
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml
@@ -69,7 +69,7 @@ ShaderEffect {
    // rather than being inline in the QML file

    onFragmentShaderFilenameChanged:
-        fragmentShader = d.fragmentShaderCommon + fileReader.readFile(fragmentShaderFilename)
+        fragmentShader = d.fragmentShaderCommon + fileReader.readFile(":shaders/" + fragmentShaderFilename)
    onVertexShaderFilenameChanged:
        vertexShader = fileReader.readFile(vertexShaderFilename)
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
@@ -55,5 +55,5 @@ Effect {
    property real step_x: 0.0015625
    property real step_y: targetHeight ? (step_x * targetWidth / targetHeight) : 0.0

-    fragmentShaderFilename: "shaders/billboard.fsh"
+    fragmentShaderFilename: "billboard.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
@@ -52,5 +52,5 @@ Effect {
    // Transform slider values, and bind result to shader uniforms
    property real threshold: parameters.get(0).value

-    fragmentShaderFilename: "shaders/blackandwhite.fsh"
+    fragmentShaderFilename: "blackandwhite.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0

 Effect {
-    fragmentShaderFilename: "shaders/emboss.fsh"
+    fragmentShaderFilename: "emboss.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
@@ -63,7 +63,7 @@ Item {
        anchors.fill:  parent
        dividerValue: parent.dividerValue
        property real blurSize: 4.0 * parent.parameters.get(0).value / targetHeight
-        fragmentShaderFilename: "shaders/gaussianblur_v.fsh"
+        fragmentShaderFilename: "gaussianblur_v.fsh"
    }

    Effect {
@@ -71,7 +71,7 @@ Item {
        anchors.fill: parent
        dividerValue: parent.dividerValue
        property real blurSize: 4.0 * parent.parameters.get(0).value / parent.targetWidth
-        fragmentShaderFilename: "shaders/gaussianblur_h.fsh"
+        fragmentShaderFilename: "gaussianblur_h.fsh"
        source: horizontalShaderSource

        ShaderEffectSource {
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0

 Effect {
-    fragmentShaderFilename: "shaders/glow.fsh"
+    fragmentShaderFilename: "glow.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
@@ -57,5 +57,5 @@ Effect {
    property real targetHue: parameters.get(0).value * 360
    property real windowWidth: parameters.get(1).value * 60

-    fragmentShaderFilename: "shaders/isolate.fsh"
+    fragmentShaderFilename: "isolate.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
@@ -84,7 +84,7 @@ Effect {
        d.oldTargetHeight = targetHeight
    }

-    fragmentShaderFilename: "shaders/magnify.fsh"
+    fragmentShaderFilename: "magnify.fsh"

    MouseArea {
        anchors.fill: parent
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
@@ -53,5 +53,5 @@ Effect {
    // Transform slider values, and bind result to shader uniforms
    property real curlExtent: 1.0 - parameters.get(0).value

-    fragmentShaderFilename: "shaders/pagecurl.fsh"
+    fragmentShaderFilename: "pagecurl.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
@@ -52,5 +52,5 @@ Effect {
    // Transform slider values, and bind result to shader uniforms
    property real granularity: parameters.get(0).value * 20

-    fragmentShaderFilename: "shaders/pixelate.fsh"
+    fragmentShaderFilename: "pixelate.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
@@ -54,5 +54,5 @@ Effect {

    property real numColors: 8.0

-    fragmentShaderFilename: "shaders/posterize.fsh"
+    fragmentShaderFilename: "posterize.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
@@ -60,5 +60,5 @@ Effect {
    property real time: 0
    NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }

-    fragmentShaderFilename: "shaders/ripple.fsh"
+    fragmentShaderFilename: "ripple.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0

 Effect {
-    fragmentShaderFilename: "shaders/sepia.fsh"
+    fragmentShaderFilename: "sepia.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
@@ -52,5 +52,5 @@ Effect {
    // Transform slider values, and bind result to shader uniforms
    property real amount: parameters.get(0).value * 18

-    fragmentShaderFilename: "shaders/sharpen.fsh"
+    fragmentShaderFilename: "sharpen.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
@@ -76,5 +76,5 @@ Effect {
        }
    }

-    fragmentShaderFilename: "shaders/shockwave.fsh"
+    fragmentShaderFilename: "shockwave.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
@@ -55,5 +55,5 @@ Effect {
    property real resS: targetSize
    property real resT: targetSize

-    fragmentShaderFilename: "shaders/sobeledgedetection1.fsh"
+    fragmentShaderFilename: "sobeledgedetection1.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
@@ -52,5 +52,5 @@ Effect {
    // Transform slider values, and bind result to shader uniforms
    property real weight: parameters.get(0).value

-    fragmentShaderFilename: "shaders/sobeledgedetection2.fsh"
+    fragmentShaderFilename: "sobeledgedetection2.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0

 Effect {
-    fragmentShaderFilename: "shaders/tiltshift.fsh"
+    fragmentShaderFilename: "tiltshift.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
@@ -59,5 +59,5 @@ Effect {
    property real magTol: 0.3
    property real quantize: 8.0

-    fragmentShaderFilename: "shaders/toon.fsh"
+    fragmentShaderFilename: "toon.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0

 Effect {
-    fragmentShaderFilename: "shaders/vignette.fsh"
+    fragmentShaderFilename: "vignette.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
@@ -42,5 +42,5 @@
 import QtQuick 2.0

 Effect {
-    fragmentShaderFilename: "shaders/warhol.fsh"
+    fragmentShaderFilename: "warhol.fsh"
 }
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
@@ -57,5 +57,5 @@ Effect {

    NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }

-    fragmentShaderFilename: "shaders/wobble.fsh"
+    fragmentShaderFilename: "wobble.fsh"
 }