X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition-effects%2Fcube-transition-wave-effect-impl.cpp;h=818e670ff13b5357cb5d12d68e306e3ab7a27b6a;hp=1f8ca0f2679608333b3ebf8f5ada6bd64d869d4c;hb=df92f45e89c92ca9b2286d51116ff7b69e75c569;hpb=10d2080e1d25b75347daa2f8c2dcee494fbcb175 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 --- 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 ) ); } }