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-effect-impl.h;h=8d1760e449f2169e213245a2d1e9a2fb0584e9b5;hp=25d1e1c2bc82aef4708ffd638ff2bbb98c38ace9;hb=54fbf47db890d0479d19d780de5ea5d860924632;hpb=3f3cb4f8020f60d4d5dc672ddc426cb73126f80d diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h index 25d1e1c..8d1760e 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h @@ -76,14 +76,14 @@ public: bool IsTransitioning(); /** - * @copydoc Toolkit::CubeTransitionEffect::SetFirstImage + * @copydoc Toolkit::CubeTransitionEffect::SetCurrentTexture */ - void SetCurrentImage( Image image ); + void SetCurrentTexture( Texture texture ); /** - * @copydoc Toolkit::CubeTransitionEffect::SetTargetImage + * @copydoc Toolkit::CubeTransitionEffect::SetTargetTexture */ - void SetTargetImage( Image image ); + void SetTargetTexture( Texture texture ); /** * @copydoc Toolkit::CubeTransitionEffect::StartTransition(bool) @@ -166,7 +166,7 @@ private: /** * Callback function of transition animation finished - * Hide transition layer, show current imageActor, and set isAnimating flag to false + * Hide transition layer, show current image, and set isAnimating flag to false * @param[in] source The cube transition animation */ void OnTransitionFinished(Animation& source); @@ -214,8 +214,9 @@ protected: Renderer mCurrentRenderer; Renderer mTargetRenderer; - Image mCurrentImage; - Image mTargetImage; + Texture mCurrentTexture; + Texture mTargetTexture; + Animation mAnimation; Vector2 mTileSize;