X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition-effects%2Fcube-transition-fold-effect-impl.h;h=625ce8681968750931ddc1657f736b14aa72dadf;hb=refs%2Fchanges%2F46%2F265846%2F1;hp=564738c146e29afea803ef14b399115472ac7d32;hpb=f4d559ea999cbbc44b1ecd489c4ca3711d37feca;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h
index 564738c..625ce86 100644
--- a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h
+++ b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H__
-#define __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H__
+#ifndef DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H
+#define DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,70 +21,52 @@
 // EXTERNAL INCLUDES
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h>
+#include <dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h>
 #include <dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 class CubeTransitionFoldEffect;
 
 namespace Internal
 {
-
 class CubeTransitionEffect;
 
 class CubeTransitionFoldEffect : public CubeTransitionEffect
 {
-
 public:
-
   /**
    * @copydoc Toolkit::CubeTransitionFoldEffect::New
    */
-  static Toolkit::CubeTransitionFoldEffect New(unsigned int numRows, unsigned int numColumns, Size viewAreaSize);
+  static Toolkit::CubeTransitionFoldEffect New(unsigned int numRows, unsigned int numColumns);
 
 protected:
-
-   /**
+  /**
     * @copydoc Toolkit::CubeTransitionEffect::OnInitialize
     */
-   virtual void OnInitialize();
+  void OnInitialize() override;
 
-   /**
+  /**
     * @copydoc Toolkit::CubeTransitionEffect::OnStartTransition
     */
-   virtual void OnStartTransition( Vector2 panPosition, Vector2 panDisplacement );
+  void OnStartTransition(Vector2 panPosition, Vector2 panDisplacement) override;
 
-   /**
-    * @copydoc Toolkit::Internal::CubeTransitionEffect::OnStopTransition
-    */
-   virtual void OnStopTransition();
 private:
-
-   /**
+  /**
     * Construct a new CubeTransitionFoldEffect object
     * @param[in] numRows How many rows of cubes
     * @param[in] numColumns How many columns of cubes
-    * @param[in] viewAreaSize The size of view area for this transition effect
     */
-   CubeTransitionFoldEffect( unsigned int numRows, unsigned int numColumns, Size viewAreaSize );
+  CubeTransitionFoldEffect(unsigned int numRows, unsigned int numColumns);
 
-   /**
+  /**
     * Set up animation to an Actor
     * @param[in] actorIndex The index of the cube in the cube array
     * @param[in] angle The angle of the rotation animation
-    * @param[in] resetTranslation The translation used to reset the actor position before animation
     */
-
-   void SetupAnimation( unsigned int actorIndex, float angle, Vector3 resetTranslation );
-
-private:
-
-   static const float  mDisplacementRatio;
+  void SetupAnimation(unsigned int actorIndex, unsigned int x, float angle);
 
 }; //class CubeTransitionFoldEffect
 
@@ -96,7 +78,7 @@ inline Internal::CubeTransitionFoldEffect& GetImpl(Dali::Toolkit::CubeTransition
 {
   DALI_ASSERT_ALWAYS(obj);
 
-  Dali::BaseObject& handle = obj.GetBaseObject();
+  Dali::RefObject& handle = obj.GetImplementation();
 
   return static_cast<Internal::CubeTransitionFoldEffect&>(handle);
 }
@@ -105,7 +87,7 @@ inline const Internal::CubeTransitionFoldEffect& GetImpl(const Dali::Toolkit::Cu
 {
   DALI_ASSERT_ALWAYS(obj);
 
-  const Dali::BaseObject& handle = obj.GetBaseObject();
+  const Dali::RefObject& handle = obj.GetImplementation();
 
   return static_cast<const Internal::CubeTransitionFoldEffect&>(handle);
 }
@@ -114,4 +96,4 @@ inline const Internal::CubeTransitionFoldEffect& GetImpl(const Dali::Toolkit::Cu
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H_ */
+#endif // DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H