X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition-effects%2Fcube-transition-effect-impl.cpp;h=1cee6e1a9bfcf22aad7d30fbc26a7d9722e82686;hb=46e8848bda5e3287a80ee9ce020166ad55a52ec0;hp=f63360724f272cfafbdcd3e82d86138d915c8ed1;hpb=3f3cb4f8020f60d4d5dc672ddc426cb73126f80d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index f633607..1cee6e1 100644
--- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@ -40,7 +40,7 @@ namespace
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::CubeTransitionEffect, Dali::BaseHandle, NULL );
 
-DALI_SIGNAL_REGISTRATION( Toolkit, CubeTransitionEffect, "transition-completed", SIGNAL_TRANSITION_COMPLETED )
+DALI_SIGNAL_REGISTRATION( Toolkit, CubeTransitionEffect, "transitionCompleted",  SIGNAL_TRANSITION_COMPLETED )
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -100,8 +100,8 @@ Geometry CreateQuadGeometry()
 
   Property::Map quadVertexFormat;
   quadVertexFormat["aPosition"] = Property::VECTOR2;
-  PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat, 4 );
-  quadVertices.SetData(quadVertexData);
+  PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat );
+  quadVertices.SetData( quadVertexData, 4 );
 
   // Create the geometry object
   Geometry geometry = Geometry::New();
@@ -270,18 +270,21 @@ void CubeTransitionEffect::Initialize()
 
 void CubeTransitionEffect::OnStageConnection( int depth )
 {
+  Control::OnStageConnection( depth );
+
   Geometry geometry = CreateQuadGeometry();
   Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
 
-  Material material = Material::New( shader );
+  TextureSet textureSet = TextureSet::New();
 
   if( mCurrentImage )
   {
-    material.AddTexture( mCurrentImage, "sTexture" );
+    textureSet.SetImage( 0u, mCurrentImage );
   }
-  mCurrentRenderer = Renderer::New( geometry, material );
+  mCurrentRenderer = Renderer::New( geometry, shader );
+  mCurrentRenderer.SetTextures( textureSet );
 
-  mCurrentRenderer.SetDepthIndex( depth );
+  mCurrentRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, depth );
   Self().AddRenderer( mCurrentRenderer );
 }
 
@@ -306,6 +309,8 @@ void CubeTransitionEffect::OnStageDisconnection()
     }
     mTargetRenderer.Reset();
   }
+
+  Control::OnStageDisconnection();
 }
 
 void CubeTransitionEffect::SetTransitionDuration( float duration )
@@ -336,20 +341,10 @@ bool CubeTransitionEffect::IsTransitioning()
 void CubeTransitionEffect::SetCurrentImage( Image image )
 {
   mCurrentImage = image;
-
   if( mCurrentRenderer )
   {
-    Material material = mCurrentRenderer.GetMaterial();
-
-    int index = material.GetTextureIndex("sTexture" );
-    if( index != -1 )
-    {
-      material.SetTextureImage( index, mCurrentImage );
-    }
-    else
-    {
-      material.AddTexture( mCurrentImage, "sTexture" );
-    }
+    TextureSet textureSet = mCurrentRenderer.GetTextures();
+    textureSet.SetImage( 0u, mCurrentImage );
   }
 }
 
@@ -359,8 +354,8 @@ void CubeTransitionEffect::SetTargetImage( Image image )
 
   if( mTargetRenderer )
   {
-    Material material = mTargetRenderer.GetMaterial();
-    material.AddTexture( mTargetImage, "sTexture" );
+    TextureSet textureSet = mTargetRenderer.GetTextures();
+    textureSet.SetImage( 0u, mTargetImage );
   }
 }
 
@@ -386,15 +381,18 @@ void CubeTransitionEffect::StartTransition( Vector2 panPosition, Vector2 panDisp
   }
 
   //create the target renderer
-  Material material = Material::New( mCurrentRenderer.GetMaterial().GetShader() );
+  TextureSet textureSet = TextureSet::New();
   if( mTargetImage )
   {
-    material.AddTexture( mTargetImage, "sTexture" );
+    textureSet.SetImage( 0u, mTargetImage );
   }
   Geometry geometry = mCurrentRenderer.GetGeometry();
-  mTargetRenderer = Renderer::New( geometry, material );
+  Shader shader( mCurrentRenderer.GetShader() );
+  mTargetRenderer = Renderer::New( geometry, shader );
+  mTargetRenderer.SetTextures( textureSet );
 
-  mTargetRenderer.SetDepthIndex( mCurrentRenderer.GetDepthIndex() );
+  int depthIndex = mCurrentRenderer.GetProperty<int>(Renderer::Property::DEPTH_INDEX);
+  mTargetRenderer.SetProperty( Dali::Renderer::Property::DEPTH_INDEX, depthIndex );
 
   for( size_t i = 0; i < mBoxes.size(); ++i )
   {