X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fcarousel-effect.h;h=393e1e4c093c4accaabc4724a4d16ecd6091b906;hb=b15279dd1e820bebf41aeb78453f997fe50051ae;hp=67180bda1e304601a020a4df3ebeb5b301a11f8a;hpb=213195730a51b211653cb6ad460b23a6e363b779;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/shader-effects/carousel-effect.h b/dali-toolkit/devel-api/shader-effects/carousel-effect.h index 67180bd..393e1e4 100644 --- a/dali-toolkit/devel-api/shader-effects/carousel-effect.h +++ b/dali-toolkit/devel-api/shader-effects/carousel-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_CAROUSEL_EFFECT_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 { @@ -63,14 +63,14 @@ inline ShaderEffect CreateCarouselEffect() "\n" "void main()\n" "{\n" - " mediump vec4 world = uModelView * vec4(aPosition*uSize.xy, 0.0, 1.0);\n" + " mediump vec4 world = uModelView * vec4(aPosition, 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 = mix( uTextureRect.xy, uTextureRect.zw, aPosition + vec2(0.5) );\n;\n" + " vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n" "}\n"); ShaderEffect shaderEffect = ShaderEffect::New(