[Tizen] Change to use AnimatedProperty instead of name for getActor

Change-Id: If7d5a3354b8f75525cde3d84fa0b5cdbabe6ea95
Signed-off-by: seungho baek <sbsh.baek@samsung.com>

diff --git a/examples/scene3d-model/scene3d-model-example.cpp b/examples/scene3d-model/scene3d-model-example.cpp
index 1ae62e4e4ce5bf228884375a25b41fe344cd6845..bf86b1814e73d68f00aebc07c74442cef52887be 100644 (file)
--- a/examples/scene3d-model/scene3d-model-example.cpp
+++ b/examples/scene3d-model/scene3d-model-example.cpp
@@ -216,6 +216,8 @@ public:
   {
     mWindow = application.GetWindow();
 
+    mWindow.GetRootLayer().SetProperty(Dali::Layer::Property::BEHAVIOR, Dali::Layer::Behavior::LAYER_3D);
+
     // Get a handle to the mWindow
     mWindow.SetBackgroundColor(Color::WHITE);
 
@@ -283,11 +285,16 @@ public:
     mModel.SetImageBasedLightSource(uri_diffuse_texture, uri_specular_texture, 0.6f);
 
     mWindow.Add(mModel);
+
+    mModel.ResourceReadySignal().Connect(this, &Scene3DModelExample::ResourceReadySignal);
+  }
+
+  void ResourceReadySignal(Control control)
+  {
     if(mModel.GetAnimationCount() > 0)
     {
-      Animation animation = (index == 0u) ? mModel.GetAnimation(0u) : mModel.GetAnimation("idleToSquatClip_0");
-      animation.Play();
-      animation.SetLoopCount(0);
+      mModel.GetAnimation(0u).Play();
+      mModel.GetAnimation(0u).SetLoopCount(0);
     }
   }
 

diff --git a/examples/scene3d/scene3d-example.cpp b/examples/scene3d/scene3d-example.cpp
index 2c634c8856751efa896eb50caa95795f226f9531..fa5ff00e6254ad63331c4e3f3ffdb1d5f45398b0 100644 (file)
--- a/examples/scene3d/scene3d-example.cpp
+++ b/examples/scene3d/scene3d-example.cpp
@@ -269,8 +269,8 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
 \r
   if(!animations->empty())\r
   {\r
-    auto getActor = [&root](const std::string& name) {\r
-      return root.FindChildByName(name);\r
+    auto getActor = [&root](const Scene3D::Loader::AnimatedProperty& property) {\r
+      return root.FindChildByName(property.mNodeName);\r
     };\r
 \r
     animation = (*animations)[0].ReAnimate(getActor);\r

diff --git a/examples/scene3d/scene3d-extension.h b/examples/scene3d/scene3d-extension.h
index d4cc6ca5bd17c15a7750af371face29d7b3581f3..7317d32cbe7dac41b09393d240f6fd1980c156c1 100644 (file)
--- a/examples/scene3d/scene3d-extension.h
+++ b/examples/scene3d/scene3d-extension.h
@@ -94,8 +94,8 @@ private:
       }\r
 \r
       auto root     = mSceneLoader->mScene;\r
-      auto getActor = [&root](const std::string& name) {\r
-        return root.FindChildByName(name);\r
+      auto getActor = [&root](const Dali::Scene3D::Loader::AnimatedProperty& property) {\r
+        return root.FindChildByName(property.mNodeName);\r
       };\r
 \r
       if(mSceneLoader->mSceneAnimations.size() > animationIndex)\r