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
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
8eb5257
..
fa28101
100644
(file)
--- a/
dali/internal/event/animation/animation-impl.h
+++ b/
dali/internal/event/animation/animation-impl.h
@@
-2,7
+2,7
@@
#define __DALI_INTERNAL_ANIMATION_H__
/*
#define __DALI_INTERNAL_ANIMATION_H__
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-43,7
+43,6
@@
class Actor;
class Animation;
class AnimationPlaylist;
class Object;
class Animation;
class AnimationPlaylist;
class Object;
-class ShaderEffect;
typedef IntrusivePtr<Animation> AnimationPtr;
typedef std::vector<AnimationPtr> AnimationContainer;
typedef IntrusivePtr<Animation> AnimationPtr;
typedef std::vector<AnimationPtr> AnimationContainer;
@@
-449,6
+448,13
@@
private:
Animation& operator=(const Animation& rhs);
private:
Animation& operator=(const Animation& rhs);
private:
+
+ struct ConnectorTargetValues
+ {
+ unsigned int connectorIndex;
+ Property::Value targetValue;
+ };
+
EventThreadServices& mEventThreadServices;
AnimationPlaylist& mPlaylist;
EventThreadServices& mEventThreadServices;
AnimationPlaylist& mPlaylist;
@@
-463,6
+469,8
@@
private:
AnimatorConnectorContainer mConnectors; ///< Owned by the Animation
AnimatorConnectorContainer mConnectors; ///< Owned by the Animation
+ std::vector< ConnectorTargetValues > mConnectorTargetValues; //< Used to store animating property target value information
+
// Cached for public getters
float mDurationSeconds;
float mSpeedFactor;
// Cached for public getters
float mDurationSeconds;
float mSpeedFactor;