X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fanimated-shapes%2Fanimated-shapes-example.cpp;h=204fcef3248d30e86955fb9d99dec866a3412e16;hb=38b87ec05860401c3dcbf20d047aa0b55ea5841a;hp=dd79982a9abef5f2b2dc238b450eb5a08b391f61;hpb=40844807e7258f1e5d9ef1a3650f438c8777409c;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp
index dd79982..204fcef 100644
--- a/examples/animated-shapes/animated-shapes-example.cpp
+++ b/examples/animated-shapes/animated-shapes-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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,8 +15,10 @@
  *
  */
 
-#include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali/dali.h>
+#include "generated/animated-shapes-frag.h"
+#include "generated/animated-shapes-vert.h"
 #include "shared/view.h"
 
 #include <sstream>
@@ -26,55 +28,25 @@ using namespace Dali::Toolkit;
 
 namespace
 {
-
 const char* APPLICATION_TITLE("Animated Shapes");
 
-const char* VERTEX_SHADER = DALI_COMPOSE_SHADER
-(
-  attribute mediump vec3 aCoefficient;
-  uniform mediump mat4 uMvpMatrix;
-  uniform mediump vec3 uPosition[MAX_POINT_COUNT];
-  varying lowp vec2 vCoefficient;
-  void main()
-  {
-    int vertexId = int(aCoefficient.z);
-    gl_Position = uMvpMatrix * vec4(uPosition[vertexId], 1.0);
-
-    vCoefficient = aCoefficient.xy;
-  }
-);
-
-// Fragment shader.
-const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER
-(
-  uniform lowp vec4 uColor;
-  varying lowp vec2 vCoefficient;
-  void main()
-  {
-    lowp float C = (vCoefficient.x*vCoefficient.x-vCoefficient.y);
-    lowp float Cdx = dFdx(C);
-    lowp float Cdy = dFdy(C);
-
-    lowp float distance = float(C / sqrt(Cdx*Cdx + Cdy*Cdy));
-    lowp float alpha = 0.5 - distance;
-    gl_FragColor = vec4( uColor.rgb, uColor.a * alpha );
-  }
-);
-
-Shader CreateShader( unsigned int pointCount )
+Shader CreateShader(unsigned int pointCount)
 {
   std::ostringstream vertexShader;
-  vertexShader << "#define MAX_POINT_COUNT "<< pointCount << "\n"<<VERTEX_SHADER;
+  vertexShader << "#define MAX_POINT_COUNT " << pointCount << "\n"
+               << SHADER_ANIMATED_SHAPES_VERT;
 
   std::ostringstream fragmentShader;
-  fragmentShader << "#extension GL_OES_standard_derivatives : enable "<< "\n"<<FRAGMENT_SHADER;
+  fragmentShader << "#extension GL_OES_standard_derivatives : enable "
+                 << "\n"
+                 << SHADER_ANIMATED_SHAPES_FRAG;
 
-  Shader shader = Shader::New( vertexShader.str(), fragmentShader.str() );
-  for( unsigned int i(0); i<pointCount; ++i )
+  Shader shader = Shader::New(vertexShader.str(), fragmentShader.str());
+  for(unsigned int i(0); i < pointCount; ++i)
   {
     std::ostringstream propertyName;
-    propertyName << "uPosition["<<i<<"]";
-    shader.RegisterProperty(propertyName.str(),Vector3(0.0f,0.0f,0.0f) );
+    propertyName << "uPosition[" << i << "]";
+    shader.RegisterProperty(propertyName.str(), Vector3(0.0f, 0.0f, 0.0f));
   }
 
   return shader;
@@ -87,360 +59,353 @@ Shader CreateShader( unsigned int pointCount )
 class AnimatedShapesExample : public ConnectionTracker
 {
 public:
-
-  AnimatedShapesExample( Application& application )
-: mApplication( application )
-{
-    // Connect to the Application's Init signal
-    mApplication.InitSignal().Connect( this, &AnimatedShapesExample::Create );
-}
-
-  ~AnimatedShapesExample()
+  AnimatedShapesExample(Application& application)
+  : mApplication(application)
   {
-    // Nothing to do here;
+    // Connect to the Application's Init signal
+    mApplication.InitSignal().Connect(this, &AnimatedShapesExample::Create);
   }
 
+  ~AnimatedShapesExample() = default;
+
   // The Init signal is received once (only) during the Application lifetime
-  void Create( Application& application )
+  void Create(Application& application)
   {
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
-
-    Stage stage = Stage::GetCurrent();
+    Window        window     = application.GetWindow();
+    const Vector2 windowSize = window.GetSize();
 
     // Creates the background gradient
-    Toolkit::Control background = Dali::Toolkit::Control::New();
-    background.SetAnchorPoint( Dali::AnchorPoint::CENTER );
-    background.SetParentOrigin( Dali::ParentOrigin::CENTER );
-    background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS );
+    Toolkit::Control background                = Dali::Toolkit::Control::New();
+    background[Actor::Property::ANCHOR_POINT]  = Dali::AnchorPoint::CENTER;
+    background[Actor::Property::PARENT_ORIGIN] = Dali::ParentOrigin::CENTER;
+    background.SetResizePolicy(Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS);
+
     Dali::Property::Map map;
-    map.Insert( Visual::Property::TYPE,  Visual::GRADIENT );
+    map.Insert(Toolkit::Visual::Property::TYPE, Visual::GRADIENT);
     Property::Array stopOffsets;
-    stopOffsets.PushBack( 0.0f );
-    stopOffsets.PushBack( 1.0f );
-    map.Insert( GradientVisual::Property::STOP_OFFSET, stopOffsets );
+    stopOffsets.PushBack(0.0f);
+    stopOffsets.PushBack(1.0f);
+    map.Insert(GradientVisual::Property::STOP_OFFSET, stopOffsets);
     Property::Array stopColors;
-    stopColors.PushBack( Vector4( 0.0f,0.0f,1.0f,1.0f ) );
-    stopColors.PushBack( Vector4( 1.0f,1.0f,1.0f,1.0f ) );
-    map.Insert( GradientVisual::Property::STOP_COLOR, stopColors );
-    Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f;
-    map.Insert( GradientVisual::Property::START_POSITION,  Vector2(0.0f,-halfStageSize.y) );
-    map.Insert( GradientVisual::Property::END_POSITION,  Vector2(0.0f,halfStageSize.y)  );
-    map.Insert( GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE );
-    background.SetProperty( Dali::Toolkit::Control::Property::BACKGROUND, map );
-    stage.Add( background );
+    stopColors.PushBack(Vector4(0.0f, 0.0f, 1.0f, 1.0f));
+    stopColors.PushBack(Vector4(1.0f, 1.0f, 1.0f, 1.0f));
+    map.Insert(GradientVisual::Property::STOP_COLOR, stopColors);
+    Vector2 halfWindowSize = windowSize * 0.5f;
+    map.Insert(GradientVisual::Property::START_POSITION, Vector2(0.0f, -halfWindowSize.y));
+    map.Insert(GradientVisual::Property::END_POSITION, Vector2(0.0f, halfWindowSize.y));
+    map.Insert(GradientVisual::Property::UNITS, GradientVisual::Units::USER_SPACE);
+    background[Dali::Toolkit::Control::Property::BACKGROUND] = map;
+    window.Add(background);
 
     // Create a TextLabel for the application title.
-    Toolkit::TextLabel label = Toolkit::TextLabel::New( APPLICATION_TITLE );
-    label.SetAnchorPoint( AnchorPoint::TOP_CENTER );
-    label.SetParentOrigin( Vector3( 0.5f, 0.0f, 0.5f ) );
-    label.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
-    label.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
-    label.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) );
-    stage.Add( label );
-
-    CreateTriangleMorph(Vector3( stage.GetSize().x*0.5f, stage.GetSize().y*0.15f, 0.0f), 100.0f );
-    CreateCircleMorph( Vector3( stage.GetSize().x*0.5f, stage.GetSize().y*0.5f, 0.0f), 55.0f );
-    CreateQuadMorph( Vector3( stage.GetSize().x*0.5f, stage.GetSize().y*0.85f, 0.0f), 60.0f );
-
-    stage.KeyEventSignal().Connect( this, &AnimatedShapesExample::OnKeyEvent );
+    Toolkit::TextLabel label                                  = Toolkit::TextLabel::New(APPLICATION_TITLE);
+    label[Actor::Property::ANCHOR_POINT]                      = AnchorPoint::TOP_CENTER;
+    label[Actor::Property::PARENT_ORIGIN]                     = Vector3(0.5f, 0.0f, 0.5f);
+    label[Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT] = "CENTER";
+    label[Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT]   = "CENTER";
+    label[Toolkit::TextLabel::Property::TEXT_COLOR]           = Color::WHITE;
+    window.Add(label);
+
+    CreateTriangleMorph(Vector3(windowSize.x * 0.5f, windowSize.y * 0.15f, 0.0f), 100.0f);
+    CreateCircleMorph(Vector3(windowSize.x * 0.5f, windowSize.y * 0.5f, 0.0f), 55.0f);
+    CreateQuadMorph(Vector3(windowSize.x * 0.5f, windowSize.y * 0.85f, 0.0f), 60.0f);
+
+    window.KeyEventSignal().Connect(this, &AnimatedShapesExample::OnKeyEvent);
   }
 
-  void CreateTriangleMorph( Vector3 center, float side )
+  void CreateTriangleMorph(Vector3 center, float side)
   {
-    float h = ( side *0.5f ) / 0.866f;
-
-    Vector3 v0 = Vector3( -h, h, 0.0f );
-    Vector3 v1 = Vector3( 0.0f, -side * 0.366f, 0.0f );
-    Vector3 v2 = Vector3( h, h, 0.0f );
+    float h = (side * 0.5f) / 0.866f;
 
-    Vector3 v3 = v0 + ( ( v1 - v0 ) * 0.5f );
-    Vector3 v4 = v1 + ( ( v2 - v1 ) * 0.5f );
-    Vector3 v5 = v2 + ( ( v0 - v2 ) * 0.5f );
+    Vector3 v0 = Vector3(-h, h, 0.0f);
+    Vector3 v1 = Vector3(0.0f, -side * 0.366f, 0.0f);
+    Vector3 v2 = Vector3(h, h, 0.0f);
 
-    Shader shader = CreateShader( 12 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[0]"), v0 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[1]"), v3 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[2]"), v1 );
+    Vector3 v3 = v0 + ((v1 - v0) * 0.5f);
+    Vector3 v4 = v1 + ((v2 - v1) * 0.5f);
+    Vector3 v5 = v2 + ((v0 - v2) * 0.5f);
 
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[3]"), v1 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[4]"), v4 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[5]"), v2 );
+    Shader shader          = CreateShader(12);
+    shader["uPosition[0]"] = v0;
+    shader["uPosition[1]"] = v3;
+    shader["uPosition[2]"] = v1;
 
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[6]"), v2 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[7]"), v5 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[8]"), v0 );
+    shader["uPosition[3]"] = v1;
+    shader["uPosition[4]"] = v4;
+    shader["uPosition[5]"] = v2;
 
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[9]"),  v0 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[10]"), v1 );
-    shader.SetProperty( shader.GetPropertyIndex( "uPosition[11]"), v2 );
+    shader["uPosition[6]"] = v2;
+    shader["uPosition[7]"] = v5;
+    shader["uPosition[8]"] = v0;
 
+    shader["uPosition[9]"]  = v0;
+    shader["uPosition[10]"] = v1;
+    shader["uPosition[11]"] = v2;
 
     //Create geometry
-    static const Vector3 vertexData[] = { Dali::Vector3( 0.0f, 0.0f, 0.0f ),
-                                          Dali::Vector3( 0.5f, 0.0f, 1.0f ),
-                                          Dali::Vector3( 1.0f, 1.0f, 2.0f ),
+    static const Vector3 vertexData[] = {Dali::Vector3(0.0f, 0.0f, 0.0f),
+                                         Dali::Vector3(0.5f, 0.0f, 1.0f),
+                                         Dali::Vector3(1.0f, 1.0f, 2.0f),
 
-                                          Dali::Vector3( 0.0f, 0.0f, 3.0f ),
-                                          Dali::Vector3( 0.5f, 0.0f, 4.0f ),
-                                          Dali::Vector3( 1.0f, 1.0f, 5.0f ),
+                                         Dali::Vector3(0.0f, 0.0f, 3.0f),
+                                         Dali::Vector3(0.5f, 0.0f, 4.0f),
+                                         Dali::Vector3(1.0f, 1.0f, 5.0f),
 
-                                          Dali::Vector3( 0.0f, 0.0f, 6.0f ),
-                                          Dali::Vector3( 0.5f, 0.0f, 7.0f ),
-                                          Dali::Vector3( 1.0f, 1.0f, 8.0f ),
+                                         Dali::Vector3(0.0f, 0.0f, 6.0f),
+                                         Dali::Vector3(0.5f, 0.0f, 7.0f),
+                                         Dali::Vector3(1.0f, 1.0f, 8.0f),
 
-                                          Dali::Vector3( 0.0f, 1.0f, 9.0f ),
-                                          Dali::Vector3( 0.0f, 1.0f, 10.0f ),
-                                          Dali::Vector3( 0.0f, 1.0f, 11.0f )
-    };
+                                         Dali::Vector3(0.0f, 1.0f, 9.0f),
+                                         Dali::Vector3(0.0f, 1.0f, 10.0f),
+                                         Dali::Vector3(0.0f, 1.0f, 11.0f)};
 
-    unsigned short indexData[] = { 0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10 };
+    unsigned short indexData[] = {0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10};
 
     //Create a vertex buffer for vertex positions and texture coordinates
     Dali::Property::Map vertexFormat;
-    vertexFormat["aCoefficient"] = Dali::Property::VECTOR3;
-    Dali::PropertyBuffer vertexBuffer = Dali::PropertyBuffer::New( vertexFormat );
-    vertexBuffer.SetData( vertexData, sizeof(vertexData)/sizeof(vertexData[0]));
+    vertexFormat["aCoefficient"]    = Dali::Property::VECTOR3;
+    Dali::VertexBuffer vertexBuffer = Dali::VertexBuffer::New(vertexFormat);
+    vertexBuffer.SetData(vertexData, sizeof(vertexData) / sizeof(vertexData[0]));
 
     //Create the geometry
     Dali::Geometry geometry = Dali::Geometry::New();
-    geometry.AddVertexBuffer( vertexBuffer );
-    geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
+    geometry.AddVertexBuffer(vertexBuffer);
+    geometry.SetIndexBuffer(indexData, sizeof(indexData) / sizeof(indexData[0]));
 
-    Renderer renderer = Renderer::New( geometry, shader );
-    renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+    Renderer renderer                        = Renderer::New(geometry, shader);
+    renderer[Renderer::Property::BLEND_MODE] = BlendMode::ON;
 
-    Actor actor = Actor::New();
-    actor.SetSize( 400.0f, 400.0f );
-    actor.SetPosition( center );
-    actor.SetAnchorPoint( AnchorPoint::CENTER );
-    actor.SetColor(Vector4(1.0f,1.0f,0.0f,1.0f) );
-    actor.AddRenderer( renderer );
+    Actor actor                          = Actor::New();
+    actor[Actor::Property::SIZE]         = Vector2(400.0f, 400.0f);
+    actor[Actor::Property::POSITION]     = center;
+    actor[Actor::Property::ANCHOR_POINT] = AnchorPoint::CENTER;
+    actor[Actor::Property::COLOR]        = Color::YELLOW;
+    actor.AddRenderer(renderer);
 
-    Stage stage = Stage::GetCurrent();
-    stage.Add( actor );
+    Window window = mApplication.GetWindow();
+    window.Add(actor);
 
     //Animation
     Animation animation = Animation::New(5.0f);
-    KeyFrames k0 = KeyFrames::New();
-    k0.Add( 0.0f,v3  );
-    k0.Add( 0.5f, v3 + Vector3(-150.0f,-150.0f,0.0f));
-    k0.Add( 1.0f, v3 );
-    animation.AnimateBetween( Property(shader, "uPosition[1]"),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    KeyFrames k0        = KeyFrames::New();
+    k0.Add(0.0f, v3);
+    k0.Add(0.5f, v3 + Vector3(-150.0f, -150.0f, 0.0f));
+    k0.Add(1.0f, v3);
+    animation.AnimateBetween(Property(shader, "uPosition[1]"), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
     k0 = KeyFrames::New();
-    k0.Add( 0.0f,v4  );
-    k0.Add( 0.5f, v4 + Vector3(150.0f,-150.0f,0.0f));
-    k0.Add( 1.0f, v4 );
-    animation.AnimateBetween( Property(shader,"uPosition[4]"),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    k0.Add(0.0f, v4);
+    k0.Add(0.5f, v4 + Vector3(150.0f, -150.0f, 0.0f));
+    k0.Add(1.0f, v4);
+    animation.AnimateBetween(Property(shader, "uPosition[4]"), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
     k0 = KeyFrames::New();
-    k0.Add( 0.0f,v5  );
-    k0.Add( 0.5f, v5 + Vector3(0.0,150.0f,0.0f));
-    k0.Add( 1.0f, v5 );
-    animation.AnimateBetween( Property(shader, "uPosition[7]"),k0, AlphaFunction::EASE_IN_OUT_SINE );
-    animation.SetLooping( true );
+    k0.Add(0.0f, v5);
+    k0.Add(0.5f, v5 + Vector3(0.0, 150.0f, 0.0f));
+    k0.Add(1.0f, v5);
+    animation.AnimateBetween(Property(shader, "uPosition[7]"), k0, AlphaFunction::EASE_IN_OUT_SINE);
+    animation.SetLooping(true);
     animation.Play();
   }
 
-  void CreateCircleMorph( Vector3 center, float radius )
+  void CreateCircleMorph(Vector3 center, float radius)
   {
-    Shader shader = CreateShader( 16 );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[0]"), Vector3( -radius, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[1]"), Vector3( 0.0f, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[2]"), Vector3( radius, -radius, 0.0f ) );
-
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[3]"), Vector3( radius, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[4]"), Vector3( radius, 0.0f, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[5]"), Vector3( radius, radius, 0.0f ) );
-
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[6]"), Vector3( radius, radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[7]"), Vector3( 0.0f, radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[8]"), Vector3( -radius, radius, 0.0f ) );
-
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[9]"),  Vector3( -radius, radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[10]"), Vector3( -radius, 0.0f, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[11]"), Vector3( -radius, -radius, 0.0f ) );
-
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[12]"), Vector3( -radius, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[13]"),  Vector3( radius, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[14]"), Vector3( radius, radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[15]"), Vector3( -radius, radius, 0.0f ) );
-
-    //shader.SetProperty( shader.GetPropertyIndex("uLineWidth"), 2.0f );
-
-    static const Vector3 vertexData[] = { Vector3( 0.0f, 0.0f, 0.0f ),
-                                          Vector3( 0.5f, 0.0f, 1.0f ),
-                                          Vector3( 1.0f, 1.0f, 2.0f ),
-                                          Vector3( 0.0f, 0.0f, 3.0f ),
-                                          Vector3( 0.5f, 0.0f, 4.0f ),
-                                          Vector3( 1.0f, 1.0f, 5.0f ),
-                                          Vector3( 0.0f, 0.0f, 6.0f ),
-                                          Vector3( 0.5f, 0.0f, 7.0f ),
-                                          Vector3( 1.0f, 1.0f, 8.0f ),
-                                          Vector3( 0.0f, 0.0f, 9.0f ),
-                                          Vector3( 0.5f, 0.0f, 10.0f ),
-                                          Vector3( 1.0f, 1.0f, 11.0f ),
-                                          Vector3( 0.0f, 1.0f, 12.0f ),
-                                          Vector3( 0.0f, 1.0f, 13.0f ),
-                                          Vector3( 0.0f, 1.0f, 14.0f ),
-                                          Vector3( 0.0f, 1.0f, 15.0f )};
-
-    short unsigned int indexData[] = { 0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10, 12, 13, 14, 12, 14, 15 };
+    Shader shader          = CreateShader(16);
+    shader["uPosition[0]"] = Vector3(-radius, -radius, 0.0f);
+    shader["uPosition[1]"] = Vector3(0.0f, -radius, 0.0f);
+    shader["uPosition[2]"] = Vector3(radius, -radius, 0.0f);
+
+    shader["uPosition[3]"] = Vector3(radius, -radius, 0.0f);
+    shader["uPosition[4]"] = Vector3(radius, 0.0f, 0.0f);
+    shader["uPosition[5]"] = Vector3(radius, radius, 0.0f);
+
+    shader["uPosition[6]"] = Vector3(radius, radius, 0.0f);
+    shader["uPosition[7]"] = Vector3(0.0f, radius, 0.0f);
+    shader["uPosition[8]"] = Vector3(-radius, radius, 0.0f);
+
+    shader["uPosition[9]"]  = Vector3(-radius, radius, 0.0f);
+    shader["uPosition[10]"] = Vector3(-radius, 0.0f, 0.0f);
+    shader["uPosition[11]"] = Vector3(-radius, -radius, 0.0f);
+
+    shader["uPosition[12]"] = Vector3(-radius, -radius, 0.0f);
+    shader["uPosition[13]"] = Vector3(radius, -radius, 0.0f);
+    shader["uPosition[14]"] = Vector3(radius, radius, 0.0f);
+    shader["uPosition[15]"] = Vector3(-radius, radius, 0.0f);
+
+    //shader["uLineWidth"), 2.0] ;
+
+    static const Vector3 vertexData[] = {Vector3(0.0f, 0.0f, 0.0f),
+                                         Vector3(0.5f, 0.0f, 1.0f),
+                                         Vector3(1.0f, 1.0f, 2.0f),
+                                         Vector3(0.0f, 0.0f, 3.0f),
+                                         Vector3(0.5f, 0.0f, 4.0f),
+                                         Vector3(1.0f, 1.0f, 5.0f),
+                                         Vector3(0.0f, 0.0f, 6.0f),
+                                         Vector3(0.5f, 0.0f, 7.0f),
+                                         Vector3(1.0f, 1.0f, 8.0f),
+                                         Vector3(0.0f, 0.0f, 9.0f),
+                                         Vector3(0.5f, 0.0f, 10.0f),
+                                         Vector3(1.0f, 1.0f, 11.0f),
+                                         Vector3(0.0f, 1.0f, 12.0f),
+                                         Vector3(0.0f, 1.0f, 13.0f),
+                                         Vector3(0.0f, 1.0f, 14.0f),
+                                         Vector3(0.0f, 1.0f, 15.0f)};
+
+    short unsigned int indexData[] = {0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10, 12, 13, 14, 12, 14, 15};
 
     //Create a vertex buffer for vertex positions and texture coordinates
     Dali::Property::Map vertexFormat;
-    vertexFormat["aCoefficient"] = Dali::Property::VECTOR3;
-    Dali::PropertyBuffer vertexBuffer = Dali::PropertyBuffer::New( vertexFormat );
-    vertexBuffer.SetData( vertexData, sizeof(vertexData)/sizeof(vertexData[0]));
+    vertexFormat["aCoefficient"]    = Dali::Property::VECTOR3;
+    Dali::VertexBuffer vertexBuffer = Dali::VertexBuffer::New(vertexFormat);
+    vertexBuffer.SetData(vertexData, sizeof(vertexData) / sizeof(vertexData[0]));
 
     //Create the geometry
     Dali::Geometry geometry = Dali::Geometry::New();
-    geometry.AddVertexBuffer( vertexBuffer );
-    geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
+    geometry.AddVertexBuffer(vertexBuffer);
+    geometry.SetIndexBuffer(indexData, sizeof(indexData) / sizeof(indexData[0]));
 
-    Renderer renderer = Renderer::New( geometry, shader );
-    renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+    Renderer renderer                        = Renderer::New(geometry, shader);
+    renderer[Renderer::Property::BLEND_MODE] = BlendMode::ON;
 
-    Actor actor = Actor::New();
-    actor.SetSize( 400.0f, 400.0f );
-    actor.SetPosition( center );
-    actor.SetAnchorPoint( AnchorPoint::CENTER );
-    actor.AddRenderer( renderer );
+    Actor actor                          = Actor::New();
+    actor[Actor::Property::SIZE]         = Vector2(400.0f, 400.0f);
+    actor[Actor::Property::POSITION]     = center;
+    actor[Actor::Property::ANCHOR_POINT] = AnchorPoint::CENTER;
+    actor.AddRenderer(renderer);
 
-    Stage stage = Stage::GetCurrent();
-    stage.Add( actor );
+    Window window = mApplication.GetWindow();
+    window.Add(actor);
 
     //Animation
     Animation animation = Animation::New(5.0f);
-    KeyFrames k0 = KeyFrames::New();
-    k0.Add( 0.0f, Vector3( 0.0f,-radius*1.85, 0.0f ) );
-    k0.Add( 0.5f, Vector3( -radius*1.85, -radius*3.0f, 0.0f ) );
-    k0.Add( 1.0f, Vector3( 0.0f,-radius*1.85, 0.0f ) );
-    animation.AnimateBetween( Property( shader, shader.GetPropertyIndex("uPosition[1]") ),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    KeyFrames k0        = KeyFrames::New();
+    k0.Add(0.0f, Vector3(0.0f, -radius * 1.85, 0.0f));
+    k0.Add(0.5f, Vector3(-radius * 1.85, -radius * 3.0f, 0.0f));
+    k0.Add(1.0f, Vector3(0.0f, -radius * 1.85, 0.0f));
+    animation.AnimateBetween(Property(shader, shader.GetPropertyIndex("uPosition[1]")), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
     k0 = KeyFrames::New();
-    k0.Add( 0.0f, Vector3( radius*1.85, 0.0f, 0.0f ) );
-    k0.Add( 0.5f, Vector3( radius*3.0f,-radius*1.85, 0.0f ) );
-    k0.Add( 1.0f, Vector3( radius*1.85,0.0f, 0.0f ) );
-    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[4]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    k0.Add(0.0f, Vector3(radius * 1.85, 0.0f, 0.0f));
+    k0.Add(0.5f, Vector3(radius * 3.0f, -radius * 1.85, 0.0f));
+    k0.Add(1.0f, Vector3(radius * 1.85, 0.0f, 0.0f));
+    animation.AnimateBetween(Property(shader, shader.GetPropertyIndex("uPosition[4]")), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
     k0 = KeyFrames::New();
-    k0.Add( 0.0f, Vector3( 0.0f, radius*1.85, 0.0f ) );
-    k0.Add( 0.5f, Vector3( radius*1.85, radius*3.0f, 0.0f) );
-    k0.Add( 1.0f, Vector3( 0.0f, radius*1.85, 0.0f) );
-    animation.AnimateBetween( Property( shader, shader.GetPropertyIndex("uPosition[7]") ),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    k0.Add(0.0f, Vector3(0.0f, radius * 1.85, 0.0f));
+    k0.Add(0.5f, Vector3(radius * 1.85, radius * 3.0f, 0.0f));
+    k0.Add(1.0f, Vector3(0.0f, radius * 1.85, 0.0f));
+    animation.AnimateBetween(Property(shader, shader.GetPropertyIndex("uPosition[7]")), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
     k0 = KeyFrames::New();
-    k0.Add( 0.0f, Vector3( -radius*1.85, 0.0f, 0.0f) );
-    k0.Add( 0.5f, Vector3(-radius*3.0f, radius*1.85, 0.0f) );
-    k0.Add( 1.0f, Vector3( -radius*1.85, 0.0f, 0.0f) );
-    animation.AnimateBetween( Property( shader, shader.GetPropertyIndex("uPosition[10]") ),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    k0.Add(0.0f, Vector3(-radius * 1.85, 0.0f, 0.0f));
+    k0.Add(0.5f, Vector3(-radius * 3.0f, radius * 1.85, 0.0f));
+    k0.Add(1.0f, Vector3(-radius * 1.85, 0.0f, 0.0f));
+    animation.AnimateBetween(Property(shader, shader.GetPropertyIndex("uPosition[10]")), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
-    animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(-90.0f) ), Vector3::ZAXIS ) );
-    animation.SetLooping( true );
+    animation.AnimateBy(Property(actor, Actor::Property::ORIENTATION), Quaternion(Radian(Degree(-90.0f)), Vector3::ZAXIS));
+    animation.SetLooping(true);
     animation.Play();
   }
 
-  void CreateQuadMorph( Vector3 center, float radius )
+  void CreateQuadMorph(Vector3 center, float radius)
   {
-    Shader shader = CreateShader( 16 );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[0]"), Vector3( -radius, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[1]"), Vector3( 0.0f, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[2]"), Vector3( radius, -radius, 0.0f ) );
+    Shader shader          = CreateShader(16);
+    shader["uPosition[0]"] = Vector3(-radius, -radius, 0.0f);
+    shader["uPosition[1]"] = Vector3(0.0f, -radius, 0.0f);
+    shader["uPosition[2]"] = Vector3(radius, -radius, 0.0f);
 
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[3]"), Vector3( radius, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[4]"), Vector3( radius, 0.0f, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[5]"), Vector3( radius, radius, 0.0f ) );
+    shader["uPosition[3]"] = Vector3(radius, -radius, 0.0f);
+    shader["uPosition[4]"] = Vector3(radius, 0.0f, 0.0f);
+    shader["uPosition[5]"] = Vector3(radius, radius, 0.0f);
 
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[6]"), Vector3( radius, radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[7]"), Vector3( 0.0f, radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[8]"), Vector3( -radius, radius, 0.0f ) );
+    shader["uPosition[6]"] = Vector3(radius, radius, 0.0f);
+    shader["uPosition[7]"] = Vector3(0.0f, radius, 0.0f);
+    shader["uPosition[8]"] = Vector3(-radius, radius, 0.0f);
 
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[9]"), Vector3( -radius, radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[10]"), Vector3( -radius, 0.0f, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[11]"), Vector3( -radius, -radius, 0.0f ) );
+    shader["uPosition[9]"]  = Vector3(-radius, radius, 0.0f);
+    shader["uPosition[10]"] = Vector3(-radius, 0.0f, 0.0f);
+    shader["uPosition[11]"] = Vector3(-radius, -radius, 0.0f);
 
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[12]"), Vector3( -radius, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[13]"), Vector3( radius, -radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[14]"), Vector3( radius, radius, 0.0f ) );
-    shader.SetProperty( shader.GetPropertyIndex("uPosition[15]"), Vector3( -radius, radius, 0.0f ) );
+    shader["uPosition[12]"] = Vector3(-radius, -radius, 0.0f);
+    shader["uPosition[13]"] = Vector3(radius, -radius, 0.0f);
+    shader["uPosition[14]"] = Vector3(radius, radius, 0.0f);
+    shader["uPosition[15]"] = Vector3(-radius, radius, 0.0f);
 
-    static const Vector3 vertexData[] = { Dali::Vector3( 0.0f, 0.0f, 0.0f ),
-                                          Dali::Vector3( 0.5f, 0.0f, 1.0f ),
-                                          Dali::Vector3( 1.0f, 1.0f, 2.0f ),
+    static const Vector3 vertexData[] = {Dali::Vector3(0.0f, 0.0f, 0.0f),
+                                         Dali::Vector3(0.5f, 0.0f, 1.0f),
+                                         Dali::Vector3(1.0f, 1.0f, 2.0f),
 
-                                          Dali::Vector3( 0.0f, 0.0f, 3.0f ),
-                                          Dali::Vector3( 0.5f, 0.0f, 4.0f ),
-                                          Dali::Vector3( 1.0f, 1.0f, 5.0f ),
+                                         Dali::Vector3(0.0f, 0.0f, 3.0f),
+                                         Dali::Vector3(0.5f, 0.0f, 4.0f),
+                                         Dali::Vector3(1.0f, 1.0f, 5.0f),
 
-                                          Dali::Vector3( 0.0f, 0.0f, 6.0f ),
-                                          Dali::Vector3( 0.5f, 0.0f, 7.0f ),
-                                          Dali::Vector3( 1.0f, 1.0f, 8.0f ),
+                                         Dali::Vector3(0.0f, 0.0f, 6.0f),
+                                         Dali::Vector3(0.5f, 0.0f, 7.0f),
+                                         Dali::Vector3(1.0f, 1.0f, 8.0f),
 
-                                          Dali::Vector3( 0.0f, 0.0f, 9.0f ),
-                                          Dali::Vector3( 0.5f, 0.0f, 10.0f ),
-                                          Dali::Vector3( 1.0f, 1.0f, 11.0f ),
+                                         Dali::Vector3(0.0f, 0.0f, 9.0f),
+                                         Dali::Vector3(0.5f, 0.0f, 10.0f),
+                                         Dali::Vector3(1.0f, 1.0f, 11.0f),
 
-                                          Dali::Vector3( 0.0f, 1.0f, 12.0f ),
-                                          Dali::Vector3( 0.0f, 1.0f, 13.0f ),
-                                          Dali::Vector3( 0.0f, 1.0f, 14.0f ),
-                                          Dali::Vector3( 0.0f, 1.0f, 15.0f ) };
+                                         Dali::Vector3(0.0f, 1.0f, 12.0f),
+                                         Dali::Vector3(0.0f, 1.0f, 13.0f),
+                                         Dali::Vector3(0.0f, 1.0f, 14.0f),
+                                         Dali::Vector3(0.0f, 1.0f, 15.0f)};
 
-    short unsigned int indexData[] = { 0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10, 12, 15, 14, 12, 14, 13 };
+    short unsigned int indexData[] = {0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10, 12, 15, 14, 12, 14, 13};
 
     //Create a vertex buffer for vertex positions and texture coordinates
     Dali::Property::Map vertexFormat;
-    vertexFormat["aCoefficient"] = Dali::Property::VECTOR3;
-    Dali::PropertyBuffer vertexBuffer = Dali::PropertyBuffer::New( vertexFormat );
-    vertexBuffer.SetData( vertexData, sizeof(vertexData)/sizeof(vertexData[0]));
+    vertexFormat["aCoefficient"]    = Dali::Property::VECTOR3;
+    Dali::VertexBuffer vertexBuffer = Dali::VertexBuffer::New(vertexFormat);
+    vertexBuffer.SetData(vertexData, sizeof(vertexData) / sizeof(vertexData[0]));
 
     //Create the geometry
     Dali::Geometry geometry = Dali::Geometry::New();
-    geometry.AddVertexBuffer( vertexBuffer );
-    geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
+    geometry.AddVertexBuffer(vertexBuffer);
+    geometry.SetIndexBuffer(indexData, sizeof(indexData) / sizeof(indexData[0]));
 
-    Renderer renderer = Renderer::New( geometry, shader );
-    renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+    Renderer renderer                        = Renderer::New(geometry, shader);
+    renderer[Renderer::Property::BLEND_MODE] = BlendMode::ON;
 
-    Actor actor = Actor::New();
-    actor.SetSize( 400.0f, 400.0f );
-    actor.SetPosition( center );
-    actor.SetAnchorPoint( AnchorPoint::CENTER );
-    actor.SetColor(Vector4(1.0f,0.0f,0.0f,1.0f) );
-    actor.AddRenderer( renderer );
+    Actor actor                          = Actor::New();
+    actor[Actor::Property::SIZE]         = Vector2(400.0f, 400.0f);
+    actor[Actor::Property::POSITION]     = center;
+    actor[Actor::Property::ANCHOR_POINT] = AnchorPoint::CENTER;
+    actor[Actor::Property::COLOR]        = Color::RED;
+    actor.AddRenderer(renderer);
 
-    Stage stage = Stage::GetCurrent();
-    stage.Add( actor );
+    Window window = mApplication.GetWindow();
+    window.Add(actor);
 
     //Animation
-    Animation animation = Animation::New( 5.0f );
-    KeyFrames k0 = KeyFrames::New();
-    k0.Add( 0.0f, Vector3( 0.0f, -radius, 0.0f ) );
-    k0.Add( 0.5f, Vector3( 0.0f, -radius*4.0f, 0.0f ) );
-    k0.Add( 1.0f, Vector3( 0.0f, -radius, 0.0f ) );
-    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[1]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    Animation animation = Animation::New(5.0f);
+    KeyFrames k0        = KeyFrames::New();
+    k0.Add(0.0f, Vector3(0.0f, -radius, 0.0f));
+    k0.Add(0.5f, Vector3(0.0f, -radius * 4.0f, 0.0f));
+    k0.Add(1.0f, Vector3(0.0f, -radius, 0.0f));
+    animation.AnimateBetween(Property(shader, shader.GetPropertyIndex("uPosition[1]")), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
     k0 = KeyFrames::New();
-    k0.Add( 0.0f, Vector3( radius, 0.0f, 0.0f ) );
-    k0.Add( 0.5f, Vector3( radius*4.0f, 0.0f, 0.0f ) );
-    k0.Add( 1.0f, Vector3( radius, 0.0f, 0.0f ) );
-    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[4]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    k0.Add(0.0f, Vector3(radius, 0.0f, 0.0f));
+    k0.Add(0.5f, Vector3(radius * 4.0f, 0.0f, 0.0f));
+    k0.Add(1.0f, Vector3(radius, 0.0f, 0.0f));
+    animation.AnimateBetween(Property(shader, shader.GetPropertyIndex("uPosition[4]")), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
     k0 = KeyFrames::New();
-    k0.Add( 0.0f, Vector3( 0.0f, radius, 0.0f ) );
-    k0.Add( 0.5f, Vector3( 0.0f, radius*4.0f, 0.0f ) );
-    k0.Add( 1.0f, Vector3( 0.0f, radius, 0.0f ) );
-    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[7]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    k0.Add(0.0f, Vector3(0.0f, radius, 0.0f));
+    k0.Add(0.5f, Vector3(0.0f, radius * 4.0f, 0.0f));
+    k0.Add(1.0f, Vector3(0.0f, radius, 0.0f));
+    animation.AnimateBetween(Property(shader, shader.GetPropertyIndex("uPosition[7]")), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
     k0 = KeyFrames::New();
-    k0.Add( 0.0f, Vector3( -radius, 0.0f, 0.0f ) );
-    k0.Add( 0.5f, Vector3( -radius*4.0f,0.0f, 0.0f ) );
-    k0.Add( 1.0f, Vector3( -radius,  0.0f, 0.0f ) );
-    animation.AnimateBetween( Property(shader, shader.GetPropertyIndex("uPosition[10]")),k0, AlphaFunction::EASE_IN_OUT_SINE );
+    k0.Add(0.0f, Vector3(-radius, 0.0f, 0.0f));
+    k0.Add(0.5f, Vector3(-radius * 4.0f, 0.0f, 0.0f));
+    k0.Add(1.0f, Vector3(-radius, 0.0f, 0.0f));
+    animation.AnimateBetween(Property(shader, shader.GetPropertyIndex("uPosition[10]")), k0, AlphaFunction::EASE_IN_OUT_SINE);
 
-    animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(90.0f) ), Vector3::ZAXIS ) );
-    animation.SetLooping( true );
+    animation.AnimateBy(Property(actor, Actor::Property::ORIENTATION), Quaternion(Radian(Degree(90.0f)), Vector3::ZAXIS));
+    animation.SetLooping(true);
     animation.Play();
   }
 
@@ -449,27 +414,20 @@ public:
    */
   void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.state == KeyEvent::Down && (IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ))  )
+    if(event.GetState() == KeyEvent::DOWN && (IsKey(event, DALI_KEY_ESCAPE) || IsKey(event, DALI_KEY_BACK)))
     {
       mApplication.Quit();
     }
   }
 
 private:
-  Application&                mApplication;
-
+  Application& mApplication;
 };
 
-void RunTest( Application& application )
+int DALI_EXPORT_API main(int argc, char** argv)
 {
-  AnimatedShapesExample test( application );
+  Application           application = Application::New(&argc, &argv);
+  AnimatedShapesExample test(application);
   application.MainLoop();
-}
-
-int main( int argc, char **argv )
-{
-  Application application = Application::New( &argc, &argv );
-  RunTest( application );
-
   return 0;
 }