Rendering API clean-up

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / bubble-effect / bubble-emitter-impl.cpp

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
index 392fa9c..836a26d 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
@@ -142,9 +142,9 @@ void BubbleEmitter::OnInitialize()
 
   Shader bubbleShader = CreateBubbleShader (mNumBubblePerActor );
 
 
   Shader bubbleShader = CreateBubbleShader (mNumBubblePerActor );
 

-  mMaterial = Material::New( bubbleShader );
-  mMaterial.AddTexture( mEffectImage, "sBackground" );
-  mMaterial.AddTexture( mShapeImage,  "sBubbleShape" );
+  mTextureSet = TextureSet::New();
+  mTextureSet.SetImage( 0u, mEffectImage );
+  mTextureSet.SetImage( 1u, mShapeImage );

 
   mBubbleActors.resize( mNumActor );
 
 
   mBubbleActors.resize( mNumActor );
 


@@ -152,7 +152,7 @@ void BubbleEmitter::OnInitialize()
   for(unsigned int i=0; i < mNumActor; i++ )
   {
     mBubbleActors[i] = new BubbleActor( mNumBubblePerActor, mMovementArea );
   for(unsigned int i=0; i < mNumActor; i++ )
   {
     mBubbleActors[i] = new BubbleActor( mNumBubblePerActor, mMovementArea );

-    (mBubbleActors[i])->MakeRenderable( mMeshGeometry, mMaterial );
+    (mBubbleActors[i])->MakeRenderable( mMeshGeometry, mTextureSet, bubbleShader );

     mBubbleRoot.Add( (mBubbleActors[i])->GetMeshActor() );
   }
 
     mBubbleRoot.Add( (mBubbleActors[i])->GetMeshActor() );
   }
 


@@ -200,7 +200,7 @@ void BubbleEmitter::SetBackground( Image bgImage, const Vector3& hsvDelta )
 
 void BubbleEmitter::SetShapeImage( Image shapeImage )
 {
 
 void BubbleEmitter::SetShapeImage( Image shapeImage )
 {

-  mMaterial.SetTextureImage( 1, shapeImage );
+  mTextureSet.SetImage( 1, shapeImage );

 }
 
 void BubbleEmitter::SetBubbleScale( float scale )
 }
 
 void BubbleEmitter::SetBubbleScale( float scale )