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
Updates following the PixelData change
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
dissolve-local-effect.h
diff --git
a/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h
b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h
index
c91abdc
..
31dcebd
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h
+++ b/
dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h
@@
-54,7
+54,7
@@
inline ShaderEffect CreateDissolveLocalEffect( unsigned int numberOfDimples )
"varying float vPercentage;\n"
"void main()\n"
"{\n"
"varying float vPercentage;\n"
"void main()\n"
"{\n"
- " vec4 position = uModelView * vec4( aPosition
*uSize.xy, 0.0,
1.0 );\n"
+ " vec4 position = uModelView * vec4( aPosition
,
1.0 );\n"
" float percentage = 0.0;\n"
" for( int i=0; i<NUMBER_OF_DIMPLE; ++i )\n"
" {\n"
" float percentage = 0.0;\n"
" for( int i=0; i<NUMBER_OF_DIMPLE; ++i )\n"
" {\n"
@@
-63,7
+63,7
@@
inline ShaderEffect CreateDissolveLocalEffect( unsigned int numberOfDimples )
" }\n"
" vPercentage = clamp( percentage, 0.0, 1.0 );\n"
" gl_Position = uProjection * position;\n"
" }\n"
" vPercentage = clamp( percentage, 0.0, 1.0 );\n"
" gl_Position = uProjection * position;\n"
- " vTexCoord = mix(
uTextureRect.xy, uTextureRect.zw, aPosition + vec2(0.5) );\n
;\n"
+ " vTexCoord = mix(
sTextureRect.xy, sTextureRect.zw, aTexCoord )
;\n"
"}\n");
vertexShaderStringStream << vertexShader;
"}\n");
vertexShaderStringStream << vertexShader;