Merge "Fixed Control and Magnifier API" into tizen

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / transition-effects / cube-transition-fold-effect-impl.cpp

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
index 803ed2a..6989478 100644 (file)
--- a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
+++ b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.cpp
@@ -102,11 +102,11 @@ void CubeTransitionFoldEffect::OnStopTransition()
     idx = y*mNumColumns;
     for( unsigned int x = y%2; x < mNumColumns; x=x+2)
     {
-      mBoxes[idx+x].SetRotation( Radian(angle), Vector3::YAXIS );
+      mBoxes[idx+x].SetOrientation( Radian(angle), Vector3::YAXIS );
     }
     for( unsigned int x = (y+1)%2; x < mNumColumns; x=x+2)
     {
-      mBoxes[idx+x].SetRotation( Radian(-angle), Vector3::YAXIS );
+      mBoxes[idx+x].SetOrientation( Radian(-angle), Vector3::YAXIS );
     }
   }
 }
@@ -118,18 +118,18 @@ void CubeTransitionFoldEffect::SetupAnimation(unsigned int actorIndex, float ang
   ImageActor frontTile = mTiles[mContainerIndex^1][actorIndex];
   if ( mFirstTransition && (!mIsToNextImage) ) // for the first transition, it is going to previous image
   {
-    sideTile.SetRotation( Radian( angle),   Vector3::YAXIS );
+    sideTile.SetOrientation( Radian( angle),   Vector3::YAXIS );
   }
   else if( !mChangeTurningDirection )   // reset rotation, translation and color
   {
-    sideTile.MoveBy( resetTranslation );
-    sideTile.SetRotation( Radian( angle),   Vector3::YAXIS );
+    sideTile.TranslateBy( resetTranslation );
+    sideTile.SetOrientation( Radian( angle),   Vector3::YAXIS );
   }
-  mAnimation.RotateTo( currentCube, Radian( -angle ), Vector3::YAXIS, AlphaFunctions::Linear );
+  mAnimation.AnimateTo( Property( currentCube, Actor::Property::ORIENTATION ), Quaternion( Radian( -angle ), Vector3::YAXIS ), AlphaFunction::LINEAR );
   Vector3 position(currentCube.GetCurrentPosition());
-  mAnimation.MoveTo(currentCube, Vector3( position.x*mDisplacementRatio, position.y, position.z ), AlphaFunctions::Bounce);
-  mAnimation.ColorTo( frontTile, HALF_BRIGHTNESS, AlphaFunctions::EaseOut );
-  mAnimation.ColorTo( sideTile, FULL_BRIGHTNESS, AlphaFunctions::EaseIn );
+  mAnimation.AnimateTo( Property( currentCube, Actor::Property::POSITION ), Vector3( position.x*mDisplacementRatio, position.y, position.z ), AlphaFunction::BOUNCE );
+  mAnimation.AnimateTo( Property( frontTile, Actor::Property::COLOR ), HALF_BRIGHTNESS, AlphaFunction::EASE_OUT );
+  mAnimation.AnimateTo( Property( sideTile, Actor::Property::COLOR ), FULL_BRIGHTNESS, AlphaFunction::EASE_IN );
 }
 
 } // namespace Internal