projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Updated Model3dView control to use SetTexture" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
transition-effects
/
cube-transition-effect.h
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
9c30573
..
198d352
100644
(file)
--- a/
dali-toolkit/devel-api/transition-effects/cube-transition-effect.h
+++ b/
dali-toolkit/devel-api/transition-effects/cube-transition-effect.h
@@
-21,6
+21,9
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
+// EXTERNAL INCLUDES
+#include <dali/devel-api/rendering/texture.h>
+
namespace Dali
{
namespace Dali
{
@@
-135,17
+138,17
@@
public:
bool IsTransitioning();
/**
bool IsTransitioning();
/**
- * Set the current
imag
e to transition from
+ * Set the current
textur
e to transition from
* if using this same effect continually, only need to set once
* if using this same effect continually, only need to set once
- * @param[in]
image The current imag
e
+ * @param[in]
texture The current textur
e
*/
*/
- void SetCurrent
Image(Image image
);
+ void SetCurrent
Texture( Texture texture
);
/**
/**
- * Set the target
imag
e to transit to
- * @param[in]
image The new Imag
e showing on stage
+ * Set the target
textur
e to transit to
+ * @param[in]
texture The new Textur
e showing on stage
*/
*/
- void SetTarget
Image(Image image
);
+ void SetTarget
Texture( Texture texture
);
/**
* Activate the transition animation with horizontally left/right panGesture
/**
* Activate the transition animation with horizontally left/right panGesture
@@
-184,13
+187,13
@@
public:
public: //Signal
//Transition animation completed signal
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
/**
* Signal emitted when the transition has completed animation
* A callback of the following type may be connected
* @code
- * void YourCallbackName( CubeTransitionEffect cubeEffect,
ImageActor currentImag
e );
+ * void YourCallbackName( CubeTransitionEffect cubeEffect,
Texture currentTextur
e );
* @endcode
* @return The Signal to connect to.
*/
* @endcode
* @return The Signal to connect to.
*/