Merge "Fixed Control and Magnifier API" into tizen

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

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
index 1f8ca0f..818e670 100644 (file)
--- a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
+++ b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.cpp
@@ -97,14 +97,14 @@ void CubeTransitionWaveEffect::OnStartTransition( Vector2 panPosition, Vector2 p
       // the delay value is within 0.f ~ 2.f*thirdAnimationDuration
       float delay = thirdAnimationDuration * CalculateDelay(x*mTileSize.width,y*mTileSize.height);
 
-      mAnimation.RotateTo( mBoxes[idx], Degree( -angle ), Vector3::YAXIS,
-                           AlphaFunctions::EaseOutSine, delay, thirdAnimationDuration );
-      mAnimation.MoveBy( mBoxes[idx], Vector3(0.f,0.f,-mCubeDisplacement),
-                         AlphaFunctions::Bounce, delay, thirdAnimationDuration );
-      mAnimation.ColorTo( mTiles[anotherIndex][idx], HALF_BRIGHTNESS,
-                          AlphaFunctions::EaseOut, delay, thirdAnimationDuration );
-      mAnimation.ColorTo( mTiles[mContainerIndex][idx], FULL_BRIGHTNESS,
-                          AlphaFunctions::EaseIn, delay, thirdAnimationDuration );
+      mAnimation.AnimateTo( Property( mBoxes[idx], Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( -angle ) ), Vector3::YAXIS ),
+                            AlphaFunction::EASE_OUT_SINE, TimePeriod( delay, thirdAnimationDuration ) );
+      mAnimation.AnimateBy( Property( mBoxes[idx], Actor::Property::POSITION ), Vector3( 0.f, 0.f, -mCubeDisplacement ),
+                         AlphaFunction::BOUNCE, TimePeriod( delay, thirdAnimationDuration ) );
+      mAnimation.AnimateTo( Property( mTiles[anotherIndex][idx], Actor::Property::COLOR ), HALF_BRIGHTNESS,
+                          AlphaFunction::EASE_OUT, TimePeriod( delay, thirdAnimationDuration ) );
+      mAnimation.AnimateTo( Property( mTiles[mContainerIndex][idx], Actor::Property::COLOR ), FULL_BRIGHTNESS,
+                          AlphaFunction::EASE_IN, TimePeriod( delay, thirdAnimationDuration ) );
     }
   }