Added nine patch images to Benchmark example.

use the --use-ninepatch command flag to use nine patch images.

Change-Id: Ie14eacdf938066343a1d75f6738a3c1dd65a7e81

diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp
index 9e4a22d..f673c49 100644 (file)
--- a/examples/benchmark/benchmark.cpp
+++ b/examples/benchmark/benchmark.cpp
@@ -84,7 +84,64 @@ const char* IMAGE_PATH[] = {
                             DALI_IMAGE_DIR "gallery-medium-53.jpg",
 };
 
                             DALI_IMAGE_DIR "gallery-medium-53.jpg",
 };
 

+const char* NINEPATCH_IMAGE_PATH[] = {
+                            DALI_IMAGE_DIR "selection-popup-bg.1.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.2.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.3.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.4.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.5.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.6.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.7.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.8.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.9.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.10.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.11.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.12.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.13.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.14.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.15.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.16.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.17.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.18.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.19.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.20.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.21.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.22.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.23.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.24.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.25.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.26.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.27.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.28.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.29.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.30.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.31.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.32.9.png",
+                            DALI_IMAGE_DIR "selection-popup-bg.33.9.png",
+                            DALI_IMAGE_DIR "button-disabled.9.png",
+                            DALI_IMAGE_DIR "button-down.9.png",
+                            DALI_IMAGE_DIR "button-down-disabled.9.png",
+                            DALI_IMAGE_DIR "button-up-1.9.png",
+                            DALI_IMAGE_DIR "button-up-2.9.png",
+                            DALI_IMAGE_DIR "button-up-3.9.png",
+                            DALI_IMAGE_DIR "button-up-4.9.png",
+                            DALI_IMAGE_DIR "button-up-5.9.png",
+                            DALI_IMAGE_DIR "button-up-6.9.png",
+                            DALI_IMAGE_DIR "button-up-7.9.png",
+                            DALI_IMAGE_DIR "button-up-8.9.png",
+                            DALI_IMAGE_DIR "button-up-9.9.png",
+                            DALI_IMAGE_DIR "button-up-10.9.png",
+                            DALI_IMAGE_DIR "button-up-11.9.png",
+                            DALI_IMAGE_DIR "button-up-12.9.png",
+                            DALI_IMAGE_DIR "button-up-13.9.png",
+                            DALI_IMAGE_DIR "button-up-14.9.png",
+                            DALI_IMAGE_DIR "button-up-15.9.png",
+                            DALI_IMAGE_DIR "button-up-16.9.png",
+                            DALI_IMAGE_DIR "button-up-17.9.png",
+};
+

 const unsigned int NUM_IMAGES = sizeof(IMAGE_PATH) / sizeof(char*);
 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
 
 
 const float ANIMATION_TIME ( 5.0f ); // animation length in seconds
 


@@ -149,14 +206,25 @@ Geometry& QuadMesh()
   return mesh;
 }
 
   return mesh;
 }
 

+bool gUseMesh(false);
+bool gUseImageView(false);
+bool gNinePatch(false);
+unsigned int gRowsPerPage(25);
+unsigned int gColumnsPerPage( 25 );
+unsigned int gPageCount(13);
+

 Renderer CreateRenderer( unsigned int index )
 {
 Renderer CreateRenderer( unsigned int index )
 {

-  static Renderer renderers[NUM_IMAGES];
+
+  int numImages = !gNinePatch ? NUM_IMAGES : NUM_NINEPATCH_IMAGES;
+  static Renderer* renderers = new Renderer[numImages];

   if( !renderers[index] )
   {
     //Create the renderer
     Shader shader = Shader::New( VERTEX_SHADER_TEXTURE, FRAGMENT_SHADER_TEXTURE );
   if( !renderers[index] )
   {
     //Create the renderer
     Shader shader = Shader::New( VERTEX_SHADER_TEXTURE, FRAGMENT_SHADER_TEXTURE );

-    Image image = ResourceImage::New(IMAGE_PATH[index]);
+
+    const char* imagePath = !gNinePatch ? IMAGE_PATH[index] : NINEPATCH_IMAGE_PATH[index];
+    Image image = ResourceImage::New(imagePath);

     Sampler textureSampler = Sampler::New( image, "sTexture" );
     Material material = Material::New( shader );
     material.AddSampler(textureSampler);
     Sampler textureSampler = Sampler::New( image, "sTexture" );
     Material material = Material::New( shader );
     material.AddSampler(textureSampler);


@@ -174,13 +242,6 @@ Actor CreateMeshActor( unsigned int index)
   return meshActor;
 }
 
   return meshActor;
 }
 

-bool gUseMesh(false);
-bool gUseImageView(false);
-unsigned int gRowsPerPage(25);
-unsigned int gColumnsPerPage( 25 );
-unsigned int gPageCount(13);
-
-

 }
 // 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:
 }
 // 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:


@@ -189,6 +250,7 @@ unsigned int gPageCount(13);
 // -p NumberOfPages (Modifies the nimber of pages )
 // --use-imageview ( Use ImageView instead of ImageActor )
 // --use-mesh ( Use new renderer API (as ImageView) but shares renderers between actors when possible )
 // -p NumberOfPages (Modifies the nimber of pages )
 // --use-imageview ( Use ImageView instead of ImageActor )
 // --use-mesh ( Use new renderer API (as ImageView) but shares renderers between actors when possible )

+// --use-nine-patch ( Use nine patch images )

 
 //
 class Benchmark : public ConnectionTracker
 
 //
 class Benchmark : public ConnectionTracker


@@ -248,6 +310,11 @@ public:
     return true;
   }
 
     return true;
   }
 

+  const char* ImagePath( int i )
+  {
+    return !gNinePatch ? IMAGE_PATH[i % NUM_IMAGES] : NINEPATCH_IMAGE_PATH[i % NUM_NINEPATCH_IMAGES];
+  }
+

   void CreateImageActors()
   {
     Stage stage = Stage::GetCurrent();
   void CreateImageActors()
   {
     Stage stage = Stage::GetCurrent();


@@ -256,7 +323,7 @@ public:
 
     for( size_t i(0); i<actorCount; ++i )
     {
 
     for( size_t i(0); i<actorCount; ++i )
     {

-      Image image = ResourceImage::New(IMAGE_PATH[i % NUM_IMAGES]);
+      Image image = ResourceImage::New(ImagePath(i));

       mActor[i] = ImageActor::New(image);
       mActor[i].SetSize(Vector3(0.0f,0.0f,0.0f));
       mActor[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
       mActor[i] = ImageActor::New(image);
       mActor[i].SetSize(Vector3(0.0f,0.0f,0.0f));
       mActor[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );


@@ -272,7 +339,7 @@ public:
 
     for( size_t i(0); i<actorCount; ++i )
     {
 
     for( size_t i(0); i<actorCount; ++i )
     {

-      Image image = ResourceImage::New(IMAGE_PATH[i % NUM_IMAGES]);
+      Image image = ResourceImage::New(ImagePath(i));

       mImageView[i] = ImageView::New(image);
       mImageView[i].SetSize(Vector3(0.0f,0.0f,0.0f));
       mImageView[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
       mImageView[i] = ImageView::New(image);
       mImageView[i].SetSize(Vector3(0.0f,0.0f,0.0f));
       mImageView[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );


@@ -287,7 +354,8 @@ public:
     mActor.resize(actorCount);
     for( size_t i(0); i<actorCount; ++i )
     {
     mActor.resize(actorCount);
     for( size_t i(0); i<actorCount; ++i )
     {

-      mActor[i] = CreateMeshActor(i % NUM_IMAGES);
+      size_t numImages = !gNinePatch ? NUM_IMAGES : NUM_NINEPATCH_IMAGES;
+      mActor[i] = CreateMeshActor(i % numImages);

       mActor[i].SetSize(0.0f,0.0f,0.0f);
 
       stage.Add(mActor[i]);
       mActor[i].SetSize(0.0f,0.0f,0.0f);
 
       stage.Add(mActor[i]);


@@ -472,6 +540,10 @@ int main( int argc, char **argv )
     {
       gUseImageView = true;
     }
     {
       gUseImageView = true;
     }

+    else if( arg.compare("--nine-patch" ) == 0)
+    {
+      gNinePatch = true;
+    }

     else if( arg.compare(0, 2, "-r" ) == 0)
     {
       gRowsPerPage = atoi( arg.substr( 2, arg.size()).c_str());
     else if( arg.compare(0, 2, "-r" ) == 0)
     {
       gRowsPerPage = atoi( arg.substr( 2, arg.size()).c_str());


@@ -484,8 +556,6 @@ int main( int argc, char **argv )
     {
       gPageCount = atoi( arg.substr( 2, arg.size()).c_str());
     }
     {
       gPageCount = atoi( arg.substr( 2, arg.size()).c_str());
     }

-
-

   }
 
   RunTest( application );
   }
 
   RunTest( application );

diff --git a/resources/images/button-disabled.9.png b/resources/images/button-disabled.9.png
new file mode 100644 (file)
index 0000000..36b3908
Binary files /dev/null and b/resources/images/button-disabled.9.png differ

diff --git a/resources/images/button-down-disabled.9.png b/resources/images/button-down-disabled.9.png
new file mode 100644 (file)
index 0000000..21084b2
Binary files /dev/null and b/resources/images/button-down-disabled.9.png differ

diff --git a/resources/images/button-down.9.png b/resources/images/button-down.9.png
new file mode 100644 (file)
index 0000000..f6e25ab
Binary files /dev/null and b/resources/images/button-down.9.png differ

diff --git a/resources/images/button-up-1.9.png b/resources/images/button-up-1.9.png
new file mode 100644 (file)
index 0000000..a2e2e01
Binary files /dev/null and b/resources/images/button-up-1.9.png differ

diff --git a/resources/images/button-up-10.9.png b/resources/images/button-up-10.9.png
new file mode 100644 (file)
index 0000000..3045787
Binary files /dev/null and b/resources/images/button-up-10.9.png differ

diff --git a/resources/images/button-up-11.9.png b/resources/images/button-up-11.9.png
new file mode 100644 (file)
index 0000000..0f0fd97
Binary files /dev/null and b/resources/images/button-up-11.9.png differ

diff --git a/resources/images/button-up-12.9.png b/resources/images/button-up-12.9.png
new file mode 100644 (file)
index 0000000..114673d
Binary files /dev/null and b/resources/images/button-up-12.9.png differ

diff --git a/resources/images/button-up-13.9.png b/resources/images/button-up-13.9.png
new file mode 100644 (file)
index 0000000..30d9f32
Binary files /dev/null and b/resources/images/button-up-13.9.png differ

diff --git a/resources/images/button-up-14.9.png b/resources/images/button-up-14.9.png
new file mode 100644 (file)
index 0000000..18d42c4
Binary files /dev/null and b/resources/images/button-up-14.9.png differ

diff --git a/resources/images/button-up-15.9.png b/resources/images/button-up-15.9.png
new file mode 100644 (file)
index 0000000..0a99c95
Binary files /dev/null and b/resources/images/button-up-15.9.png differ

diff --git a/resources/images/button-up-16.9.png b/resources/images/button-up-16.9.png
new file mode 100644 (file)
index 0000000..4c6f60e
Binary files /dev/null and b/resources/images/button-up-16.9.png differ

diff --git a/resources/images/button-up-17.9.png b/resources/images/button-up-17.9.png
new file mode 100644 (file)
index 0000000..5f3b4e6
Binary files /dev/null and b/resources/images/button-up-17.9.png differ

diff --git a/resources/images/button-up-2.9.png b/resources/images/button-up-2.9.png
new file mode 100644 (file)
index 0000000..fe5dcac
Binary files /dev/null and b/resources/images/button-up-2.9.png differ

diff --git a/resources/images/button-up-3.9.png b/resources/images/button-up-3.9.png
new file mode 100644 (file)
index 0000000..ba27124
Binary files /dev/null and b/resources/images/button-up-3.9.png differ

diff --git a/resources/images/button-up-4.9.png b/resources/images/button-up-4.9.png
new file mode 100644 (file)
index 0000000..3351201
Binary files /dev/null and b/resources/images/button-up-4.9.png differ

diff --git a/resources/images/button-up-5.9.png b/resources/images/button-up-5.9.png
new file mode 100644 (file)
index 0000000..4632e0b
Binary files /dev/null and b/resources/images/button-up-5.9.png differ

diff --git a/resources/images/button-up-6.9.png b/resources/images/button-up-6.9.png
new file mode 100644 (file)
index 0000000..428348d
Binary files /dev/null and b/resources/images/button-up-6.9.png differ

diff --git a/resources/images/button-up-7.9.png b/resources/images/button-up-7.9.png
new file mode 100644 (file)
index 0000000..ec065d2
Binary files /dev/null and b/resources/images/button-up-7.9.png differ

diff --git a/resources/images/button-up-8.9.png b/resources/images/button-up-8.9.png
new file mode 100644 (file)
index 0000000..b84f6e4
Binary files /dev/null and b/resources/images/button-up-8.9.png differ

diff --git a/resources/images/button-up-9.9.png b/resources/images/button-up-9.9.png
new file mode 100644 (file)
index 0000000..2bfab8b
Binary files /dev/null and b/resources/images/button-up-9.9.png differ

diff --git a/resources/images/selection-popup-bg.1.9.png b/resources/images/selection-popup-bg.1.9.png
new file mode 100644 (file)
index 0000000..376a3b7
Binary files /dev/null and b/resources/images/selection-popup-bg.1.9.png differ

diff --git a/resources/images/selection-popup-bg.10.9.png b/resources/images/selection-popup-bg.10.9.png
new file mode 100644 (file)
index 0000000..9a7ebf8
Binary files /dev/null and b/resources/images/selection-popup-bg.10.9.png differ

diff --git a/resources/images/selection-popup-bg.11.9.png b/resources/images/selection-popup-bg.11.9.png
new file mode 100644 (file)
index 0000000..1d2aa8f
Binary files /dev/null and b/resources/images/selection-popup-bg.11.9.png differ

diff --git a/resources/images/selection-popup-bg.12.9.png b/resources/images/selection-popup-bg.12.9.png
new file mode 100644 (file)
index 0000000..5c2201b
Binary files /dev/null and b/resources/images/selection-popup-bg.12.9.png differ

diff --git a/resources/images/selection-popup-bg.13.9.png b/resources/images/selection-popup-bg.13.9.png
new file mode 100644 (file)
index 0000000..0f729c8
Binary files /dev/null and b/resources/images/selection-popup-bg.13.9.png differ

diff --git a/resources/images/selection-popup-bg.14.9.png b/resources/images/selection-popup-bg.14.9.png
new file mode 100644 (file)
index 0000000..d1deedf
Binary files /dev/null and b/resources/images/selection-popup-bg.14.9.png differ

diff --git a/resources/images/selection-popup-bg.15.9.png b/resources/images/selection-popup-bg.15.9.png
new file mode 100644 (file)
index 0000000..453a10f
Binary files /dev/null and b/resources/images/selection-popup-bg.15.9.png differ

diff --git a/resources/images/selection-popup-bg.16.9.png b/resources/images/selection-popup-bg.16.9.png
new file mode 100644 (file)
index 0000000..e8becfb
Binary files /dev/null and b/resources/images/selection-popup-bg.16.9.png differ

diff --git a/resources/images/selection-popup-bg.17.9.png b/resources/images/selection-popup-bg.17.9.png
new file mode 100644 (file)
index 0000000..2c924a6
Binary files /dev/null and b/resources/images/selection-popup-bg.17.9.png differ

diff --git a/resources/images/selection-popup-bg.18.9.png b/resources/images/selection-popup-bg.18.9.png
new file mode 100644 (file)
index 0000000..ccd92b2
Binary files /dev/null and b/resources/images/selection-popup-bg.18.9.png differ

diff --git a/resources/images/selection-popup-bg.19.9.png b/resources/images/selection-popup-bg.19.9.png
new file mode 100644 (file)
index 0000000..71258b5
Binary files /dev/null and b/resources/images/selection-popup-bg.19.9.png differ

diff --git a/resources/images/selection-popup-bg.2.9.png b/resources/images/selection-popup-bg.2.9.png
new file mode 100644 (file)
index 0000000..799326f
Binary files /dev/null and b/resources/images/selection-popup-bg.2.9.png differ

diff --git a/resources/images/selection-popup-bg.20.9.png b/resources/images/selection-popup-bg.20.9.png
new file mode 100644 (file)
index 0000000..62a9b4f
Binary files /dev/null and b/resources/images/selection-popup-bg.20.9.png differ

diff --git a/resources/images/selection-popup-bg.21.9.png b/resources/images/selection-popup-bg.21.9.png
new file mode 100644 (file)
index 0000000..281ddf0
Binary files /dev/null and b/resources/images/selection-popup-bg.21.9.png differ

diff --git a/resources/images/selection-popup-bg.22.9.png b/resources/images/selection-popup-bg.22.9.png
new file mode 100644 (file)
index 0000000..f87e3c5
Binary files /dev/null and b/resources/images/selection-popup-bg.22.9.png differ

diff --git a/resources/images/selection-popup-bg.23.9.png b/resources/images/selection-popup-bg.23.9.png
new file mode 100644 (file)
index 0000000..144e1b2
Binary files /dev/null and b/resources/images/selection-popup-bg.23.9.png differ

diff --git a/resources/images/selection-popup-bg.24.9.png b/resources/images/selection-popup-bg.24.9.png
new file mode 100644 (file)
index 0000000..5fa412f
Binary files /dev/null and b/resources/images/selection-popup-bg.24.9.png differ

diff --git a/resources/images/selection-popup-bg.25.9.png b/resources/images/selection-popup-bg.25.9.png
new file mode 100644 (file)
index 0000000..e5d462f
Binary files /dev/null and b/resources/images/selection-popup-bg.25.9.png differ

diff --git a/resources/images/selection-popup-bg.26.9.png b/resources/images/selection-popup-bg.26.9.png
new file mode 100644 (file)
index 0000000..24998f6
Binary files /dev/null and b/resources/images/selection-popup-bg.26.9.png differ

diff --git a/resources/images/selection-popup-bg.27.9.png b/resources/images/selection-popup-bg.27.9.png
new file mode 100644 (file)
index 0000000..f2becae
Binary files /dev/null and b/resources/images/selection-popup-bg.27.9.png differ

diff --git a/resources/images/selection-popup-bg.28.9.png b/resources/images/selection-popup-bg.28.9.png
new file mode 100644 (file)
index 0000000..6235352
Binary files /dev/null and b/resources/images/selection-popup-bg.28.9.png differ

diff --git a/resources/images/selection-popup-bg.29.9.png b/resources/images/selection-popup-bg.29.9.png
new file mode 100644 (file)
index 0000000..75f0a29
Binary files /dev/null and b/resources/images/selection-popup-bg.29.9.png differ

diff --git a/resources/images/selection-popup-bg.3.9.png b/resources/images/selection-popup-bg.3.9.png
new file mode 100644 (file)
index 0000000..016caac
Binary files /dev/null and b/resources/images/selection-popup-bg.3.9.png differ

diff --git a/resources/images/selection-popup-bg.30.9.png b/resources/images/selection-popup-bg.30.9.png
new file mode 100644 (file)
index 0000000..b00aa37
Binary files /dev/null and b/resources/images/selection-popup-bg.30.9.png differ

diff --git a/resources/images/selection-popup-bg.31.9.png b/resources/images/selection-popup-bg.31.9.png
new file mode 100644 (file)
index 0000000..291b24f
Binary files /dev/null and b/resources/images/selection-popup-bg.31.9.png differ

diff --git a/resources/images/selection-popup-bg.32.9.png b/resources/images/selection-popup-bg.32.9.png
new file mode 100644 (file)
index 0000000..ae8f1a9
Binary files /dev/null and b/resources/images/selection-popup-bg.32.9.png differ

diff --git a/resources/images/selection-popup-bg.33.9.png b/resources/images/selection-popup-bg.33.9.png
new file mode 100644 (file)
index 0000000..96c1cbf
Binary files /dev/null and b/resources/images/selection-popup-bg.33.9.png differ

diff --git a/resources/images/selection-popup-bg.4.9.png b/resources/images/selection-popup-bg.4.9.png
new file mode 100644 (file)
index 0000000..fe3ac7b
Binary files /dev/null and b/resources/images/selection-popup-bg.4.9.png differ

diff --git a/resources/images/selection-popup-bg.5.9.png b/resources/images/selection-popup-bg.5.9.png
new file mode 100644 (file)
index 0000000..c8c82bc
Binary files /dev/null and b/resources/images/selection-popup-bg.5.9.png differ

diff --git a/resources/images/selection-popup-bg.6.9.png b/resources/images/selection-popup-bg.6.9.png
new file mode 100644 (file)
index 0000000..9a8a1c3
Binary files /dev/null and b/resources/images/selection-popup-bg.6.9.png differ

diff --git a/resources/images/selection-popup-bg.7.9.png b/resources/images/selection-popup-bg.7.9.png
new file mode 100644 (file)
index 0000000..bf498cd
Binary files /dev/null and b/resources/images/selection-popup-bg.7.9.png differ

diff --git a/resources/images/selection-popup-bg.8.9.png b/resources/images/selection-popup-bg.8.9.png
new file mode 100644 (file)
index 0000000..aad71bc
Binary files /dev/null and b/resources/images/selection-popup-bg.8.9.png differ

diff --git a/resources/images/selection-popup-bg.9.9.png b/resources/images/selection-popup-bg.9.9.png
new file mode 100644 (file)
index 0000000..8452e2d
Binary files /dev/null and b/resources/images/selection-popup-bg.9.9.png differ