X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Fshear-effect.h;h=bb0900b1d6d9e44894ff5835d2d32e19c42accff;hb=b1fd7c9ac268691ba02ca0b358b82a6f76d31edb;hp=5b8faf9b5306821d4828ac881be5cb934f541bd2;hpb=40e6eada47390ac9be4db5fbe210cc5d23c8ebcd;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/shader-effects/shear-effect.h b/dali-toolkit/devel-api/shader-effects/shear-effect.h index 5b8faf9..bb0900b 100644 --- a/dali-toolkit/devel-api/shader-effects/shear-effect.h +++ b/dali-toolkit/devel-api/shader-effects/shear-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHEAR_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 { @@ -49,14 +49,14 @@ inline ShaderEffect CreateShearEffect() "\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" "\n" "world.x = world.x + tan(radians(uAngleXAxis)) * (world.y - uCenter.y * world.w);\n" "world.y = world.y + tan(radians(uAngleYAxis)) * (world.x - uCenter.x * world.w);\n" "\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" "}" ); // Create the implementation, temporarily owned on stack,