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
Fix doxygen errors and enable doxygen build for devel-api
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
iris-effect.h
diff --git
a/dali-toolkit/devel-api/shader-effects/iris-effect.h
b/dali-toolkit/devel-api/shader-effects/iris-effect.h
index
48e6f11
..
6c7f6cd
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/iris-effect.h
+++ b/
dali-toolkit/devel-api/shader-effects/iris-effect.h
@@
-55,10
+55,10
@@
inline ShaderEffect CreateIrisEffect()
"\n"
"void main()\n"
"{\n"
"\n"
"void main()\n"
"{\n"
- " mediump vec4 world = uModelView * vec4(aPosition
*uSize.xy, 0.0
, 1.0);\n"
+ " mediump vec4 world = uModelView * vec4(aPosition, 1.0);\n"
" gl_Position = uProjection * world;\n"
" \n"
" gl_Position = uProjection * world;\n"
" \n"
- " vTexCoord = mix(
uTextureRect.xy, uTextureRect.zw, aPosition + vec2(0.5) );
;\n"
+ " vTexCoord = mix(
sTextureRect.xy, sTextureRect.zw, aTexCoord )
;\n"
" vRelativePosition = vTexCoord - uCenter;\n"
"}\n");
" vRelativePosition = vTexCoord - uCenter;\n"
"}\n");