From: Richard <r.huang@samsung.com>
Date: Thu, 24 Nov 2022 13:56:59 +0000 (+0000)
Subject: [Tizen] Update Scene3D demo after Scene3D Loader API change + Fix Layer behavior
X-Git-Tag: accepted/tizen/7.0/unified/20230213.171736^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f75a584949c964ca5c22364d8a071dd9efbfd10;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

[Tizen] Update Scene3D demo after Scene3D Loader API change + Fix Layer behavior

Change-Id: I5a08b9055621dfbdf339379d0ac9e236f3bf941b
---

diff --git a/examples/scene3d-model/scene3d-model-example.cpp b/examples/scene3d-model/scene3d-model-example.cpp
index bf86b18..e0535a6 100644
--- a/examples/scene3d-model/scene3d-model-example.cpp
+++ b/examples/scene3d-model/scene3d-model-example.cpp
@@ -215,6 +215,7 @@ public:
   void Create(Application& application)
   {
     mWindow = application.GetWindow();
+    mWindow.GetRootLayer().SetProperty(Layer::Property::BEHAVIOR, Layer::LAYER_3D);
 
     mWindow.GetRootLayer().SetProperty(Dali::Layer::Property::BEHAVIOR, Dali::Layer::Behavior::LAYER_3D);
 
diff --git a/examples/scene3d/scene3d-example.cpp b/examples/scene3d/scene3d-example.cpp
index fa5ff00..555143c 100644
--- a/examples/scene3d/scene3d-example.cpp
+++ b/examples/scene3d/scene3d-example.cpp
@@ -186,6 +186,7 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
 
   ResourceBundle                        resources;
   SceneDefinition                       scene;
+  SceneMetadata                         metaData;
   std::vector<AnimationGroupDefinition> animGroups;
   std::vector<CameraParameters>         cameraParameters;
   std::vector<LightParameters>          lights;
@@ -195,6 +196,7 @@ Actor LoadScene(std::string sceneName, CameraActor camera, std::vector<Animation
   LoadResult output{
     resources,
     scene,
+    metaData,
     *animations,
     animGroups,
     cameraParameters,
@@ -447,6 +449,8 @@ void Scene3DExample::OnKey(const KeyEvent& e)
         {
           KeyboardFocusManager::Get().SetCurrentFocusActor(mActivatedActor);
         }
+        auto window = mApp.GetWindow();
+        window.GetRootLayer().SetProperty(Layer::Property::BEHAVIOR, Layer::LAYER_UI);
       }
       else
       {
@@ -485,6 +489,7 @@ void Scene3DExample::OnTap(Dali::Actor actor, const Dali::TapGesture& tap)
   try
   {
     auto window      = mApp.GetWindow();
+    window.GetRootLayer().SetProperty(Layer::Property::BEHAVIOR, Layer::LAYER_3D);
     auto renderTasks = window.GetRenderTaskList();
     renderTasks.RemoveTask(mSceneRender);