projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
animation
/
animation-impl.h
diff --git
a/dali/internal/event/animation/animation-impl.h
b/dali/internal/event/animation/animation-impl.h
index
bf1e628
..
760ef02
100644
(file)
--- a/
dali/internal/event/animation/animation-impl.h
+++ b/
dali/internal/event/animation/animation-impl.h
@@
-23,6
+23,7
@@
#include <dali/public-api/object/ref-object.h>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/object/ref-object.h>
#include <dali/public-api/animation/animation.h>
#include <dali/public-api/object/base-object.h>
+#include <dali/devel-api/animation/animation-devel.h>
#include <dali/devel-api/common/owner-container.h>
#include <dali/internal/event/animation/key-frames-impl.h>
#include <dali/internal/event/common/event-thread-services.h>
#include <dali/devel-api/common/owner-container.h>
#include <dali/internal/event/animation/key-frames-impl.h>
#include <dali/internal/event/common/event-thread-services.h>
@@
-364,36
+365,46
@@
public:
*/
void Hide(Actor& actor, float delaySeconds);
*/
void Hide(Actor& actor, float delaySeconds);
- /*
+ /*
*
* @copydoc Dali::Animation::SetCurrentProgress()
*/
void SetCurrentProgress(float progress);
* @copydoc Dali::Animation::SetCurrentProgress()
*/
void SetCurrentProgress(float progress);
- /*
+ /*
*
* @copydoc Dali::Animation::GetCurrentProgress()
*/
float GetCurrentProgress();
* @copydoc Dali::Animation::GetCurrentProgress()
*/
float GetCurrentProgress();
- /*
+ /*
*
* @copydoc Dali::Animation::SetSpeedFactor()
*/
void SetSpeedFactor( float factor );
* @copydoc Dali::Animation::SetSpeedFactor()
*/
void SetSpeedFactor( float factor );
- /*
+ /*
*
* @copydoc Dali::Animation::GetSpeedFactor()
*/
float GetSpeedFactor() const;
* @copydoc Dali::Animation::GetSpeedFactor()
*/
float GetSpeedFactor() const;
- /*
+ /*
*
* @copydoc Dali::Animation::SetPlayRange()
*/
void SetPlayRange( const Vector2& range );
* @copydoc Dali::Animation::SetPlayRange()
*/
void SetPlayRange( const Vector2& range );
- /*
- * @copydoc Dali::Animation::GetPlayRange
+ /*
*
+ * @copydoc Dali::Animation::GetPlayRange
()
*/
Vector2 GetPlayRange() const;
*/
Vector2 GetPlayRange() const;
+ /**
+ * @copydoc Dali::Animation::SetLoopingMode()
+ */
+ void SetLoopingMode( Dali::DevelAnimation::LoopingMode loopingMode );
+
+ /**
+ * @copydoc Dali::Animation::GetLoopingMode()
+ */
+ Dali::DevelAnimation::LoopingMode GetLoopingMode();
+
public: // For connecting animators to animations
/**
public: // For connecting animators to animations
/**
@@
-540,6
+551,7
@@
private:
Dali::Animation::State mState;
float mProgressReachedMarker;
float mDelaySeconds;
Dali::Animation::State mState;
float mProgressReachedMarker;
float mDelaySeconds;
+ bool mAutoReverseEnabled; ///< Flag to identify that the looping mode is auto reverse.
};
} // namespace Internal
};
} // namespace Internal