X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Firis-effect.h;h=b0af4659d685089fa1caee379c389c08097c214d;hb=b1fd7c9ac268691ba02ca0b358b82a6f76d31edb;hp=48e6f110ba9643974f3f51a054d5834cc7f3fdf3;hpb=da24507a54c2603006c244b01b5325639baca2d2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/shader-effects/iris-effect.h b/dali-toolkit/devel-api/shader-effects/iris-effect.h index 48e6f11..b0af465 100644 --- a/dali-toolkit/devel-api/shader-effects/iris-effect.h +++ b/dali-toolkit/devel-api/shader-effects/iris-effect.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_SHADER_EFFECT_IRIS_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 { @@ -55,10 +55,10 @@ inline ShaderEffect CreateIrisEffect() "\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" " gl_Position = uProjection * world;\n" " \n" - " vTexCoord = mix( uTextureRect.xy, uTextureRect.zw, aPosition + vec2(0.5) );;\n" + " vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n" " vRelativePosition = vTexCoord - uCenter;\n" "}\n");