[dali_1.1.45] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / shader-effects / ripple-effect.h

diff --git a/dali-toolkit/devel-api/shader-effects/ripple-effect.h b/dali-toolkit/devel-api/shader-effects/ripple-effect.h
index b537501..767de60 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/ripple-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/ripple-effect.h
@@ -52,7 +52,7 @@ inline ShaderEffect CreateRippleEffect()
       "{\n"
       "float lighting = uAmplitude * 0.02;\n"
       "float waveLength = uAmplitude * 0.0016;\n"
-      "vec4 world = uModelView * vec4(aPosition,1.0);\n"
+      "vec4 world = uModelView * vec4(aPosition, 1.0);\n"
       "vec2 d = vec2(world.x - uCenter.x, world.y - uCenter.y);\n"
       "float dist = length(d);\n"
       "float amplitude = cos(uTime - dist*waveLength);\n"
@@ -67,7 +67,7 @@ inline ShaderEffect CreateRippleEffect()
       "}\n"
       "vShade = 1.0 - (dot * slope);\n"
       "vLight = max(0.0, dot * -slope);\n"
-      "vTexCoord = aTexCoord;\n"
+      "vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n"
       "}" );
 
   // append the default version
@@ -83,7 +83,7 @@ inline ShaderEffect CreateRippleEffect()
 
   Dali::ShaderEffect shaderEffect =  Dali::ShaderEffect::New(
       vertexShader, imageFragmentShader,
-      GeometryType(GEOMETRY_TYPE_IMAGE), ShaderEffect::GeometryHints(ShaderEffect::HINT_GRID) );
+      ShaderEffect::GeometryHints(ShaderEffect::HINT_GRID) );
 
 
   shaderEffect.SetUniform( "uAmplitude", 0.0f );