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
Select the renderer type based on the image url
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
bubble-effect
/
bubble-actor.cpp
diff --git
a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.cpp
b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.cpp
index
e1ef66c
..
f42b72b
100644
(file)
--- a/
dali-toolkit/internal/controls/bubble-effect/bubble-actor.cpp
+++ b/
dali-toolkit/internal/controls/bubble-effect/bubble-actor.cpp
@@
-50,7
+50,7
@@
BubbleActor::BubbleActor( unsigned int numberOfBubble,
mActor = Actor::New();
}
mActor = Actor::New();
}
-void BubbleActor::MakeRenderable( Geometry geometry,
Material material
)
+void BubbleActor::MakeRenderable( Geometry geometry,
TextureSet textureSet, Shader shader
)
{
if( mRenderer )
{
{
if( mRenderer )
{
@@
-58,7
+58,8
@@
void BubbleActor::MakeRenderable( Geometry geometry, Material material )
return;
}
return;
}
- mRenderer = Renderer::New( geometry, material );
+ mRenderer = Renderer::New( geometry, shader );
+ mRenderer.SetTextures( textureSet );
mActor.AddRenderer( mRenderer );
mActor.SetSize( mMovementArea );
mActor.AddRenderer( mRenderer );
mActor.SetSize( mMovementArea );