From: Heeyong Song <heeyong.song@samsung.com>
Date: Thu, 22 Mar 2018 06:56:14 +0000 (+0000)
Subject: Merge "Replace visual opacity with Renderer's opacity" into devel/master
X-Git-Tag: dali_1.3.17~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=db345a276572844ef456bff2339cfc3143a46991

Merge "Replace visual opacity with Renderer's opacity" into devel/master
---

db345a276572844ef456bff2339cfc3143a46991
diff --cc dali-toolkit/internal/visuals/text/text-visual.cpp
index dac8315,7729bb7..e894d2b
--- a/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@@ -106,44 -107,36 +107,32 @@@ const char* FRAGMENT_SHADER_SINGLE_COLO
    varying mediump vec2 vTexCoord;\n
    uniform sampler2D sTexture;\n
    uniform lowp vec4 uTextColorAnimatable;\n
 -  uniform mediump vec4 uAtlasRect;\n
    uniform lowp vec4 uColor;\n
    uniform lowp vec3 mixColor;\n
-   uniform lowp float opacity;\n
    uniform lowp float preMultipliedAlpha;\n
    \n
-   lowp vec4 visualMixColor()\n
-   {\n
-     return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );\n
-   }\n
-   \n
    void main()\n
    {\n
 -    mediump vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );\n
 -    mediump float textTexture = texture2D( sTexture, texCoord ).r;\n
 +    mediump float textTexture = texture2D( sTexture, vTexCoord ).r;\n
  
      // Set the color of the text to what it is animated to.
-     gl_FragColor = uTextColorAnimatable * textTexture * uColor * visualMixColor();
+     gl_FragColor = uTextColorAnimatable * textTexture * uColor * vec4( mixColor, 1.0 );
    }\n
  );
  
  const char* FRAGMENT_SHADER_MULTI_COLOR_TEXT = DALI_COMPOSE_SHADER(
    varying mediump vec2 vTexCoord;\n
    uniform sampler2D sTexture;\n
 -  uniform mediump vec4 uAtlasRect;\n
    uniform lowp vec4 uColor;\n
    uniform lowp vec3 mixColor;\n
-   uniform lowp float opacity;\n
    uniform lowp float preMultipliedAlpha;\n
    \n
-   lowp vec4 visualMixColor()\n
-   {\n
-     return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );\n
-   }\n
-   \n
    void main()\n
    {\n
 -    mediump vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );\n
 -    mediump vec4 textTexture = texture2D( sTexture, texCoord );\n
 +    mediump vec4 textTexture = texture2D( sTexture, vTexCoord );\n
      textTexture.rgb *= mix( 1.0, textTexture.a, preMultipliedAlpha );\n
  
-     gl_FragColor = textTexture * uColor * visualMixColor();
+     gl_FragColor = textTexture * uColor * vec4( mixColor, 1.0 );
    }\n
  );
  
@@@ -152,23 -145,19 +141,17 @@@ const char* FRAGMENT_SHADER_SINGLE_COLO
    uniform sampler2D sTexture;\n
    uniform sampler2D sStyle;\n
    uniform lowp vec4 uTextColorAnimatable;\n
 -  uniform mediump vec4 uAtlasRect;\n
    uniform lowp vec4 uColor;\n
    uniform lowp vec3 mixColor;\n
-   uniform lowp float opacity;\n
    uniform lowp float preMultipliedAlpha;\n
    \n
-   lowp vec4 visualMixColor()\n
-   {\n
-     return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );\n
-   }\n
-   \n
    void main()\n
    {\n
 -    mediump vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );\n
 -    mediump float textTexture = texture2D( sTexture, texCoord ).r;\n
 -    mediump vec4 styleTexture = texture2D( sStyle, texCoord );\n
 +    mediump float textTexture = texture2D( sTexture, vTexCoord ).r;\n
 +    mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );\n
  
      // Draw the text as overlay above the style
-     gl_FragColor = ( uTextColorAnimatable * textTexture + styleTexture * ( 1.0 - textTexture ) ) * uColor * visualMixColor();\n
+     gl_FragColor = ( uTextColorAnimatable * textTexture + styleTexture * ( 1.0 - textTexture ) ) * uColor * vec4( mixColor, 1.0 );\n
    }\n
  );
  
@@@ -176,20 -165,16 +159,14 @@@ const char* FRAGMENT_SHADER_MULTI_COLOR
    varying mediump vec2 vTexCoord;\n
    uniform sampler2D sTexture;\n
    uniform sampler2D sStyle;\n
 -  uniform mediump vec4 uAtlasRect;\n
    uniform lowp vec4 uColor;\n
    uniform lowp vec3 mixColor;\n
-   uniform lowp float opacity;\n
    uniform lowp float preMultipliedAlpha;\n
    \n
-   lowp vec4 visualMixColor()\n
-   {\n
-     return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );\n
-   }\n
-   \n
    void main()\n
    {\n
 -    mediump vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );\n
 -    mediump vec4 textTexture = texture2D( sTexture, texCoord );\n
 -    mediump vec4 styleTexture = texture2D( sStyle, texCoord );\n
 +    mediump vec4 textTexture = texture2D( sTexture, vTexCoord );\n
 +    mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );\n
      textTexture.rgb *= mix( 1.0, textTexture.a, preMultipliedAlpha );\n
  
      // Draw the text as overlay above the style
@@@ -202,20 -187,16 +179,14 @@@ const char* FRAGMENT_SHADER_SINGLE_COLO
    uniform sampler2D sTexture;\n
    uniform sampler2D sMask;\n
    uniform lowp vec4 uTextColorAnimatable;\n
 -  uniform mediump vec4 uAtlasRect;\n
    uniform lowp vec4 uColor;\n
    uniform lowp vec3 mixColor;\n
-   uniform lowp float opacity;\n
    uniform lowp float preMultipliedAlpha;\n
    \n
-   lowp vec4 visualMixColor()\n
-   {\n
-     return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );\n
-   }\n
-   \n
    void main()\n
    {\n
 -    mediump vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );\n
 -    mediump vec4 textTexture = texture2D( sTexture, texCoord );\n
 -    mediump float maskTexture = texture2D( sMask, texCoord ).r;\n
 +    mediump vec4 textTexture = texture2D( sTexture, vTexCoord );\n
 +    mediump float maskTexture = texture2D( sMask, vTexCoord ).r;\n
  
      // Set the color of non-transparent pixel in text to what it is animated to.
      // Markup text with multiple text colors are not animated (but can be supported later on if required).
@@@ -235,21 -216,17 +206,15 @@@ const char* FRAGMENT_SHADER_SINGLE_COLO
    uniform sampler2D sMask;\n
    uniform lowp float uHasMultipleTextColors;\n
    uniform lowp vec4 uTextColorAnimatable;\n
 -  uniform mediump vec4 uAtlasRect;\n
    uniform lowp vec4 uColor;\n
    uniform lowp vec3 mixColor;\n
-   uniform lowp float opacity;\n
    uniform lowp float preMultipliedAlpha;\n
    \n
-   lowp vec4 visualMixColor()\n
-   {\n
-     return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );\n
-   }\n
-   \n
    void main()\n
    {\n
 -    mediump vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );\n
 -    mediump vec4 textTexture = texture2D( sTexture, texCoord );\n
 -    mediump vec4 styleTexture = texture2D( sStyle, texCoord );\n
 -    mediump float maskTexture = texture2D( sMask, texCoord ).r;\n
 +    mediump vec4 textTexture = texture2D( sTexture, vTexCoord );\n
 +    mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );\n
 +    mediump float maskTexture = texture2D( sMask, vTexCoord ).r;\n
  
      // Set the color of non-transparent pixel in text to what it is animated to.
      // Markup text with multiple text colors are not animated (but can be supported later on if required).