Merge "Ensure Scene3d-Light exit on Escape" into devel/master

David Steele · Gerrit Code Review
2 parents 62bea0fc 532c1258
Showing 2 changed files with 10 additions and 1 deletions
examples-reel/dali-examples-reel.cpp
examples/scene3d-light/scene3d-light-example.cpp
@@ -93,7 +93,6 @@ int DALI_EXPORT_API main(int argc, char** argv)
   demo.AddExample(Example("rendering-textured-cube.example", DALI_DEMO_STR_TITLE_RENDERING_TEXTURED_CUBE));
   demo.AddExample(Example("rendering-radial-progress.example", DALI_DEMO_STR_TITLE_RENDERING_RADIAL_PROGRESS));
   demo.AddExample(Example("ray-marching.example", DALI_DEMO_STR_TITLE_RENDERING_RAY_MARCHING));
-  demo.AddExample(Example("scene3d.example", DALI_DEMO_STR_TITLE_SCENE3D));
   demo.AddExample(Example("scene3d-light.example", DALI_DEMO_STR_TITLE_SCENE3D_LIGHT));
   demo.AddExample(Example("scene3d-model.example", DALI_DEMO_STR_TITLE_SCENE3D_MODEL));
   demo.AddExample(Example("scroll-view.example", DALI_DEMO_STR_TITLE_SCROLL_VIEW));
@@ -128,6 +128,12 @@ public:
  
     window.Add(sceneView);
  
+    auto text = TextLabel::New("Press keys 0-9 to change lighting");
+    text[Actor::Property::PARENT_ORIGIN]=ParentOrigin::BOTTOM_CENTER;
+    text[Actor::Property::ANCHOR_POINT]=AnchorPoint::BOTTOM_CENTER;
+    text[TextLabel::Property::TEXT_COLOR] = Color::BLACK;
+    window.Add(text);
+
     // Respond to a touch anywhere on the window
     window.GetRootLayer().TouchedSignal().Connect(this, &Scene3dLightController::OnTouch);
  
@@ -265,6 +271,10 @@ public:
         mAnimation.SetCurrentProgress(progress);
         mAnimation.Pause();
       }
+      else if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK))
+      {
+        mApplication.Quit();
+      }
     }
   }