projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow duplicated name and use Actor ID as a unique key to define animation.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-scene3d
/
utc-Dali-AnimationDefinition.cpp
diff --git
a/automated-tests/src/dali-scene3d/utc-Dali-AnimationDefinition.cpp
b/automated-tests/src/dali-scene3d/utc-Dali-AnimationDefinition.cpp
index
5cde1b9
..
99b0aaf
100644
(file)
--- a/
automated-tests/src/dali-scene3d/utc-Dali-AnimationDefinition.cpp
+++ b/
automated-tests/src/dali-scene3d/utc-Dali-AnimationDefinition.cpp
@@
-44,8
+44,8
@@
int UtcDaliAnimationDefinitionReAnimate(void)
auto actor = Actor::New();
actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
auto actor = Actor::New();
actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
- auto getActor = [&actor](const
std::string& name
) {
- return actor.FindChildByName(
n
ame);
+ auto getActor = [&actor](const
Dali::Scene3D::Loader::AnimatedProperty& property
) {
+ return actor.FindChildByName(
property.mNodeN
ame);
};
for (bool b: { false, true })
};
for (bool b: { false, true })
@@
-57,6
+57,7
@@
int UtcDaliAnimationDefinitionReAnimate(void)
animDef.mEndAction = Animation::BAKE_FINAL;
animDef.mSpeedFactor = .7f;
animDef.mProperties.push_back(AnimatedProperty{
animDef.mEndAction = Animation::BAKE_FINAL;
animDef.mSpeedFactor = .7f;
animDef.mProperties.push_back(AnimatedProperty{
+ INVALID_INDEX,
"ChristopherPlummer",
"position",
KeyFrames(),
"ChristopherPlummer",
"position",
KeyFrames(),
@@
-84,8
+85,8
@@
int UtcDaliAnimationDefinitionReAnimateKeyFrames(void)
auto actor = Actor::New();
actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
auto actor = Actor::New();
actor.SetProperty(Actor::Property::NAME, "ChristopherPlummer");
- auto getActor = [&actor](const
std::string& name
) {
- return actor.FindChildByName(
n
ame);
+ auto getActor = [&actor](const
Dali::Scene3D::Loader::AnimatedProperty& property
) {
+ return actor.FindChildByName(
property.mNodeN
ame);
};
KeyFrames kf = KeyFrames::New();
};
KeyFrames kf = KeyFrames::New();
@@
-99,6
+100,7
@@
int UtcDaliAnimationDefinitionReAnimateKeyFrames(void)
animDef.mEndAction = Animation::BAKE_FINAL;
animDef.mSpeedFactor = .7f;
animDef.mProperties.push_back(AnimatedProperty{
animDef.mEndAction = Animation::BAKE_FINAL;
animDef.mSpeedFactor = .7f;
animDef.mProperties.push_back(AnimatedProperty{
+ INVALID_INDEX,
"ChristopherPlummer",
"position",
kf,
"ChristopherPlummer",
"position",
kf,