Commit 11098da27e8ecfc7feff7392def5e888498707f2
[dali_1.1.22] Merge branch 'devel/master'
Change-Id: I2c9e07e5d24e343898792da6fe6ecab35c6597af
Showing
2 changed files
with
3 additions
and
3 deletions
packaging/com.samsung.dali-demo.spec
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | Name: com.samsung.dali-demo | 3 | Name: com.samsung.dali-demo |
| 4 | Summary: The OpenGLES Canvas Core Demo | 4 | Summary: The OpenGLES Canvas Core Demo |
| 5 | -Version: 1.1.21 | 5 | +Version: 1.1.22 |
| 6 | Release: 1 | 6 | Release: 1 |
| 7 | Group: System/Libraries | 7 | Group: System/Libraries |
| 8 | License: Apache-2.0 | 8 | License: Apache-2.0 |
resources/scripts/shader-effect-ripple.json
| @@ -51,9 +51,9 @@ | @@ -51,9 +51,9 @@ | ||
| 51 | "Ripple2D": { | 51 | "Ripple2D": { |
| 52 | "program": { | 52 | "program": { |
| 53 | "vertexPrefix": "", | 53 | "vertexPrefix": "", |
| 54 | - "vertex": "void main(void)\n{\n gl_Position = uMvpMatrix * vec4(aPosition*uSize.xy, 0.0, 1.0);\n vTexCoord = mix( uTextureRect.xy, uTextureRect.zw, aPosition + vec2(0.5) );\n}\n\n", | 54 | + "vertex": "void main(void)\n{\n gl_Position = uMvpMatrix * vec4(aPosition, 1.0);\n vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n}\n\n", |
| 55 | "fragmentPrefix": "", | 55 | "fragmentPrefix": "", |
| 56 | - "fragment": "precision mediump float;\nuniform float uAmplitude; // 0.02; (< 1)\nuniform float uTime;\nvoid main()\n{\n highp vec2 textureSize = uTextureRect.zw - uTextureRect.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", | 56 | + "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", |
| 57 | "geometryType": "GEOMETRY_TYPE_IMAGE" | 57 | "geometryType": "GEOMETRY_TYPE_IMAGE" |
| 58 | }, | 58 | }, |
| 59 | "geometryHints": "HINT_NONE", | 59 | "geometryHints": "HINT_NONE", |