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
Revert "[Tizen] (Animation) Reorder animation variables according to size & remove...
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
animation
/
animation-impl.cpp
diff --git
a/dali/internal/event/animation/animation-impl.cpp
b/dali/internal/event/animation/animation-impl.cpp
index
0d70028
..
c27f31b
100644
(file)
--- a/
dali/internal/event/animation/animation-impl.cpp
+++ b/
dali/internal/event/animation/animation-impl.cpp
@@
-112,18
+112,17
@@
AnimationPtr Animation::New(float durationSeconds)
}
Animation::Animation( EventThreadServices& eventThreadServices, AnimationPlaylist& playlist, float durationSeconds, EndAction endAction, EndAction disconnectAction, AlphaFunction defaultAlpha )
}
Animation::Animation( EventThreadServices& eventThreadServices, AnimationPlaylist& playlist, float durationSeconds, EndAction endAction, EndAction disconnectAction, AlphaFunction defaultAlpha )
-: mAnimation( NULL ),
- mEventThreadServices( eventThreadServices ),
+: mEventThreadServices( eventThreadServices ),
mPlaylist( playlist ),
mPlaylist( playlist ),
- m
FinishedSignal(
),
- m
Connectors(
),
- m
ConnectorTargetValues(
),
- m
PlayRange( Vector2(0.0f,1.0f)
),
+ m
Animation( NULL
),
+ m
NotificationCount( 0
),
+ m
FinishedCallback( NULL
),
+ m
FinishedCallbackObject( NULL
),
mDurationSeconds( durationSeconds ),
mSpeedFactor(1.0f),
mDurationSeconds( durationSeconds ),
mSpeedFactor(1.0f),
- mNotificationCount( 0 ),
mLoopCount(1),
mCurrentLoop(0),
mLoopCount(1),
mCurrentLoop(0),
+ mPlayRange( Vector2(0.0f,1.0f)),
mEndAction( endAction ),
mDisconnectAction( disconnectAction ),
mDefaultAlpha( defaultAlpha ),
mEndAction( endAction ),
mDisconnectAction( disconnectAction ),
mDefaultAlpha( defaultAlpha ),
@@
-783,6
+782,12
@@
void Animation::EmitSignalFinish()
Dali::Animation handle( this );
mFinishedSignal.Emit( handle );
}
Dali::Animation handle( this );
mFinishedSignal.Emit( handle );
}
+
+ // This callback is used internally, to avoid the overhead of using a signal.
+ if ( mFinishedCallback )
+ {
+ mFinishedCallback( mFinishedCallbackObject );
+ }
}
bool Animation::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
}
bool Animation::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
@@
-803,6
+808,12
@@
bool Animation::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface*
return connected;
}
return connected;
}
+void Animation::SetFinishedCallback( FinishedCallback callback, Object* object )
+{
+ mFinishedCallback = callback;
+ mFinishedCallbackObject = object;
+}
+
void Animation::AddAnimatorConnector( AnimatorConnectorBase* connector )
{
DALI_ASSERT_DEBUG( NULL != connector );
void Animation::AddAnimatorConnector( AnimatorConnectorBase* connector )
{
DALI_ASSERT_DEBUG( NULL != connector );