X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Frendering-line%2Frendering-line.cpp;h=892504754f8db62754d48679fee96e44d53a1940;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hp=67e51985d3febf79aab4f1eaa5030300213cf2b0;hpb=cc86309efaef5f77c85ece1199f95e08534e4a32;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/examples/rendering-line/rendering-line.cpp b/examples/rendering-line/rendering-line.cpp
index 67e5198..8925047 100644
--- a/examples/rendering-line/rendering-line.cpp
+++ b/examples/rendering-line/rendering-line.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.
@@ -15,14 +15,15 @@
  *
  */
 
-#include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali/dali.h>
 
 using namespace Dali;
 using namespace Toolkit;
 
 namespace
 {
+// clang-format off
 
 /*
  * Vertex shader
@@ -51,20 +52,20 @@ void main()\n
   gl_FragColor = uColor;\n
 }\n
 );
+// clang-format on
 
-}
+} // namespace
 
 // This example shows how to draw a line in actor's color
 //
 class DrawLineController : public ConnectionTracker
 {
 public:
-
-  DrawLineController( Application& application )
-  : mApplication( application )
+  DrawLineController(Application& application)
+  : mApplication(application)
   {
     // Connect to the Application's Init signal
-    mApplication.InitSignal().Connect( this, &DrawLineController::Create );
+    mApplication.InitSignal().Connect(this, &DrawLineController::Create);
   }
 
   ~DrawLineController()
@@ -73,11 +74,11 @@ public:
   }
 
   // The Init signal is received once (only) during the Application lifetime
-  void Create( Application& application )
+  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
     CreateLineShader();
@@ -91,14 +92,14 @@ public:
     // Step 4. Create an Actor
     CreateActor();
 
-    // Respond to a click anywhere on the stage
-    stage.GetRootLayer().TouchSignal().Connect( this, &DrawLineController::OnTouch );
+    // Respond to a click anywhere on the window
+    window.GetRootLayer().TouchedSignal().Connect(this, &DrawLineController::OnTouch);
 
     // Respond to key events
-    stage.KeyEventSignal().Connect( this, &DrawLineController::OnKeyEvent );
+    window.KeyEventSignal().Connect(this, &DrawLineController::OnKeyEvent);
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch(Actor actor, const TouchEvent& touch)
   {
     // quit the application
     mApplication.Quit();
@@ -111,11 +112,11 @@ public:
    * 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 )
+  void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.state == KeyEvent::Down )
+    if(event.GetState() == KeyEvent::DOWN)
     {
-      if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
+      if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK))
       {
         mApplication.Quit();
       }
@@ -129,17 +130,16 @@ public:
   void CreateLineGeometry()
   {
     Vector2 vertices[] = {
-      Vector2( -1.0f, -1.0f ),
-      Vector2(  1.0f,  1.0f )
-    };
+      Vector2(-1.0f, -1.0f),
+      Vector2(1.0f, 1.0f)};
 
-    PropertyBuffer vertexBuffer = PropertyBuffer::New( Property::Map()
-                                                       .Add( "aPosition", Property::VECTOR2 ) );
-    vertexBuffer.SetData( vertices, sizeof(vertices) / sizeof(Vector2) );
+    VertexBuffer vertexBuffer = VertexBuffer::New(Property::Map()
+                                                    .Add("aPosition", Property::VECTOR2));
+    vertexBuffer.SetData(vertices, sizeof(vertices) / sizeof(Vector2));
 
     mGeometry = Geometry::New();
-    mGeometry.AddVertexBuffer( vertexBuffer );
-    mGeometry.SetType( Geometry::LINES );
+    mGeometry.AddVertexBuffer(vertexBuffer);
+    mGeometry.SetType(Geometry::LINES);
   }
 
   /**
@@ -149,7 +149,7 @@ public:
    */
   void CreateLineShader()
   {
-    mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
+    mShader = Shader::New(VERTEX_SHADER, FRAGMENT_SHADER);
   }
 
   /**
@@ -157,7 +157,7 @@ public:
    */
   void CreateRenderer()
   {
-    mRenderer = Renderer::New( mGeometry, mShader );
+    mRenderer = Renderer::New(mGeometry, mShader);
   }
 
   /**
@@ -165,31 +165,31 @@ public:
    */
   void CreateActor()
   {
-    Stage stage = Stage::GetCurrent();
-    Size size = stage.GetSize() * 0.25f;
-    mActor = Actor::New();
-    mActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-    mActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    mActor.SetPosition( Vector3( 0.0f, 0.0f, 0.0f ) );
-    mActor.SetProperty( Actor::Property::COLOR, Color::BLACK );
-    mActor.SetSize( Vector3( size.x, size.x, size.x ) );
-    mActor.AddRenderer( mRenderer );
-    stage.Add( mActor );
+    Window window = mApplication.GetWindow();
+    Size   size   = Vector2(window.GetSize()) * 0.25f;
+    mActor        = Actor::New();
+    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::BLACK);
+    mActor.SetProperty(Actor::Property::SIZE, Vector3(size.x, size.x, size.x));
+    mActor.AddRenderer(mRenderer);
+    window.Add(mActor);
   }
 
 private:
-  Application&  mApplication;
+  Application& mApplication;
 
   Renderer mRenderer;
-  Shader mShader;
+  Shader   mShader;
   Geometry mGeometry;
-  Actor mActor;
+  Actor    mActor;
 };
 
-int DALI_EXPORT_API main( int argc, char **argv )
+int DALI_EXPORT_API main(int argc, char** argv)
 {
-  Application application = Application::New( &argc, &argv );
-  DrawLineController test( application );
+  Application        application = Application::New(&argc, &argv);
+  DrawLineController test(application);
   application.MainLoop();
   return 0;
 }