X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fripple-effect.h;h=1b99839ce800561285c5ffd52876d0bc70c9be23;hp=39d0a13d18602105b3df5a9b1a4ea83e9d6d6bec;hb=0de4495ae0ad22b60ce3d1257e30628ea518f377;hpb=d9c164e4530e354cd14dc4a1a658070ba55e99b8 diff --git a/dali-toolkit/devel-api/shader-effects/ripple-effect.h b/dali-toolkit/devel-api/shader-effects/ripple-effect.h index 39d0a13..1b99839 100644 --- a/dali-toolkit/devel-api/shader-effects/ripple-effect.h +++ b/dali-toolkit/devel-api/shader-effects/ripple-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_RIPPLE_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#include +#include namespace Dali { @@ -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