projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added application to test visual transition framework
[platform/core/uifw/dali-demo.git]
/
examples
/
styling
/
image-channel-control-impl.cpp
diff --git
a/examples/styling/image-channel-control-impl.cpp
b/examples/styling/image-channel-control-impl.cpp
index
a6b41c7
..
c805e39
100644
(file)
--- a/
examples/styling/image-channel-control-impl.cpp
+++ b/
examples/styling/image-channel-control-impl.cpp
@@
-37,11
+37,12
@@
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
varying mediump vec2 vTexCoord;\n
uniform sampler2D sTexture;\n
uniform mediump vec4 uColor;\n
varying mediump vec2 vTexCoord;\n
uniform sampler2D sTexture;\n
uniform mediump vec4 uColor;\n
+ uniform mediump vec4 mixColor;\n
uniform mediump vec3 uChannels;\n
\n
void main()\n
{\n
uniform mediump vec3 uChannels;\n
\n
void main()\n
{\n
- gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor * vec4(uChannels, 1.0) ;\n
+ gl_FragColor = texture2D( sTexture, vTexCoord ) *
mixColor *
uColor * vec4(uChannels, 1.0) ;\n
}\n
);
}\n
);