projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "[AT-SPI] ScrollView: Use child postion for ScrollToChild" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
graphics
/
shaders
/
text-visual-multi-color-text-with-style-shader.frag
diff --git
a/dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-with-style-shader.frag
b/dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-with-style-shader.frag
index
d8506cb
..
ca42ca6
100644
(file)
--- a/
dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-with-style-shader.frag
+++ b/
dali-toolkit/internal/graphics/shaders/text-visual-multi-color-text-with-style-shader.frag
@@
-1,6
+1,7
@@
varying mediump vec2 vTexCoord;
uniform sampler2D sTexture;
uniform sampler2D sStyle;
varying mediump vec2 vTexCoord;
uniform sampler2D sTexture;
uniform sampler2D sStyle;
+uniform sampler2D sOverlayStyle;
uniform lowp vec4 uColor;
uniform lowp vec3 mixColor;
uniform lowp vec4 uColor;
uniform lowp vec3 mixColor;
@@
-8,7
+9,8
@@
void main()
{
mediump vec4 textTexture = texture2D( sTexture, vTexCoord );
mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );
{
mediump vec4 textTexture = texture2D( sTexture, vTexCoord );
mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );
+ mediump vec4 overlayStyleTexture = texture2D( sOverlayStyle, vTexCoord );
// Draw the text as overlay above the style
// Draw the text as overlay above the style
- gl_FragColor = (
textTexture + styleTexture * ( 1.0 - textTexture.a
) ) * uColor * vec4( mixColor, 1.0 );
+ gl_FragColor = (
overlayStyleTexture + textTexture * (1.0 - overlayStyleTexture.a) + styleTexture * ( 1.0 - textTexture.a ) * (1.0 - overlayStyleTexture.a
) ) * uColor * vec4( mixColor, 1.0 );
}
}