X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fgraphics%2Fshaders%2Fgradient-visual-shader.vert;h=edaf643189b6d7333ca6defb66eac01b29d6cd15;hb=bee78157f19fa54ae961081782a2f6537cc8dd5a;hp=f9e80fe2c2f2d8ce290aede48d4538e10cdff930;hpb=6ae6f36998b3be4efa1114e2df856e51628bf812;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert index f9e80fe..edaf643 100644 --- a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert +++ b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.vert @@ -61,8 +61,10 @@ vec4 ComputeVertexPosition() vOptRectSize -= 0.2929 * maxRadius + 1.0; #endif + mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0); #if IS_REQUIRED_BORDERLINE vPosition = aPosition * (visualSize + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth); + vertexPosition.xy *= (1.0 + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth / visualSize); vOptRectSize -= (1.0 - clamp(borderlineOffset, -1.0, 1.0)) * 0.5 * borderlineWidth + 1.0; #elif IS_REQUIRED_ROUNDED_CORNER vPosition = aPosition * visualSize; @@ -70,15 +72,16 @@ vec4 ComputeVertexPosition() mediump vec2 vPosition = aPosition * visualSize; #endif +#if USER_SPACE + vertexPosition.xyz *= uSize; +#endif + + vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy; + return vec4(vPosition + anchorPoint * visualSize + (visualOffset + origin) * uSize.xy, 0.0, 1.0); } void main() { - mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0); gl_Position = uMvpMatrix * ComputeVertexPosition(); -#if USER_SPACE - vertexPosition.xyz *= uSize; -#endif - vTexCoord = (uAlignmentMatrix*vertexPosition.xyw).xy; }