X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fgraphics%2Fshaders%2Fgradient-visual-linear-rounded-corner-shader.frag;h=1b29ae0afb6e7a0e0454d0586472bc3280270200;hp=61984ebb0312f3d2d0c662381c9777d02bb6301c;hb=c14e39b4db65670dcc6c17f03a95035f364c80e5;hpb=e4d638dd0b325673bbd504aef409676fc5593a9d

diff --git a/dali-toolkit/internal/graphics/shaders/gradient-visual-linear-rounded-corner-shader.frag b/dali-toolkit/internal/graphics/shaders/gradient-visual-linear-rounded-corner-shader.frag
index 61984eb..1b29ae0 100644
--- a/dali-toolkit/internal/graphics/shaders/gradient-visual-linear-rounded-corner-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/gradient-visual-linear-rounded-corner-shader.frag
@@ -4,11 +4,35 @@ uniform lowp vec3 mixColor;
 varying mediump vec2 vTexCoord;
 varying mediump vec2 vPosition;
 varying mediump vec2 vRectSize;
-varying mediump float vCornerRadius;
+varying mediump vec2 vOptRectSize;
+varying mediump vec4 vCornerRadius;
 
 void main()
 {
-  mediump float dist = length( max( abs( vPosition ), vRectSize ) - vRectSize ) - vCornerRadius;
   gl_FragColor = texture2D( sTexture, vec2( vTexCoord.y, 0.5 ) ) * vec4(mixColor, 1.0) * uColor;
-  gl_FragColor *= 1.0 - smoothstep( -1.0, 1.0, dist );
+  if(abs(vPosition.x) < vOptRectSize.x && abs(vPosition.y) < vOptRectSize.y)
+  {
+    return;
+  }
+  mediump float radius =
+  mix(
+    mix(vCornerRadius.x, vCornerRadius.y, sign(vPosition.x) * 0.5 + 0.5),
+    mix(vCornerRadius.w, vCornerRadius.z, sign(vPosition.x) * 0.5 + 0.5),
+    sign(vPosition.y) * 0.5 + 0.5
+  );
+
+  mediump vec2 diff = abs(vPosition) - vRectSize + radius;
+  mediump float dist = length(max(diff, vec2(0.0))) - radius;
+  if(dist > 1.0)
+  {
+    gl_FragColor = vec4(0.0);
+  }
+  else if(dist > -1.0)
+  {
+    if(min(diff.x, diff.y) < 0.0)
+    {
+      dist += min(diff.x, diff.y) / max(radius, 1.0);
+    }
+    gl_FragColor *= 1.0 - smoothstep(-1.0, 1.0, dist);
+  }
 }