Peter M. Groen / dali-demo

Commit 5490c3d6bc14050ff0a4638867b8b6b9c5baa76f

Authored by seungho baek
1 parent 6d127d73

Fix scene3d examples 

Change-Id: I6e87d8f852b2d5f51a8a2434fc63d6122e035d31
Signed-off-by: seungho baek <sbsh.baek@samsung.com>
Inline Side-by-side
Showing 2 changed files with 6 additions and 3 deletions
examples/scene3d/scene3d-example.cpp
  View file @5490c3d
@@ -415,6 +415,8 @@ void Scene3DExample::OnKey(const KeyEvent&amp; e) @@ -415,6 +415,8 @@ void Scene3DExample::OnKey(const KeyEvent&amp; e)
415 { 415 {
416 KeyboardFocusManager::Get().SetCurrentFocusActor(mActivatedActor); 416 KeyboardFocusManager::Get().SetCurrentFocusActor(mActivatedActor);
417 } 417 }
  418 + auto window = mApp.GetWindow();
  419 + window.GetRootLayer().SetProperty(Layer::Property::BEHAVIOR, Layer::LAYER_UI);
418 } 420 }
419 else 421 else
420 { 422 {
@@ -452,7 +454,8 @@ void Scene3DExample::OnTap(Dali::Actor actor, const Dali::TapGesture&amp; tap) @@ -452,7 +454,8 @@ void Scene3DExample::OnTap(Dali::Actor actor, const Dali::TapGesture&amp; tap)
452 454
453 try 455 try
454 { 456 {
455 - auto window = mApp.GetWindow(); 457 + auto window = mApp.GetWindow();
  458 + window.GetRootLayer().SetProperty(Layer::Property::BEHAVIOR, Layer::LAYER_3D);
456 auto renderTasks = window.GetRenderTaskList(); 459 auto renderTasks = window.GetRenderTaskList();
457 renderTasks.RemoveTask(mSceneRender); 460 renderTasks.RemoveTask(mSceneRender);
458 461
resources/models/exercise_model.dli
  View file @5490c3d
@@ -1094,8 +1094,8 @@ @@ -1094,8 +1094,8 @@
1094 "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 ], 1094 "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 ],
1095 "uMaxLOD" : 6 1095 "uMaxLOD" : 6
1096 }, { 1096 }, {
1097 - "vertex" : "dli_images.vsh",  
1098 - "fragment" : "dli_images.fsh", 1097 + "vertex" : "../shaders/dli_images.vsh",
  1098 + "fragment" : "../shaders/dli_images.fsh",
1099 "rendererState" : "DEPTH_TEST|ALPHA_BLEND", 1099 "rendererState" : "DEPTH_TEST|ALPHA_BLEND",
1100 "uCubeMatrix" : [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ], 1100 "uCubeMatrix" : [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
1101 "uTilt" : [ 0.0, 0.0 ] 1101 "uTilt" : [ 0.0, 0.0 ]