Peter M. Groen / dali-demo

Commit a339fa363624a76307c323c454a249bdaab6c4b7

Authored by seungho baek
1 parent 67733d58

Fix to use AnimatedProperty for getActor instead of name 

Change-Id: I6c705a7cd55849a4dd7779a5edab0ea24812b10c
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
examples/scene3d/scene3d-example.cpp
  View file @a339fa3
@@ -237,8 +237,8 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector&lt;Animation @@ -237,8 +237,8 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector&lt;Animation
237 237
238 if(!animations->empty()) 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 animation = (*animations)[0].ReAnimate(getActor); 244 animation = (*animations)[0].ReAnimate(getActor);
examples/scene3d/scene3d-extension.h
  View file @a339fa3
@@ -94,8 +94,8 @@ private: @@ -94,8 +94,8 @@ private:
94 } 94 }
95 95
96 auto root = mSceneLoader->mScene; 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 if(mSceneLoader->mSceneAnimations.size() > animationIndex) 101 if(mSceneLoader->mSceneAnimations.size() > animationIndex)