X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Ftransition-effects%2Fcube-transition-effect.h;h=8c670c4bd0cbdc92f25a786d39e39b46489a1f18;hb=90168515fb4b80ff64c068769420c0235a225d71;hp=05546a93e7b6cfae6941e75d13c512b90bbcb92d;hpb=941eb8eab76fca967bb8e21456179fc9b4eafea6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h
index 05546a9..8c670c4 100644
--- a/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h
+++ b/dali-toolkit/devel-api/transition-effects/cube-transition-effect.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_CUBE_TRANSITION_EFFECT_H__
-#define __DALI_TOOLKIT_CUBE_TRANSITION_EFFECT_H__
+#ifndef DALI_TOOLKIT_CUBE_TRANSITION_EFFECT_H
+#define DALI_TOOLKIT_CUBE_TRANSITION_EFFECT_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -20,22 +20,23 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/rendering/texture.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal DALI_INTERNAL
 {
-
 /**
  * CubeTransitionEffect implementation class
  */
 class CubeTransitionEffect;
 
-} // namespace Internal
+} // namespace DALI_INTERNAL
 
 /**
  * CubeTransitionEffect is a base class of custom transition effect on Images
@@ -78,10 +79,9 @@ class CubeTransitionEffect;
  * |---------------------|----------------------------------|
  * | transitionCompleted | @ref TransitionCompletedSignal() |
  */
-class DALI_IMPORT_API CubeTransitionEffect : public Control
+class DALI_TOOLKIT_API CubeTransitionEffect : public Control
 {
 public:
-
   /**
    * Create an uninitialized CubeTransitionEffect;
    * this can be initialized by New function of its subclass
@@ -102,13 +102,13 @@ public:
    * @param[in] handle A handle to an object
    * @return A handle to a CubeTransitionEffect object or an uninitialized handle
    */
-  static CubeTransitionEffect DownCast( BaseHandle handle );
+  static CubeTransitionEffect DownCast(BaseHandle handle);
 
   /**
    * Set the duration of transition animation
    * @param[in] duration The duration of transition animation
    */
-  void SetTransitionDuration( float duration );
+  void SetTransitionDuration(float duration);
 
   /**
    * Get the duration of transition animation
@@ -120,7 +120,7 @@ public:
    * Set the displacement of bouncing animation during cube's rotation
    * @param[in] displacement The displacement of bouncing animation
    */
-  void SetCubeDisplacement( float displacement );
+  void SetCubeDisplacement(float displacement);
 
   /**
    * Get the displacement of bouncing animation during cube's rotation
@@ -135,24 +135,24 @@ public:
   bool IsTransitioning();
 
   /**
-   * Set the current image to transition from
+   * Set the current texture to transition from
    * if using this same effect continually, only need to set once
-   * @param[in] image The current image
+   * @param[in] texture The current texture
    */
-  void SetCurrentImage(Image image);
+  void SetCurrentTexture(Texture texture);
 
   /**
-   * Set the target image to transit to
-   * @param[in] image The new Image showing on stage
+   * Set the target texture to transit to
+   * @param[in] texture The new Texture showing on stage
    */
-  void SetTargetImage(Image image);
+  void SetTargetTexture(Texture texture);
 
   /**
    * Activate the transition animation with horizontally left/right panGesture
    * @pre target image is set
    * @param[in] toNextImage Horizontally left panGesture if true, horizontally right if false
    */
-  void StartTransition( bool toNextImage = true );
+  void StartTransition(bool toNextImage = true);
 
   /**
    * Activate the transition animation with specified panGesture
@@ -160,7 +160,7 @@ public:
    * @param[in] panPosition The press down position of panGesture
    * @param[in] panDisplacement The displacement vector of panGesture
    */
-  void StartTransition( Vector2 panPosition, Vector2 panDisplacement );
+  void StartTransition(Vector2 panPosition, Vector2 panDisplacement);
 
   /**
    * Pause the transition animation.
@@ -182,35 +182,33 @@ public:
   void StopTransition();
 
 public: //Signal
-
   //Transition animation completed signal
-  typedef Signal< void ( CubeTransitionEffect, Image ) > TransitionCompletedSignalType;
+  typedef Signal<void(CubeTransitionEffect, Texture)> TransitionCompletedSignalType;
 
   /**
    * Signal emitted when the transition has completed animation
    * A callback of the following type may be connected
    * @code
-   *   void YourCallbackName( CubeTransitionEffect cubeEffect, Image currentImage );
+   *   void YourCallbackName( CubeTransitionEffect cubeEffect, Texture currentTexture );
    * @endcode
    * @return The Signal to connect to.
    */
   TransitionCompletedSignalType& TransitionCompletedSignal();
 
 public: // Not intended for developer use
-
   /**
    * @brief Creates a handle using the Toolkit::Internal implementation.
    *
    * @param[in]  implementation  The Control implementation.
    */
-  DALI_INTERNAL CubeTransitionEffect( Internal::CubeTransitionEffect& implementation );
+  DALI_INTERNAL CubeTransitionEffect(Internal::CubeTransitionEffect& implementation);
 
   /**
    * @brief Allows the creation of this Control from an Internal::CustomActor pointer.
    *
    * @param[in]  internal  A pointer to the internal CustomActor.
    */
-  DALI_INTERNAL CubeTransitionEffect( Dali::Internal::CustomActor* internal );
+  DALI_INTERNAL CubeTransitionEffect(Dali::Internal::CustomActor* internal);
 
 }; //class CubeTransitionEffect
 
@@ -218,4 +216,4 @@ public: // Not intended for developer use
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_CUBE_TRANSITION_EFFECT_H__ */
+#endif // DALI_TOOLKIT_CUBE_TRANSITION_EFFECT_H