-#ifndef __DALI_INTERNAL_ANIMATION_H__
-#define __DALI_INTERNAL_ANIMATION_H__
+#ifndef DALI_INTERNAL_ANIMATION_H
+#define DALI_INTERNAL_ANIMATION_H
/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
/**
* @copydoc Dali::Animation::SetLoopCount()
*/
- void SetLoopCount(int count);
+ void SetLoopCount(int32_t count);
/**
* @copydoc Dali::Animation::GetLoopCount()
*/
- int GetLoopCount();
+ int32_t GetLoopCount();
/**
* @copydoc Dali::Animation::GetCurrentLoop()
*/
- int GetCurrentLoop();
+ int32_t GetCurrentLoop();
/**
* @copydoc Dali::Animation::IsLooping()
void AnimateTo(Property& target, Property::Value& destinationValue, AlphaFunction alpha, TimePeriod period);
/**
- * Animate a property to a destination value.
- * @param [in] targetObject The target object to animate.
- * @param [in] targetPropertyIndex The index of the target property.
- * @param [in] componentIndex Index to a sub component of a property, for use with Vector2, Vector3 and Vector4
- * @param [in] destinationValue The destination value.
- * @param [in] alpha The alpha function to apply.
- * @param [in] period The effect will occur during this time period.
- */
- void AnimateTo(Object& targetObject, Property::Index targetPropertyIndex, int componentIndex, Property::Value& destinationValue, AlphaFunction alpha, TimePeriod period);
-
- /**
* @copydoc Dali::Animation::AnimateBetween(Property target, KeyFrames& keyFrames)
*/
void AnimateBetween(Property target, const KeyFrames& keyFrames);
/**
* @copydoc Dali::Animation::SetLoopingMode()
*/
- void SetLoopingMode( Dali::DevelAnimation::LoopingMode loopingMode );
+ void SetLoopingMode( Dali::Animation::LoopingMode loopingMode );
/**
* @copydoc Dali::Animation::GetLoopingMode()
*/
- Dali::DevelAnimation::LoopingMode GetLoopingMode();
+ Dali::Animation::LoopingMode GetLoopingMode() const;
public: // For connecting animators to animations
Property::Value targetValue;
TimePeriod timePeriod;
- unsigned int connectorIndex;
+ std::size_t connectorIndex;
Animation::Type animatorType;
};
+ enum class Notify
+ {
+ USE_CURRENT_VALUE, ///< Set the current value for the property
+ USE_TARGET_VALUE, ///< Set the animator's target value for the property
+ FORCE_CURRENT_VALUE, ///< Set the current value for the property even if the end action is to discard
+ };
+
private:
/**
/**
* Notifies all the objects whose properties are being animated.
+ * @param[in] notifyValueType Whether we should set the current or target value
*/
- void NotifyObjects();
+ void NotifyObjects( Notify notifyValueType );
/**
* Sends message to SceneGraph with final progress value
float mDurationSeconds;
float mSpeedFactor;
- int mNotificationCount; ///< Keep track of how many Finished signals have been emitted.
- int mLoopCount;
- int mCurrentLoop;
+ int32_t mNotificationCount; ///< Keep track of how many Finished signals have been emitted.
+ int32_t mLoopCount;
+ int32_t mCurrentLoop;
EndAction mEndAction;
EndAction mDisconnectAction;
AlphaFunction mDefaultAlpha;
} // namespace Dali
-#endif // __DALI_INTERNAL_ANIMATION_H__
+#endif // DALI_INTERNAL_ANIMATION_H