projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh
[platform/core/uifw/dali-demo.git]
/
demo
/
dali-table-view.cpp
diff --git
a/demo/dali-table-view.cpp
b/demo/dali-table-view.cpp
index
162a0e0
..
96d33b5
100644
(file)
--- a/
demo/dali-table-view.cpp
+++ b/
demo/dali-table-view.cpp
@@
-526,7
+526,7
@@
ImageActor DaliTableView::NewStencilImage()
stencilActor.SetAnchorPoint( AnchorPoint::CENTER );
stencilActor.SetDrawMode( DrawMode::STENCIL );
stencilActor.SetAnchorPoint( AnchorPoint::CENTER );
stencilActor.SetDrawMode( DrawMode::STENCIL );
- Dali::ShaderEffect shaderEffect =
AlphaDiscardEffect::New
();
+ Dali::ShaderEffect shaderEffect =
CreateAlphaDiscardEffect
();
stencilActor.SetShaderEffect( shaderEffect );
return stencilActor;
stencilActor.SetShaderEffect( shaderEffect );
return stencilActor;
@@
-764,11
+764,11
@@
void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage dis
dfActor.SetSize( Vector2( randSize, randSize ) );
dfActor.SetParentOrigin( ParentOrigin::CENTER );
dfActor.SetSize( Vector2( randSize, randSize ) );
dfActor.SetParentOrigin( ParentOrigin::CENTER );
-
Toolkit::DistanceFieldEffect effect = Toolkit::DistanceFieldEffect::New
();
+
ShaderEffect effect = Toolkit::CreateDistanceFieldEffect
();
dfActor.SetShaderEffect( effect );
dfActor.SetColor( randColour );
dfActor.SetShaderEffect( effect );
dfActor.SetColor( randColour );
- effect.Set
OutlineParams(
Vector2( 0.55f, 0.00f ) );
- effect.Set
SmoothingEdge(
0.5f );
+ effect.Set
Uniform("uOutlineParams",
Vector2( 0.55f, 0.00f ) );
+ effect.Set
Uniform("uSmoothing",
0.5f );
layer.Add( dfActor );
}
layer.Add( dfActor );
}