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
Merge "Add video view control" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
spot-effect.h
diff --git
a/dali-toolkit/devel-api/shader-effects/spot-effect.h
b/dali-toolkit/devel-api/shader-effects/spot-effect.h
index
2cff9ee
..
054942e
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/spot-effect.h
+++ b/
dali-toolkit/devel-api/shader-effects/spot-effect.h
@@
-48,7
+48,7
@@
inline ShaderEffect CreateSpotEffect()
"\n"
"void main()\n"
"{\n"
"\n"
"void main()\n"
"{\n"
- " mediump vec4 world = vec4(aPosition
*uSize.xy, 0.0
, 1.0);\n"
+ " mediump vec4 world = vec4(aPosition, 1.0);\n"
" \n"
" mediump vec2 d = vec2(world.xy - uCenter);\n"
" mediump float dist = length(d);\n"
" \n"
" mediump vec2 d = vec2(world.xy - uCenter);\n"
" mediump float dist = length(d);\n"
@@
-57,7
+57,7
@@
inline ShaderEffect CreateSpotEffect()
" vRange = max(0.1, range);\n"
" \n"
" gl_Position = uMvpMatrix * world;\n"
" vRange = max(0.1, range);\n"
" \n"
" gl_Position = uMvpMatrix * world;\n"
- " vTexCoord = mix(
uTextureRect.xy, uTextureRect.zw, aPosition + vec2(0.5) );\n
;\n"
+ " vTexCoord = mix(
sTextureRect.xy, sTextureRect.zw, aTexCoord )
;\n"
"}");
std::string fragmentShader(
"}");
std::string fragmentShader(