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
Updated visuals to separate alpha channel from mixColor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
gradient
/
gradient-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
index
7f58d66
..
4ea6a28
100644
(file)
--- a/
dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
+++ b/
dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
@@
-172,12
+172,13
@@
const char* FRAGMENT_SHADER[] =
DALI_COMPOSE_SHADER(
uniform sampler2D sTexture;\n // sampler1D?
uniform lowp vec4 uColor;\n
DALI_COMPOSE_SHADER(
uniform sampler2D sTexture;\n // sampler1D?
uniform lowp vec4 uColor;\n
- uniform lowp vec4 mixColor;\n
+ uniform lowp vec3 mixColor;\n
+ uniform lowp float opacity;\n
varying mediump vec2 vTexCoord;\n
\n
void main()\n
{\n
varying mediump vec2 vTexCoord;\n
\n
void main()\n
{\n
-
gl_FragColor = texture2D( sTexture, vec2( vTexCoord.y, 0.5 ) ) * vec4(mixColor.rgb*mixColor.a, mixColor.a
) * uColor;\n
+
gl_FragColor = texture2D( sTexture, vec2( vTexCoord.y, 0.5 ) ) * vec4(mixColor*opacity, opacity
) * uColor;\n
}\n
),
}\n
),
@@
-185,12
+186,13
@@
DALI_COMPOSE_SHADER(
DALI_COMPOSE_SHADER(
uniform sampler2D sTexture;\n // sampler1D?
uniform lowp vec4 uColor;\n
DALI_COMPOSE_SHADER(
uniform sampler2D sTexture;\n // sampler1D?
uniform lowp vec4 uColor;\n
- uniform lowp vec4 mixColor;\n
+ uniform lowp vec3 mixColor;\n
+ uniform lowp float opacity;\n
varying mediump vec2 vTexCoord;\n
\n
void main()\n
{\n
varying mediump vec2 vTexCoord;\n
\n
void main()\n
{\n
- gl_FragColor = texture2D( sTexture, vec2( length(vTexCoord), 0.5 ) ) * vec4(mixColor
.rgb*mixColor.a, mixColor.a
) * uColor;\n
+ gl_FragColor = texture2D( sTexture, vec2( length(vTexCoord), 0.5 ) ) * vec4(mixColor
*opacity, opacity
) * uColor;\n
}\n
)
};
}\n
)
};