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 96e1e51..e9fed0e 100644 (file)
--- a/examples/benchmark/benchmark.cpp
+++ b/examples/benchmark/benchmark.cpp
@@ -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 );