Revert "[Tizen] Ensure cached values of properties animated using AnimateTo are updated"

[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 92dff74..7239ed4 100644 (file)
--- a/dali/internal/event/animation/animation-impl.h
+++ b/dali/internal/event/animation/animation-impl.h
@@ -62,6 +62,8 @@ public:
   typedef Dali::Animation::EndAction EndAction;
   typedef Dali::Animation::Interpolation Interpolation;
 
+  typedef void (*FinishedCallback)(Object* object);
+
   /**
    * Create a new Animation object.
    * @param[in] durationSeconds The duration of the animation.
@@ -208,6 +210,13 @@ public:
   static bool DoAction(BaseObject* object, const std::string& actionName, const Property::Map& attributes);
 
   /**
+   * This callback is intended for internal use only, to avoid the overhead of using a signal.
+   * @param[in] callback The callback function to connect.
+   * @param[in] object The internal object requesting the callback, or NULL.
+   */
+  void SetFinishedCallback( FinishedCallback callback, Object* object );
+
+  /**
    * @copydoc Dali::Animation::AnimateBy(Property target, Property::Value relativeValue)
    */
   void AnimateBy(Property& target, Property::Value& relativeValue);
@@ -442,53 +451,37 @@ private:
 
   struct ConnectorTargetValues
   {
-    ConnectorTargetValues()
-    : targetValue(),
-      timePeriod( 0.0f ),
-      connectorIndex( 0 )
-    {
-    }
-
-    Property::Value targetValue;
-    TimePeriod timePeriod;
     unsigned int connectorIndex;
+    Property::Value targetValue;
   };
 
-private:
-
-  /**
-   * Compares the end times of the animators returning true if lhs end time is less than rhs end time.
-   * @param[in] lhs The first comparator
-   * @param[in] rhs The second comparator
-   * @return True if end time of lhs is less, false otherwise.
-   */
-  static bool CompareConnectorEndTimes( const ConnectorTargetValues& lhs, const ConnectorTargetValues& rhs );
-
-private:
+  EventThreadServices& mEventThreadServices;
+  AnimationPlaylist& mPlaylist;
 
   const SceneGraph::Animation* mAnimation;
 
-  EventThreadServices& mEventThreadServices;
-  AnimationPlaylist& mPlaylist;
+  int mNotificationCount; ///< Keep track of how many Finished signals have been emitted.
 
   Dali::Animation::AnimationSignalType mFinishedSignal;
 
-  AnimatorConnectorContainer mConnectors; ///< Owned by the Animation
+  FinishedCallback mFinishedCallback;
+  Object* mFinishedCallbackObject;
 
-  typedef std::vector< ConnectorTargetValues > ConnectorTargetValuesContainer;
-  ConnectorTargetValuesContainer mConnectorTargetValues; //< Used to store animating property target value information
+  AnimatorConnectorContainer mConnectors; ///< Owned by the Animation
 
-  Vector2 mPlayRange;
+  std::vector< ConnectorTargetValues > mConnectorActorTargetValues; //< Store Actor target values and matchinf connector index that need to set value on Animation::Play
 
+  // Cached for public getters
   float mDurationSeconds;
   float mSpeedFactor;
-  int mNotificationCount; ///< Keep track of how many Finished signals have been emitted.
   int mLoopCount;
   int mCurrentLoop;
+  Vector2 mPlayRange;
   EndAction mEndAction;
   EndAction mDisconnectAction;
   AlphaFunction mDefaultAlpha;
   Dali::Animation::State mState;
+
 };
 
 } // namespace Internal