Add BUILD_EXAMPLE_NAME option explain for README.md
[platform/core/uifw/dali-demo.git] / examples / perf-scroll / perf-scroll.cpp
index 0261ab3..9a9dadc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 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.
  *
  */
 
+// EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <iostream>
+
+// INTERNAL INCLUDES
+#include "generated/perf-scroll-frag.h"
+#include "generated/perf-scroll-vert.h"
 #include "shared/utility.h"
 
 using namespace Dali;
 using namespace Dali::Toolkit;
-
+using namespace std;
 
 namespace
 {
 const char* IMAGE_PATH[] = {
-                            DEMO_IMAGE_DIR "gallery-medium-1.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-2.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-3.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-4.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-5.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-6.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-7.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-8.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-9.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-10.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-11.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-12.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-13.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-14.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-15.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-16.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-17.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-18.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-19.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-20.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-21.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-22.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-23.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-24.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-25.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-26.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-27.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-28.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-29.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-30.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-31.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-32.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-33.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-34.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-35.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-36.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-37.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-38.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-39.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-40.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-41.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-42.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-43.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-44.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-45.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-46.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-47.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-48.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-49.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-50.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-51.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-52.jpg",
-                            DEMO_IMAGE_DIR "gallery-medium-53.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-1.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-2.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-3.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-4.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-5.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-6.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-7.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-8.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-9.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-10.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-11.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-12.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-13.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-14.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-15.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-16.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-17.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-18.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-19.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-20.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-21.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-22.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-23.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-24.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-25.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-26.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-27.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-28.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-29.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-30.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-31.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-32.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-33.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-34.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-35.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-36.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-37.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-38.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-39.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-40.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-41.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-42.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-43.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-44.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-45.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-46.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-47.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-48.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-49.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-50.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-51.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-52.jpg",
+  DEMO_IMAGE_DIR "gallery-medium-53.jpg",
 };
 
 const char* NINEPATCH_IMAGE_PATH[] = {
-                            DEMO_IMAGE_DIR "selection-popup-bg.1.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.2.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.3.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.4.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.5.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.6.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.7.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.8.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.9.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.10.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.11.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.12.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.13.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.14.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.15.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.16.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.17.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.18.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.19.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.20.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.21.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.22.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.23.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.24.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.25.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.26.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.27.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.28.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.29.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.30.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.31.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.32.9.png",
-                            DEMO_IMAGE_DIR "selection-popup-bg.33.9.png",
-                            DEMO_IMAGE_DIR "button-disabled.9.png",
-                            DEMO_IMAGE_DIR "button-down.9.png",
-                            DEMO_IMAGE_DIR "button-down-disabled.9.png",
-                            DEMO_IMAGE_DIR "button-up-1.9.png",
-                            DEMO_IMAGE_DIR "button-up-2.9.png",
-                            DEMO_IMAGE_DIR "button-up-3.9.png",
-                            DEMO_IMAGE_DIR "button-up-4.9.png",
-                            DEMO_IMAGE_DIR "button-up-5.9.png",
-                            DEMO_IMAGE_DIR "button-up-6.9.png",
-                            DEMO_IMAGE_DIR "button-up-7.9.png",
-                            DEMO_IMAGE_DIR "button-up-8.9.png",
-                            DEMO_IMAGE_DIR "button-up-9.9.png",
-                            DEMO_IMAGE_DIR "button-up-10.9.png",
-                            DEMO_IMAGE_DIR "button-up-11.9.png",
-                            DEMO_IMAGE_DIR "button-up-12.9.png",
-                            DEMO_IMAGE_DIR "button-up-13.9.png",
-                            DEMO_IMAGE_DIR "button-up-14.9.png",
-                            DEMO_IMAGE_DIR "button-up-15.9.png",
-                            DEMO_IMAGE_DIR "button-up-16.9.png",
-                            DEMO_IMAGE_DIR "button-up-17.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.1.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.2.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.3.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.4.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.5.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.6.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.7.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.8.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.9.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.10.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.11.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.12.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.13.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.14.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.15.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.16.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.17.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.18.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.19.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.20.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.21.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.22.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.23.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.24.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.25.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.26.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.27.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.28.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.29.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.30.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.31.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.32.9.png",
+  DEMO_IMAGE_DIR "selection-popup-bg.33.9.png",
+  DEMO_IMAGE_DIR "button-disabled.9.png",
+  DEMO_IMAGE_DIR "button-down.9.png",
+  DEMO_IMAGE_DIR "button-down-disabled.9.png",
+  DEMO_IMAGE_DIR "button-up-1.9.png",
+  DEMO_IMAGE_DIR "button-up-2.9.png",
+  DEMO_IMAGE_DIR "button-up-3.9.png",
+  DEMO_IMAGE_DIR "button-up-4.9.png",
+  DEMO_IMAGE_DIR "button-up-5.9.png",
+  DEMO_IMAGE_DIR "button-up-6.9.png",
+  DEMO_IMAGE_DIR "button-up-7.9.png",
+  DEMO_IMAGE_DIR "button-up-8.9.png",
+  DEMO_IMAGE_DIR "button-up-9.9.png",
+  DEMO_IMAGE_DIR "button-up-10.9.png",
+  DEMO_IMAGE_DIR "button-up-11.9.png",
+  DEMO_IMAGE_DIR "button-up-12.9.png",
+  DEMO_IMAGE_DIR "button-up-13.9.png",
+  DEMO_IMAGE_DIR "button-up-14.9.png",
+  DEMO_IMAGE_DIR "button-up-15.9.png",
+  DEMO_IMAGE_DIR "button-up-16.9.png",
+  DEMO_IMAGE_DIR "button-up-17.9.png",
 };
 
-const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*);
-const unsigned int NUM_NINEPATCH_IMAGES = sizeof(NINEPATCH_IMAGE_PATH) / sizeof(char*);
-
-const float ANIMATION_TIME ( 5.0f ); // animation length in seconds
+constexpr unsigned int NUM_IMAGES           = sizeof(IMAGE_PATH) / sizeof(char*);
+constexpr unsigned int NUM_NINEPATCH_IMAGES = sizeof(NINEPATCH_IMAGE_PATH) / sizeof(char*);
 
 struct VertexWithTexture
 {
@@ -148,108 +151,74 @@ struct VertexWithTexture
   Vector2 texCoord;
 };
 
-VertexWithTexture gQuadWithTexture[] = {
-                                        { Vector2( -0.5f, -0.5f ), Vector2( 0.0f, 0.0f ) },
-                                        { Vector2(  0.5f, -0.5f ), Vector2( 1.0f, 0.0f ) },
-                                        { Vector2( -0.5f,  0.5f ), Vector2( 0.0f, 1.0f ) },
-                                        { Vector2(  0.5f,  0.5f ), Vector2( 1.0f, 1.0f ) }
-};
+bool gUseMesh(false);
+bool gUseNinePatch(false);
 
-const char* VERTEX_SHADER_TEXTURE = DALI_COMPOSE_SHADER(
-    attribute mediump vec2 aPosition;\n
-    attribute mediump vec2 aTexCoord;\n
-    uniform mediump mat4 uMvpMatrix;\n
-    uniform mediump vec3 uSize;\n
-    varying mediump vec2 vTexCoord;\n
-    void main()\n
-    {\n
-      vec4 position = vec4(aPosition,0.0,1.0)*vec4(uSize,1.0);\n
-      gl_Position = uMvpMatrix * position;\n
-      vTexCoord = aTexCoord;\n
-    }\n
-);
-
-const char* FRAGMENT_SHADER_TEXTURE = DALI_COMPOSE_SHADER(
-    uniform lowp vec4 uColor;\n
-    uniform sampler2D sTexture;\n
-    varying mediump vec2 vTexCoord;\n
-
-    void main()\n
-    {\n
-      gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n
-    }\n
-);
+constexpr unsigned int ROWS_PER_PAGE(15);
+constexpr unsigned int COLUMNS_PER_PAGE(15);
+constexpr unsigned int PAGE_COUNT(10);
 
-bool gUseMesh(false);
-bool gNinePatch(false);
-unsigned int gRowsPerPage(15);
-unsigned int gColumnsPerPage(15);
-unsigned int gPageCount(10);
-float gDuration(10.0f);
+float gScrollDuration(10.0f); ///< Default animation duration for the scroll, is modifiable with the -t option
 
-Renderer CreateRenderer( unsigned int index, Geometry geometry, Shader shader )
+Renderer CreateRenderer(unsigned int index, Geometry geometry, Shader shader)
 {
-  Renderer renderer = Renderer::New( geometry, shader );
-  const char* imagePath = !gNinePatch ? IMAGE_PATH[index] : NINEPATCH_IMAGE_PATH[index];
-  Texture texture = DemoHelper::LoadTexture( imagePath );
-  TextureSet textureSet = TextureSet::New();
-  textureSet.SetTexture( 0u, texture );
-  renderer.SetTextures( textureSet );
-  renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF );
+  Renderer    renderer   = Renderer::New(geometry, shader);
+  const char* imagePath  = !gUseNinePatch ? IMAGE_PATH[index] : NINEPATCH_IMAGE_PATH[index];
+  Texture     texture    = DemoHelper::LoadTexture(imagePath);
+  TextureSet  textureSet = TextureSet::New();
+  textureSet.SetTexture(0u, texture);
+  renderer.SetTextures(textureSet);
+  renderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::OFF);
   return renderer;
 }
 
+} // namespace
 
-}
-// Test application to compare performance between ImageActor and ImageView
-// By default, the application consist of 10 pages of 25x25 ImageActors, this can be modified using the following command line arguments:
-// -t duration (sec )
-// --use-imageview ( Use ImageView instead of ImageActor )
-// --use-mesh ( Use new renderer API (as ImageView) but shares renderers between actors when possible )
-
-//
+/**
+ * Test application to compare performance between ImageView & manually created Renderers
+ * By default, the application consist of 10 pages of 15x15 Images, this can be modified using the following command line arguments:
+ *  -t[duration] (seconds)
+ *  --use-mesh (Use Renderer API)
+ *  --nine-patch (Use nine-patch images in ImageView)
+ */
 class PerfScroll : public ConnectionTracker
 {
 public:
-
-  PerfScroll( Application& application )
-  : mApplication( application ),
-  mRowsPerPage( gRowsPerPage ),
-  mColumnsPerPage( gColumnsPerPage ),
-  mPageCount( gPageCount )
+  PerfScroll(Application& application)
+  : mApplication(application),
+    mRowsPerPage(ROWS_PER_PAGE),
+    mColumnsPerPage(COLUMNS_PER_PAGE),
+    mPageCount(PAGE_COUNT)
   {
     // Connect to the Application's Init signal
-    mApplication.InitSignal().Connect( this, &PerfScroll::Create );
+    mApplication.InitSignal().Connect(this, &PerfScroll::Create);
   }
 
-  ~PerfScroll()
-  {
-    // Nothing to do here;
-  }
+  ~PerfScroll() = default;
 
   // The Init signal is received once (only) during the Application lifetime
-  void Create( Application& application )
+  void Create(Application& application)
   {
     // Get a handle to the window
     Window window = application.GetWindow();
-    window.SetBackgroundColor( Color::WHITE );
+    window.SetBackgroundColor(Color::WHITE);
     Vector2 windowSize = window.GetSize();
 
-    window.GetRootLayer().SetProperty( Layer::Property::DEPTH_TEST, false );
+    window.GetRootLayer().SetProperty(Layer::Property::DEPTH_TEST, false);
 
-    mSize = Vector3( windowSize.x / mColumnsPerPage, windowSize.y / mRowsPerPage, 0.0f );
+    mSize = Vector3(windowSize.x / mColumnsPerPage, windowSize.y / mRowsPerPage, 0.0f);
 
     // Respond to a click anywhere on the window
-    window.GetRootLayer().TouchSignal().Connect( this, &PerfScroll::OnTouch );
+    window.GetRootLayer().TouchedSignal().Connect(this, &PerfScroll::OnTouch);
 
     // Respond to key events
-    window.KeyEventSignal().Connect( this, &PerfScroll::OnKeyEvent );
+    window.KeyEventSignal().Connect(this, &PerfScroll::OnKeyEvent);
 
     mParent = Actor::New();
-    mParent.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+    mParent.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
     window.Add(mParent);
 
-    if( gUseMesh )
+    if(gUseMesh)
     {
       CreateMeshActors();
     }
@@ -258,196 +227,106 @@ public:
       CreateImageViews();
     }
 
-    ShowAnimation();
+    PositionActors();
+    ScrollAnimation();
   }
 
-  bool OnTouch( Actor actor, const TouchEvent& touch )
+  bool OnTouch(Actor actor, const TouchEvent& touch)
   {
     // quit the application
     mApplication.Quit();
     return true;
   }
 
-  const char* ImagePath( int i )
+  const char* ImagePath(int i)
   {
-    return !gNinePatch ? IMAGE_PATH[i % NUM_IMAGES] : NINEPATCH_IMAGE_PATH[i % NUM_NINEPATCH_IMAGES];
+    return !gUseNinePatch ? IMAGE_PATH[i % NUM_IMAGES] : NINEPATCH_IMAGE_PATH[i % NUM_NINEPATCH_IMAGES];
   }
 
   void CreateImageViews()
   {
-    Window window = mApplication.GetWindow();
-    unsigned int actorCount( mRowsPerPage*mColumnsPerPage * mPageCount );
-    mImageView.resize( actorCount );
+    Window       window = mApplication.GetWindow();
+    unsigned int actorCount(mRowsPerPage * mColumnsPerPage * mPageCount);
+    mActor.resize(actorCount);
 
-    for( size_t i(0); i<actorCount; ++i )
+    for(size_t i(0); i < actorCount; ++i)
     {
-      mImageView[i] = ImageView::New();
+      mActor[i] = ImageView::New();
       Property::Map propertyMap;
       propertyMap.Insert(Toolkit::ImageVisual::Property::URL, ImagePath(i));
       propertyMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
-      propertyMap.Insert(Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE, Toolkit::DevelVisual::FILL);
-      mImageView[i].SetProperty(Toolkit::ImageView::Property::IMAGE, propertyMap);
-
-      mImageView[i].SetProperty( Actor::Property::SIZE, Vector3(0.0f,0.0f,0.0f) );
-      mImageView[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
-      mParent.Add( mImageView[i] );
+      mActor[i].SetProperty(Toolkit::ImageView::Property::IMAGE, propertyMap);
+      mActor[i].SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
+      mParent.Add(mActor[i]);
     }
   }
 
   void CreateMeshActors()
   {
-    unsigned int numImages = !gNinePatch ? NUM_IMAGES : NUM_NINEPATCH_IMAGES;
+    unsigned int numImages = !gUseNinePatch ? NUM_IMAGES : NUM_NINEPATCH_IMAGES;
 
     //Create all the renderers
-    std::vector<Renderer> renderers( numImages );
-    Shader shader = Shader::New( VERTEX_SHADER_TEXTURE, FRAGMENT_SHADER_TEXTURE );
-    Geometry geometry = DemoHelper::CreateTexturedQuad();
-    for( unsigned int i(0); i<numImages; ++i )
+    std::vector<Renderer> renderers(numImages);
+    Shader                shader   = Shader::New(SHADER_PERF_SCROLL_VERT, SHADER_PERF_SCROLL_FRAG);
+    Geometry              geometry = DemoHelper::CreateTexturedQuad();
+    for(unsigned int i(0); i < numImages; ++i)
     {
-      renderers[i] = CreateRenderer( i, geometry, shader );
+      renderers[i] = CreateRenderer(i, geometry, shader);
     }
 
     //Create the actors
-    Window window = mApplication.GetWindow();
-    unsigned int actorCount(mRowsPerPage*mColumnsPerPage * mPageCount);
+    Window       window = mApplication.GetWindow();
+    unsigned int actorCount(mRowsPerPage * mColumnsPerPage * mPageCount);
     mActor.resize(actorCount);
-    for( size_t i(0); i<actorCount; ++i )
+    for(size_t i(0); i < actorCount; ++i)
     {
       mActor[i] = Actor::New();
-      mActor[i].AddRenderer( renderers[i % numImages] );
-      mActor[i].SetProperty( Actor::Property::SIZE, Vector3(0.0f,0.0f,0.0f) );
+      mActor[i].AddRenderer(renderers[i % numImages]);
       mParent.Add(mActor[i]);
     }
   }
 
-  void OnAnimationEnd( Animation& source )
-  {
-    if( source == mShow )
-    {
-      ScrollAnimation();
-    }
-    else if( source == mScroll )
-    {
-      HideAnimation();
-    }
-    else
-    {
-      mApplication.Quit();
-    }
-  }
-
-  void ShowAnimation()
+  void PositionActors()
   {
-    Window window = mApplication.GetWindow();
-    Vector3 initialPosition( window.GetSize().GetWidth() * 0.5f, window.GetSize().GetHeight() * 0.5f, 1000.0f );
+    Window  window = mApplication.GetWindow();
+    Vector3 initialPosition(window.GetSize().GetWidth() * 0.5f, window.GetSize().GetHeight() * 0.5f, 1000.0f);
 
     unsigned int totalColumns = mColumnsPerPage * mPageCount;
 
     size_t count(0);
-    float xpos, ypos;
-    mShow = Animation::New( 0.0f );
-
-    float totalDuration( 0.0f );
-    float durationPerActor( 0.0f );
-    float delayBetweenActors = ( totalDuration - durationPerActor ) / ( mRowsPerPage * mColumnsPerPage );
+    float  xpos, ypos;
 
-    for( size_t i(0); i<totalColumns; ++i )
+    for(size_t i(0); i < totalColumns; ++i)
     {
       xpos = mSize.x * i;
 
-      for( size_t j(0); j<mRowsPerPage; ++j )
+      for(size_t j(0); j < mRowsPerPage; ++j)
       {
-
         ypos = mSize.y * j;
-
-        float delay = 0.0f;
-        float duration = 0.0f;
-        if( count < ( static_cast< size_t >( mRowsPerPage ) * mColumnsPerPage ) )
-        {
-          duration = durationPerActor;
-          delay = delayBetweenActors * count;
-        }
-        if( gUseMesh )
-        {
-          mActor[count].SetProperty( Actor::Property::POSITION, initialPosition );
-          mActor[count].SetProperty( Actor::Property::SIZE, Vector3(0.0f,0.0f,0.0f) );
-          mActor[count].SetProperty( Actor::Property::ORIENTATION, Quaternion( Quaternion( Radian( 0.0f ), Vector3::XAXIS ) ) );
-          mShow.AnimateTo( Property( mActor[count], Actor::Property::POSITION ), Vector3( xpos+mSize.x*0.5f, ypos+mSize.y*0.5f, 0.0f), AlphaFunction::EASE_OUT_BACK, TimePeriod( delay, duration ) );
-          mShow.AnimateTo( Property( mActor[count], Actor::Property::SIZE ), mSize, AlphaFunction::EASE_OUT_BACK, TimePeriod( delay, duration ) );
-        }
-        else
-        {
-          mImageView[count].SetProperty( Actor::Property::POSITION, initialPosition );
-          mImageView[count].SetProperty( Actor::Property::SIZE, Vector3(0.0f,0.0f,0.0f) );
-          mImageView[count].SetProperty( Actor::Property::ORIENTATION, Quaternion( Quaternion( Radian(0.0f), Vector3::XAXIS ) ) );
-          mShow.AnimateTo( Property( mImageView[count], Actor::Property::POSITION ), Vector3( xpos+mSize.x*0.5f, ypos+mSize.y*0.5f, 0.0f ), AlphaFunction::EASE_OUT_BACK, TimePeriod( delay, duration ) );
-          mShow.AnimateTo( Property( mImageView[count], Actor::Property::SIZE ), mSize, AlphaFunction::EASE_OUT_BACK, TimePeriod( delay, duration ) );
-        }
+        mActor[count].SetProperty(Actor::Property::POSITION, Vector3(xpos + mSize.x * 0.5f, ypos + mSize.y * 0.5f, 0.0f));
+        mActor[count].SetProperty(Actor::Property::SIZE, mSize);
+        mActor[count].SetProperty(Actor::Property::ORIENTATION, Quaternion(Radian(0.0f), Vector3::XAXIS));
         ++count;
       }
     }
-    mShow.Play();
-    mShow.FinishedSignal().Connect( this, &PerfScroll::OnAnimationEnd );
   }
 
   void ScrollAnimation()
   {
-    Window window = mApplication.GetWindow();
-    Vector3 windowSize( window.GetSize() );
-
-    mScroll = Animation::New( gDuration );
-
-    mScroll.AnimateBy( Property( mParent, Actor::Property::POSITION ), Vector3( -(gPageCount-1.)*windowSize.x,0.0f, 0.0f) );
-    mScroll.Play();
-    mScroll.FinishedSignal().Connect( this, &PerfScroll::OnAnimationEnd );
-  }
-
-  void HideAnimation()
-  {
-    size_t count(0);
-    unsigned int actorsPerPage( mRowsPerPage*mColumnsPerPage );
-    mHide = Animation::New( 0.0f );
-
-    unsigned int totalColumns = mColumnsPerPage * mPageCount;
+    Window  window = mApplication.GetWindow();
+    Vector3 windowSize(window.GetSize());
 
-    float totalDuration( 0.0f );
-    float durationPerActor( 0.0f );
-    float delayBetweenActors = ( totalDuration - durationPerActor ) / ( mRowsPerPage * mColumnsPerPage );
-    for( size_t i(0); i<mRowsPerPage; ++i )
-    {
-      for( size_t j(0); j<totalColumns; ++j )
-      {
-        float delay = 0.0f;
-        float duration = 0.0f;
-        if( count < actorsPerPage )
-        {
-          duration = durationPerActor;
-          delay = delayBetweenActors * count;
-        }
-
-        if( gUseMesh )
-        {
-          mHide.AnimateTo( Property( mActor[count], Actor::Property::ORIENTATION ),  Quaternion( Radian( Degree( 70.0f ) ), Vector3::XAXIS ), AlphaFunction::EASE_OUT, TimePeriod( delay, duration ) );
-          mHide.AnimateBy( Property( mActor[count], Actor::Property::POSITION_Z ), 1000.0f, AlphaFunction::EASE_OUT_BACK, TimePeriod( delay +delayBetweenActors*actorsPerPage + duration, duration ) );
-        }
-        else
-        {
-          mHide.AnimateTo( Property( mImageView[count], Actor::Property::ORIENTATION ),  Quaternion( Radian( Degree( 70.0f ) ), Vector3::XAXIS ), AlphaFunction::EASE_OUT, TimePeriod( delay, duration ) );
-          mHide.AnimateBy( Property( mImageView[count], Actor::Property::POSITION_Z ), 1000.0f, AlphaFunction::EASE_OUT_BACK, TimePeriod( delay +delayBetweenActors*actorsPerPage + duration, duration ) );
-        }
-        ++count;
-      }
-    }
-
-    mHide.Play();
-    mHide.FinishedSignal().Connect( this, &PerfScroll::OnAnimationEnd );
+    Animation scrollAnimation = Animation::New(gScrollDuration);
+    scrollAnimation.AnimateBy(Property(mParent, Actor::Property::POSITION), Vector3(-(PAGE_COUNT - 1.) * windowSize.x, 0.0f, 0.0f));
+    scrollAnimation.Play();
+    scrollAnimation.FinishedSignal().Connect(this, [&](Animation&) { mApplication.Quit(); });
   }
 
-  void OnKeyEvent( const KeyEvent& event )
+  void OnKeyEvent(const KeyEvent& event)
   {
-    if( event.GetState() == 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();
       }
@@ -455,44 +334,54 @@ public:
   }
 
 private:
-  Application&  mApplication;
+  Application& mApplication;
 
-  std::vector<Actor>  mActor;
-  std::vector<ImageView>  mImageView;
-  Actor mParent;
+  std::vector<Actor> mActor;
+  Actor              mParent;
 
-  Vector3             mSize;
-  unsigned int        mRowsPerPage;
-  unsigned int        mColumnsPerPage;
-  unsigned int        mPageCount;
+  Vector3 mSize;
 
-  Animation           mShow;
-  Animation           mScroll;
-  Animation           mHide;
+  const unsigned int mRowsPerPage;
+  const unsigned int mColumnsPerPage;
+  const unsigned int mPageCount;
 };
 
-int DALI_EXPORT_API main( int argc, char **argv )
+int DALI_EXPORT_API main(int argc, char** argv)
 {
-  Application application = Application::New( &argc, &argv );
-
-  for( int i(1) ; i < argc; ++i )
+  for(int i(1); i < argc; ++i)
   {
-    std::string arg( argv[i] );
-    if( arg.compare("--use-mesh") == 0)
+    std::string arg(argv[i]);
+    if(arg.compare("--use-mesh") == 0)
     {
       gUseMesh = true;
     }
-    else if( arg.compare("--nine-patch" ) == 0)
+    else if(arg.compare("--nine-patch") == 0)
+    {
+      gUseNinePatch = true;
+    }
+    else if(arg.compare(0, 2, "-t") == 0)
     {
-      gNinePatch = true;
+      auto newDuration = atof(arg.substr(2, arg.size()).c_str());
+      if(newDuration > 0.0f)
+      {
+        gScrollDuration = newDuration;
+      }
     }
-    else if( arg.compare(0, 2, "-t" ) == 0)
+    else if((arg.compare("--help") == 0) || (arg.compare("-h") == 0))
     {
-      gDuration = atof( arg.substr( 2, arg.size()).c_str());
+      cout << "perf-scroll.example [OPTIONS]" << endl;
+      cout << "  Options:" << endl;
+      cout << "    --use-mesh    Uses the Rendering API directly to create actors" << endl;
+      cout << "    --nine-patch  Uses n-patch images instead" << endl;
+      cout << "    -t[seconds]   Replace [seconds] with the animation time required, i.e. -t4. Default is 10s." << endl;
+      cout << "    -h|--help     Help" << endl;
+      return 0;
     }
   }
 
-  PerfScroll test( application );
+  Application application = Application::New(&argc, &argv);
+
+  PerfScroll test(application);
   application.MainLoop();
 
   return 0;