Merge "Simple TextEditor demo." into devel/master

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

diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp
index 7b257cf..e9fed0e 100644 (file)
--- a/examples/benchmark/benchmark.cpp
+++ b/examples/benchmark/benchmark.cpp
@@ -29,115 +29,115 @@ using namespace Dali::Toolkit;
 namespace
 {
 const char* IMAGE_PATH[] = {
-                            DALI_IMAGE_DIR "gallery-medium-1.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-2.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-3.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-4.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-5.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-6.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-7.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-8.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-9.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-10.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-11.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-12.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-13.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-14.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-15.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-16.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-17.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-18.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-19.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-20.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-21.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-22.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-23.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-24.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-25.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-26.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-27.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-28.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-29.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-30.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-31.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-32.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-33.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-34.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-35.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-36.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-37.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-38.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-39.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-40.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-41.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-42.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-43.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-44.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-45.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-46.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-47.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-48.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-49.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-50.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-51.jpg",
-                            DALI_IMAGE_DIR "gallery-medium-52.jpg",
-                            DALI_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[] = {
-                            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",
+                            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*);
@@ -195,8 +195,8 @@ Geometry& QuadMesh()
     vertexFormat["aTexCoord"] = Property::VECTOR2;
 
     //Create a vertex buffer for vertex positions and texture coordinates
-    vertexBuffer = PropertyBuffer::New( vertexFormat, 4u );
-    vertexBuffer.SetData( gQuadWithTexture );
+    vertexBuffer = PropertyBuffer::New( vertexFormat );
+    vertexBuffer.SetData( gQuadWithTexture, 4u );
 
     //Create the geometry
     mesh = Geometry::New();
@@ -225,10 +225,11 @@ Renderer CreateRenderer( unsigned int index )
 
     const char* imagePath = !gNinePatch ? IMAGE_PATH[index] : NINEPATCH_IMAGE_PATH[index];
     Image image = ResourceImage::New(imagePath);
-    Material material = Material::New( shader );
-    material.AddTexture( image, "sTexture" );
-    material.SetBlendMode( BlendingMode::OFF );
-    renderers[index] = Renderer::New( QuadMesh(), material );
+    TextureSet textureSet = TextureSet::New();
+    textureSet.SetImage( 0u, image );
+    renderers[index] = Renderer::New( QuadMesh(), shader );
+    renderers[index].SetTextures( textureSet );
+    renderers[index].SetProperty( Renderer::Property::BLEND_MODE, BlendMode::OFF );
   }
   return renderers[index];
 }
@@ -284,7 +285,7 @@ public:
     mSize = Vector3( stageSize.x / mColumnsPerPage, stageSize.y / mRowsPerPage, 0.0f );
 
     // Respond to a click anywhere on the stage
-    stage.GetRootLayer().TouchedSignal().Connect( this, &Benchmark::OnTouch );
+    stage.GetRootLayer().TouchSignal().Connect( this, &Benchmark::OnTouch );
 
     if( gUseMesh )
     {
@@ -302,7 +303,7 @@ public:
     ShowAnimation();
   }
 
-  bool OnTouch( Actor actor, const TouchEvent& touch )
+  bool OnTouch( Actor actor, const TouchData& touch )
   {
     // quit the application
     mApplication.Quit();
@@ -524,7 +525,7 @@ void RunTest( Application& application )
 
 // Entry point for Linux & Tizen applications
 //
-int main( int argc, char **argv )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );