X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fbubble-effect%2Fbubble-emitter.cpp;h=506e12d68f576a2279ffc6c38b7e03fc2ed66cf3;hp=c45063793d204eb13af7591982e4b3c49e553e6d;hb=8d7a2d639ced5d2eb3ce4321653ad4d8b55b0b95;hpb=f58b8383147de70affa1e3949cf1c6757d705d3c

diff --git a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp
index c450637..506e12d 100644
--- a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp
+++ b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.cpp
@@ -48,11 +48,11 @@ BubbleEmitter::BubbleEmitter(Dali::Internal::CustomActor* internal)
 }
 
 BubbleEmitter BubbleEmitter::New( const Vector2& winSize,
-                                  Image shapeImage,
+                                  Dali::Texture shapeTexture,
                                   unsigned int maximumNumberOfBubble,
                                   const Vector2& bubbleSizeRange )
 {
-  return Internal::BubbleEmitter::New( winSize, shapeImage, maximumNumberOfBubble, bubbleSizeRange );
+  return Internal::BubbleEmitter::New( winSize, shapeTexture, maximumNumberOfBubble, bubbleSizeRange );
 }
 
 BubbleEmitter::BubbleEmitter( const BubbleEmitter& handle )
@@ -79,14 +79,14 @@ Actor BubbleEmitter::GetRootActor()
   return GetImpl(*this).GetRootActor();
 }
 
-void BubbleEmitter::SetBackground( Image bgImage, const Vector3& hsvDelta )
+void BubbleEmitter::SetBackground( Dali::Texture bgTexture, const Vector3& hsvDelta )
 {
-  GetImpl(*this).SetBackground( bgImage, hsvDelta );
+  GetImpl(*this).SetBackground( bgTexture, hsvDelta );
 }
 
-void BubbleEmitter::SetShapeImage( Image shapeImage )
+void BubbleEmitter::SetBubbleShape( Dali::Texture shapeTexture )
 {
-  GetImpl(*this).SetShapeImage( shapeImage );
+  GetImpl(*this).SetBubbleShape( shapeTexture );
 }
 
 void BubbleEmitter::SetBubbleScale( float scale )
@@ -99,21 +99,11 @@ void BubbleEmitter::SetBubbleDensity( unsigned int density )
   GetImpl(*this).SetBubbleDensity( density );
 }
 
-void BubbleEmitter::SetBlendMode( bool enable )
-{
-  GetImpl(*this).SetBlendMode( enable );
-}
-
 void BubbleEmitter::EmitBubble( Animation& animation, const Vector2& emitPosition, const Vector2& direction, const Vector2& displacement )
 {
   GetImpl(*this).EmitBubble( animation, emitPosition, direction, displacement );
 }
 
-void BubbleEmitter::StartExplosion( float duration, float multiple )
-{
-  GetImpl(*this).StartExplosion( duration, multiple );
-}
-
 void BubbleEmitter::Restore()
 {
   GetImpl(*this).Restore();