X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fgraphics%2Fshaders%2Ftext-visual-single-color-text-with-style-shader.frag;h=cf93f156abdc35d3ac97cdcf74f173938ce11d9c;hp=f5d8b1c80ef033a69ee65168c1b638ebd74f91a4;hb=7b406456059abec8a9085c02814e3ea526fc525a;hpb=35309f882c990c309b41aff6d11664c0c8637bb2 diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-shader.frag index f5d8b1c..cf93f15 100644 --- a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-shader.frag +++ b/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-shader.frag @@ -1,6 +1,7 @@ varying mediump vec2 vTexCoord; uniform sampler2D sTexture; uniform sampler2D sStyle; +uniform sampler2D sOverlayStyle; uniform lowp vec4 uTextColorAnimatable; uniform lowp vec4 uColor; uniform lowp vec3 mixColor; @@ -9,7 +10,8 @@ void main() { mediump float textTexture = texture2D( sTexture, vTexCoord ).r; mediump vec4 styleTexture = texture2D( sStyle, vTexCoord ); + mediump vec4 overlayStyleTexture = texture2D( sOverlayStyle, vTexCoord ); // Draw the text as overlay above the style - gl_FragColor = ( uTextColorAnimatable * textTexture + styleTexture * ( 1.0 - uTextColorAnimatable.a * textTexture ) ) * uColor * vec4( mixColor, 1.0 ); -} + gl_FragColor = ( overlayStyleTexture + uTextColorAnimatable * textTexture * (1.0 - overlayStyleTexture.a) + styleTexture * ( 1.0 - uTextColorAnimatable.a * textTexture ) * (1.0 - overlayStyleTexture.a) ) * uColor * vec4( mixColor, 1.0 ); +} \ No newline at end of file