Fix scene3d examples 91/286291/5
authorseungho baek <sbsh.baek@samsung.com>
Tue, 3 Jan 2023 06:40:01 +0000 (15:40 +0900)
committerseungho baek <sbsh.baek@samsung.com>
Tue, 3 Jan 2023 09:35:23 +0000 (18:35 +0900)
Change-Id: I6e87d8f852b2d5f51a8a2434fc63d6122e035d31
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
examples/scene3d/scene3d-example.cpp
resources/models/exercise_model.dli

index 45a6b4f62c4eace53da38d6fae92b7052b1084c7..13ea813eb307c50c7626d814c910e5b61ddbb3eb 100644 (file)
@@ -415,6 +415,8 @@ void Scene3DExample::OnKey(const KeyEvent& e)
         {\r
           KeyboardFocusManager::Get().SetCurrentFocusActor(mActivatedActor);\r
         }\r
+        auto window = mApp.GetWindow();\r
+        window.GetRootLayer().SetProperty(Layer::Property::BEHAVIOR, Layer::LAYER_UI);\r
       }\r
       else\r
       {\r
@@ -452,7 +454,8 @@ void Scene3DExample::OnTap(Dali::Actor actor, const Dali::TapGesture& tap)
 \r
   try\r
   {\r
-    auto window      = mApp.GetWindow();\r
+    auto window = mApp.GetWindow();\r
+    window.GetRootLayer().SetProperty(Layer::Property::BEHAVIOR, Layer::LAYER_3D);\r
     auto renderTasks = window.GetRenderTaskList();\r
     renderTasks.RemoveTask(mSceneRender);\r
 \r
index 718162f3601bfe211851f24c68e8390775c145ef..c20da2e93c7e07655387f3c3886ec62712e0e2fd 100644 (file)
         "uCubeMatrix" : [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ],
         "uMaxLOD" : 6
     }, {
-        "vertex" : "dli_images.vsh",
-        "fragment" : "dli_images.fsh",
+        "vertex" : "../shaders/dli_images.vsh",
+        "fragment" : "../shaders/dli_images.fsh",
         "rendererState" : "DEPTH_TEST|ALPHA_BLEND",
         "uCubeMatrix" : [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
         "uTilt" : [ 0.0, 0.0 ]