Peter M. Groen / dali-demo

Commit 19a99ed6e6fbe43a5801b1eff1cab8f4b25d98cb

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 057c1730 a339fa36

Merge "Fix to use AnimatedProperty for getActor instead of name" into devel/master

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
examples/scene3d/scene3d-example.cpp
  View file @19a99ed
... ... @@ -237,8 +237,8 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
237 237  
238 238 if(!animations->empty())
239 239 {
240   - auto getActor = [&root](const std::string& name) {
241   - return root.FindChildByName(name);
  240 + auto getActor = [&root](const Scene3D::Loader::AnimatedProperty& property) {
  241 + return root.FindChildByName(property.mNodeName);
242 242 };
243 243  
244 244 animation = (*animations)[0].ReAnimate(getActor);
... ...
examples/scene3d/scene3d-extension.h
  View file @19a99ed
... ... @@ -94,8 +94,8 @@ private:
94 94 }
95 95  
96 96 auto root = mSceneLoader->mScene;
97   - auto getActor = [&root](const std::string& name) {
98   - return root.FindChildByName(name);
  97 + auto getActor = [&root](const Dali::Scene3D::Loader::AnimatedProperty& property) {
  98 + return root.FindChildByName(property.mNodeName);
99 99 };
100 100  
101 101 if(mSceneLoader->mSceneAnimations.size() > animationIndex)
... ...