Merge branch 'devel/master(1.1.39)' into tizen

[platform/core/uifw/dali-demo.git] / resources / scripts / shader-effect-ripple.json

diff --git a/resources/scripts/shader-effect-ripple.json b/resources/scripts/shader-effect-ripple.json
index 82f8d23..aabc376 100644 (file)
--- a/resources/scripts/shader-effect-ripple.json
+++ b/resources/scripts/shader-effect-ripple.json
@@ -1,33 +1,37 @@
 {
   "stage": [
     {
-      "type": "ImageActor",
+      "type": "ImageView",
       "name": "Image1",
       "position": [
         0.40461349487305,
         0.9150390625,
         0.0
       ],
-      "parent-origin": [0.5, 0.5, 0.5],
-      "size": [200, 200, 0],
-      "effect": "Ripple2D",
+      "parentOrigin": [0.5, 0.5, 0.5],
+      "widthResizePolicy":"FILL_TO_PARENT",
+      "heightResizePolicy":"DIMENSION_DEPENDENCY",
       "image": {
-        "filename": "{DALI_IMAGE_DIR}gallery-medium-25.jpg",
-        "width": 200,
-        "height": 80,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "url": "{DEMO_IMAGE_DIR}gallery-medium-25.jpg",
+        "desiredWidth": 400,
+        "desiredHeight": 400,
+        "shader": {
+          "fragmentShader": "precision mediump float;\nuniform sampler2D sTexture;\nuniform vec4 uColor;\nuniform float uAmplitude;\nuniform float uTime;\nvarying vec2 vTexCoord;\nvoid main()\n{\n  highp vec2 pos = -1.0 + 2.0 * vTexCoord;\n  highp float len = length(pos);\n  highp vec2 texCoord = vTexCoord + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude;\n  gl_FragColor = texture2D(sTexture, texCoord) * uColor;}\n\n"
+          }
+      },
+      "animatableProperties": {
+        "uAmplitude": 0.02,
+        "uTime": 0.0
       },
       "signals": [
         {
-          "name": "on-stage",
+          "name": "onStage",
           "action": "play",
           "animation": "Animation_1"
         }
       ]
     }
   ],
-  "paths": {},
   "animations": {
     "Animation_1": {
       "loop":true,
@@ -35,31 +39,15 @@
         {
           "actor": "Image1",
           "property": "uTime",
-          "value": 10.0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "value": 36.0,
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
-            "duration": 10.0
+            "duration": 20.0
           },
-          "gui-builder-timeline-color": "#8dc0da"
+          "guiBuilderTimelineColor": "#8dc0da"
         }
       ]
     }
-  },
-  "shader-effects": {
-    "Ripple2D": {
-      "program": {
-        "vertexPrefix": "",
-        "vertex": "void main(void)\n{\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\n  vTexCoord = aTexCoord;\n}\n\n",
-        "fragmentPrefix": "",
-        "fragment": "precision mediump float;\nuniform float uAmplitude; // 0.02; (< 1)\nuniform float uTime;\nvoid main()\n{\n  highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\n  highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\n  highp float len = length(pos);\n  highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \n  gl_FragColor = texture2D(sTexture, texCoord) * uColor;\n}\n\n\n",
-        "geometry-type": "GEOMETRY_TYPE_IMAGE"
-      },
-      "geometry-hints": "HINT_NONE",
-      "grid-density": 0,
-      "loop": true,
-      "uAmplitude": 0.02,
-      "uTime": 0.0
-    }
   }
 }