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
Changed all property & signal names to lowerCamelCase
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
dissolve-effect.h
diff --git
a/dali-toolkit/devel-api/shader-effects/dissolve-effect.h
b/dali-toolkit/devel-api/shader-effects/dissolve-effect.h
index
e160532
..
f97f4f4
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/dissolve-effect.h
+++ b/
dali-toolkit/devel-api/shader-effects/dissolve-effect.h
@@
-245,13
+245,13
@@
inline Property::Map CreateDissolveEffect( bool useHighPrecision = true )
vertexShaderString.append( vertexShader );
fragmentShaderString.append( fragmentShader );
vertexShaderString.append( vertexShader );
fragmentShaderString.append( fragmentShader );
- customShader[ "vertex
-s
hader" ] = vertexShaderString;
- customShader[ "fragment
-s
hader" ] = fragmentShaderString;
+ customShader[ "vertex
S
hader" ] = vertexShaderString;
+ customShader[ "fragment
S
hader" ] = fragmentShaderString;
- customShader[ "subdivide
-grid-x
" ] = 20;
- customShader[ "subdivide
-grid-y
" ] = 20;
+ customShader[ "subdivide
GridX
" ] = 20;
+ customShader[ "subdivide
GridY
" ] = 20;
- customShader[ "hints" ] = "output
-is-t
ransparent";
+ customShader[ "hints" ] = "output
IsT
ransparent";
map[ "shader" ] = customShader;
return map;
map[ "shader" ] = customShader;
return map;