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%2Fcarousel-effect.h;h=67180bda1e304601a020a4df3ebeb5b301a11f8a;hp=dfe7018e54dee6cf02f273a3fa4e8874141c5841;hb=40e6eada47390ac9be4db5fbe210cc5d23c8ebcd;hpb=31df2b9472ccbe0ae460a958535be8ef790c96f2 diff --git a/dali-toolkit/devel-api/shader-effects/carousel-effect.h b/dali-toolkit/devel-api/shader-effects/carousel-effect.h index dfe7018..67180bd 100644 --- a/dali-toolkit/devel-api/shader-effects/carousel-effect.h +++ b/dali-toolkit/devel-api/shader-effects/carousel-effect.h @@ -63,14 +63,14 @@ inline ShaderEffect CreateCarouselEffect() "\n" "void main()\n" "{\n" - " mediump vec4 world = uModelView * vec4(aPosition,1.0);\n" + " mediump vec4 world = uModelView * vec4(aPosition*uSize.xy, 0.0, 1.0);\n" " mediump vec2 d = (world.xy - uCenter) * uAnglePerUnit;\n" " mediump float a = length(d);\n" " mediump float cs = cos(radians(a));\n" " world.z -= cs * uRadius;\n" " gl_Position = uProjection * world;\n" " \n" - " vTexCoord = aTexCoord;\n" + " vTexCoord = mix( uTextureRect.xy, uTextureRect.zw, aPosition + vec2(0.5) );\n;\n" "}\n"); ShaderEffect shaderEffect = ShaderEffect::New(