Changes after TouchedSignal changes

[platform/core/uifw/dali-demo.git] / examples / rendering-triangle / rendering-triangle.cpp

diff --git a/examples/rendering-triangle/rendering-triangle.cpp b/examples/rendering-triangle/rendering-triangle.cpp
index 57233f8..9a2b022 100644 (file)
--- a/examples/rendering-triangle/rendering-triangle.cpp
+++ b/examples/rendering-triangle/rendering-triangle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,9 +75,9 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Get a handle to the stage
-    Stage stage = Stage::GetCurrent();
-    stage.SetBackgroundColor( Color::WHITE );
+    // Get a handle to the window
+    Window window = application.GetWindow();
+    window.SetBackgroundColor( Color::WHITE );
 
     // Step 1. Create shader
     CreateTriangleShader();
@@ -91,11 +91,14 @@ public:
     // Step 4. Create an Actor
     CreateActor();
 
-    // Respond to a click anywhere on the stage
-    stage.GetRootLayer().TouchSignal().Connect( this, &DrawTriangleController::OnTouch );
+    // Respond to a click anywhere on the window
+    window.GetRootLayer().TouchedSignal().Connect( this, &DrawTriangleController::OnTouch );
+
+    // Respond to key events
+    window.KeyEventSignal().Connect( this, &DrawTriangleController::OnKeyEvent );
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     // quit the application
     mApplication.Quit();
@@ -103,6 +106,23 @@ public:
   }
 
   /**
+   * @brief Called when any key event is received
+   *
+   * Will use this to quit the application if Back or the Escape key is received
+   * @param[in] event The key event information
+   */
+  void OnKeyEvent( const KeyEvent& event )
+  {
+    if( event.GetState() == KeyEvent::DOWN )
+    {
+      if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
+      {
+        mApplication.Quit();
+      }
+    }
+  }
+
+  /**
    * This function creates a triangle geometry made of three vertices in order
    * to draw a coloured triangle.
    */
@@ -114,8 +134,8 @@ public:
       Vector2( -1.0f,  1.0f )
     };
 
-    PropertyBuffer vertexBuffer = PropertyBuffer::New( Property::Map()
-                                                       .Add( "aPosition", Property::VECTOR2 ) );
+    VertexBuffer vertexBuffer = VertexBuffer::New( Property::Map()
+                                                   .Add( "aPosition", Property::VECTOR2 ) );
     vertexBuffer.SetData( vertices, sizeof(vertices) / sizeof(Vector2) );
 
     mGeometry = Geometry::New();
@@ -146,16 +166,16 @@ public:
    */
   void CreateActor()
   {
-    Stage stage = Stage::GetCurrent();
-    Size size = stage.GetSize() * 0.25f;
+    Window window = mApplication.GetWindow();
+    Size size = Vector2(window.GetSize()) * 0.25f;
     mActor = Actor::New();
-    mActor.SetAnchorPoint( AnchorPoint::CENTER );
-    mActor.SetParentOrigin( ParentOrigin::CENTER );
-    mActor.SetPosition( Vector3( 0.0f, 0.0f, 0.0f ) );
-    mActor.SetColor( Color::RED );
-    mActor.SetSize( Vector3( size.x, size.x, size.x ) );
+    mActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+    mActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    mActor.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ) );
+    mActor.SetProperty( Actor::Property::COLOR, Color::RED );
+    mActor.SetProperty( Actor::Property::SIZE, Vector3( size.x, size.x, size.x ) );
     mActor.AddRenderer( mRenderer );
-    stage.Add( mActor );
+    window.Add( mActor );
   }
 
 private:
@@ -167,20 +187,10 @@ private:
   Actor mActor;
 };
 
-void RunTest( Application& application )
-{
-  DrawTriangleController test( application );
-
-  application.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
+  DrawTriangleController test( application );
+  application.MainLoop();
   return 0;
 }