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
support match align for system language direciton
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
primitive
/
primitive-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
index
8a2ec88
..
103529b
100644
(file)
--- a/
dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
+++ b/
dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
@@
-169,10
+169,9
@@
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
varying mediump vec3 vIllumination;\n
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
varying mediump vec3 vIllumination;\n
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
- uniform lowp float opacity;\n
void main()\n
{\n
void main()\n
{\n
- vec4 baseColor = vec4(mixColor,
opacity
) * uColor;\n
+ vec4 baseColor = vec4(mixColor,
1.0
) * uColor;\n
gl_FragColor = vec4( vIllumination.rgb * baseColor.rgb, baseColor.a );\n
}\n
);
gl_FragColor = vec4( vIllumination.rgb * baseColor.rgb, baseColor.a );\n
}\n
);