X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fbenchmark%2Fbenchmark.cpp;h=c437dc2c6af6f24281bff8fcdfb4051bdb9b8f20;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hp=3824de81bd57f2c7724adca5b3f86031c1ba0980;hpb=fcf51be2a38a3e002cfb4742da69490834af61ef;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp index 3824de8..c437dc2 100644 --- a/examples/benchmark/benchmark.cpp +++ b/examples/benchmark/benchmark.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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,135 +15,133 @@ * */ +// EXTERNAL INCLUDES #include -#include -#include -#include -#include -#include + +// INTERNAL INCLUDES +#include "shared/utility.h" using namespace Dali; using namespace Dali::Toolkit; - 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_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 struct VertexWithTexture { @@ -151,13 +149,7 @@ 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 ) } -}; - +// clang-format off const char* VERTEX_SHADER_TEXTURE = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n attribute mediump vec2 aTexCoord;\n @@ -182,73 +174,32 @@ const char* FRAGMENT_SHADER_TEXTURE = DALI_COMPOSE_SHADER( gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n }\n ); +// clang-format on - -Geometry& QuadMesh() -{ - static Geometry mesh; - if( !mesh ) - { - PropertyBuffer vertexBuffer; - Property::Map vertexFormat; - vertexFormat["aPosition"] = Property::VECTOR2; - vertexFormat["aTexCoord"] = Property::VECTOR2; - - //Create a vertex buffer for vertex positions and texture coordinates - vertexBuffer = PropertyBuffer::New( vertexFormat ); - vertexBuffer.SetData( gQuadWithTexture, 4u ); - - //Create the geometry - mesh = Geometry::New(); - mesh.AddVertexBuffer( vertexBuffer ); - mesh.SetGeometryType(Geometry::TRIANGLE_STRIP ); - } - return mesh; -} - -bool gUseMesh(false); -bool gUseImageActor(false); -bool gNinePatch(false); +bool gUseMesh(false); +bool gNinePatch(false); unsigned int gRowsPerPage(25); -unsigned int gColumnsPerPage( 25 ); +unsigned int gColumnsPerPage(25); unsigned int gPageCount(13); -Renderer CreateRenderer( unsigned int index ) +Renderer CreateRenderer(unsigned int index, Geometry geometry, Shader shader) { - - 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 ); - - const char* imagePath = !gNinePatch ? IMAGE_PATH[index] : NINEPATCH_IMAGE_PATH[index]; - Image image = ResourceImage::New(imagePath); - 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]; + 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); + return renderer; } -Actor CreateMeshActor( unsigned int index) -{ - Renderer renderer = CreateRenderer(index); - Actor meshActor = Actor::New(); - meshActor.AddRenderer( renderer ); - return meshActor; -} - -} -// Test application to compare performance between ImageActor and ImageView +} // namespace +// Test application to compare performance between using a mesh and ImageView // By default, the application consist of 10 pages of 25x25 Image views, this can be modified using the following command line arguments: // -r NumberOfRows (Modifies the number of rows per page) // -c NumberOfColumns (Modifies the number of columns per page) // -p NumberOfPages (Modifies the nimber of pages ) -// --use-image-actor ( Use ImageActor instead of ImageView ) // --use-mesh ( Use new renderer API (as ImageView) but shares renderers between actors when possible ) // --nine-patch ( Use nine patch images ) @@ -256,45 +207,40 @@ Actor CreateMeshActor( unsigned int index) class Benchmark : public ConnectionTracker { public: - - Benchmark( Application& application ) -: mApplication( application ), - mRowsPerPage( gRowsPerPage ), - mColumnsPerPage( gColumnsPerPage ), - mPageCount( gPageCount ) -{ - // Connect to the Application's Init signal - mApplication.InitSignal().Connect( this, &Benchmark::Create ); -} - - ~Benchmark() + Benchmark(Application& application) + : mApplication(application), + mRowsPerPage(gRowsPerPage), + mColumnsPerPage(gColumnsPerPage), + mPageCount(gPageCount) { - // Nothing to do here; + // Connect to the Application's Init signal + mApplication.InitSignal().Connect(this, &Benchmark::Create); } + ~Benchmark() = 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 stage - Stage stage = Stage::GetCurrent(); - stage.SetBackgroundColor( Color::WHITE ); - Vector2 stageSize = stage.GetSize(); + // Get a handle to the window + Window window = application.GetWindow(); + window.SetBackgroundColor(Color::WHITE); + Vector2 windowSize = window.GetSize(); - stage.GetRootLayer().SetDepthTestDisabled(true); + window.GetRootLayer().SetProperty(Layer::Property::DEPTH_TEST, false); - mSize = Vector3( stageSize.x / mColumnsPerPage, stageSize.y / mRowsPerPage, 0.0f ); + mSize = Vector3(windowSize.x / mColumnsPerPage, windowSize.y / mRowsPerPage, 0.0f); - // Respond to a click anywhere on the stage - stage.GetRootLayer().TouchedSignal().Connect( this, &Benchmark::OnTouch ); + // Respond to a click anywhere on the window + window.GetRootLayer().TouchedSignal().Connect(this, &Benchmark::OnTouch); - if( gUseMesh ) + // Respond to key events + window.KeyEventSignal().Connect(this, &Benchmark::OnKeyEvent); + + if(gUseMesh) { CreateMeshActors(); } - else if( gUseImageActor ) - { - CreateImageActors(); - } else { CreateImageViews(); @@ -303,71 +249,66 @@ public: ShowAnimation(); } - 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]; } - void CreateImageActors() - { - Stage stage = Stage::GetCurrent(); - unsigned int actorCount(mRowsPerPage*mColumnsPerPage * mPageCount); - mActor.resize(actorCount); - - for( size_t i(0); i renderers(numImages); + Shader shader = Shader::New(VERTEX_SHADER_TEXTURE, FRAGMENT_SHADER_TEXTURE); + Geometry geometry = DemoHelper::CreateTexturedQuad(); + for(unsigned int i(0); i < numImages; ++i) { - size_t numImages = !gNinePatch ? NUM_IMAGES : NUM_NINEPATCH_IMAGES; - mActor[i] = CreateMeshActor(i % numImages); - mActor[i].SetSize(0.0f,0.0f,0.0f); + renderers[i] = CreateRenderer(i, geometry, shader); + } - stage.Add(mActor[i]); + //Create the actors + Window window = mApplication.GetWindow(); + unsigned int actorCount(mRowsPerPage * mColumnsPerPage * mPageCount); + mActor.resize(actorCount); + 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)); + window.Add(mActor[i]); } } - void OnAnimationEnd( Animation& source ) + void OnAnimationEnd(Animation& source) { - if( source == mShow ) + if(source == mShow) { ScrollAnimation(); } - else if( source == mScroll ) + else if(source == mScroll) { HideAnimation(); } @@ -379,186 +320,185 @@ public: void ShowAnimation() { - Stage stage = Stage::GetCurrent(); - Vector3 initialPosition( stage.GetSize().x * 0.5f, stage.GetSize().y*0.5f, 1000.0f ); + Window window = mApplication.GetWindow(); + const Vector2 windowSize(window.GetSize()); + Vector3 initialPosition(windowSize.width * 0.5f, windowSize.height * 0.5f, 1000.0f); unsigned int totalColumns = mColumnsPerPage * mPageCount; size_t count(0); - float xpos, ypos; + float xpos, ypos; mShow = Animation::New(0.0f); - float totalDuration( 10.0f ); - float durationPerActor( 0.5f ); - float delayBetweenActors = ( totalDuration - durationPerActor) / (mRowsPerPage*mColumnsPerPage); - for( size_t i(0); i(mRowsPerPage) * mColumnsPerPage)) { duration = durationPerActor; - delay = delayBetweenActors * count; + delay = delayBetweenActors * count; } - if( gUseImageActor || gUseMesh ) + if(gUseMesh) { - mActor[count].SetPosition( initialPosition ); - mActor[count].SetSize( Vector3(0.0f,0.0f,0.0f) ); - mActor[count].SetOrientation( 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 )); + 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(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].SetPosition( initialPosition ); - mImageView[count].SetSize( Vector3(0.0f,0.0f,0.0f) ); - mImageView[count].SetOrientation( 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 )); + 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(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)); } ++count; } } mShow.Play(); - mShow.FinishedSignal().Connect( this, &Benchmark::OnAnimationEnd ); + mShow.FinishedSignal().Connect(this, &Benchmark::OnAnimationEnd); } void ScrollAnimation() { - Stage stage = Stage::GetCurrent(); - Vector3 stageSize( stage.GetSize() ); + Window window = mApplication.GetWindow(); + Vector3 windowSize(window.GetSize()); mScroll = Animation::New(10.0f); - size_t actorCount( mRowsPerPage*mColumnsPerPage*mPageCount); - for( size_t i(0); i(mRowsPerPage) * mColumnsPerPage * mPageCount); + for(size_t i(0); i < actorCount; ++i) { - if( gUseImageActor || gUseMesh ) + if(gUseMesh) { - mScroll.AnimateBy( Property( mActor[i], Actor::Property::POSITION), Vector3(-4.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(0.0f,3.0f)); - mScroll.AnimateBy( Property( mActor[i], Actor::Property::POSITION), Vector3(-4.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(3.0f,3.0f)); - mScroll.AnimateBy( Property( mActor[i], Actor::Property::POSITION), Vector3(-4.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(6.0f,2.0f)); - mScroll.AnimateBy( Property( mActor[i], Actor::Property::POSITION), Vector3( 12.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(8.0f,2.0f)); + mScroll.AnimateBy(Property(mActor[i], Actor::Property::POSITION), Vector3(-4.0f * windowSize.x, 0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(0.0f, 3.0f)); + mScroll.AnimateBy(Property(mActor[i], Actor::Property::POSITION), Vector3(-4.0f * windowSize.x, 0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(3.0f, 3.0f)); + mScroll.AnimateBy(Property(mActor[i], Actor::Property::POSITION), Vector3(-4.0f * windowSize.x, 0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(6.0f, 2.0f)); + mScroll.AnimateBy(Property(mActor[i], Actor::Property::POSITION), Vector3(12.0f * windowSize.x, 0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(8.0f, 2.0f)); } else { - mScroll.AnimateBy( Property( mImageView[i], Actor::Property::POSITION), Vector3(-4.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(0.0f,3.0f)); - mScroll.AnimateBy( Property( mImageView[i], Actor::Property::POSITION), Vector3(-4.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(3.0f,3.0f)); - mScroll.AnimateBy( Property( mImageView[i], Actor::Property::POSITION), Vector3(-4.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(6.0f,2.0f)); - mScroll.AnimateBy( Property( mImageView[i], Actor::Property::POSITION), Vector3( 12.0f*stageSize.x,0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(8.0f,2.0f)); + mScroll.AnimateBy(Property(mImageView[i], Actor::Property::POSITION), Vector3(-4.0f * windowSize.x, 0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(0.0f, 3.0f)); + mScroll.AnimateBy(Property(mImageView[i], Actor::Property::POSITION), Vector3(-4.0f * windowSize.x, 0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(3.0f, 3.0f)); + mScroll.AnimateBy(Property(mImageView[i], Actor::Property::POSITION), Vector3(-4.0f * windowSize.x, 0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(6.0f, 2.0f)); + mScroll.AnimateBy(Property(mImageView[i], Actor::Property::POSITION), Vector3(12.0f * windowSize.x, 0.0f, 0.0f), AlphaFunction::EASE_OUT, TimePeriod(8.0f, 2.0f)); } } mScroll.Play(); - mScroll.FinishedSignal().Connect( this, &Benchmark::OnAnimationEnd ); + mScroll.FinishedSignal().Connect(this, &Benchmark::OnAnimationEnd); } void HideAnimation() { - size_t count(0); - unsigned int actorsPerPage( mRowsPerPage*mColumnsPerPage ); + size_t count(0); + unsigned int actorsPerPage(mRowsPerPage * mColumnsPerPage); mHide = Animation::New(0.0f); unsigned int totalColumns = mColumnsPerPage * mPageCount; - float finalZ = Dali::Stage::GetCurrent().GetRenderTaskList().GetTask(0).GetCameraActor().GetCurrentWorldPosition().z; - float totalDuration( 5.0f); - float durationPerActor( 0.5f ); - float delayBetweenActors = ( totalDuration - durationPerActor) / (mRowsPerPage*mColumnsPerPage); - for( size_t i(0); i(Actor::Property::WORLD_POSITION).z; + float totalDuration(5.0f); + float durationPerActor(0.5f); + float delayBetweenActors = (totalDuration - durationPerActor) / (mRowsPerPage * mColumnsPerPage); + for(size_t i(0); i < mRowsPerPage; ++i) { - for( size_t j(0);j mActor; - std::vector mImageView; + std::vector mActor; + std::vector mImageView; - Vector3 mSize; - unsigned int mRowsPerPage; - unsigned int mColumnsPerPage; - unsigned int mPageCount; + Vector3 mSize; + unsigned int mRowsPerPage; + unsigned int mColumnsPerPage; + unsigned int mPageCount; - Animation mShow; - Animation mScroll; - Animation mHide; + Animation mShow; + Animation mScroll; + Animation mHide; }; -void RunTest( Application& application ) -{ - Benchmark test( application ); - - application.MainLoop(); -} - -// Entry point for Linux & Tizen applications -// -int DALI_EXPORT_API main( int argc, char **argv ) +int DALI_EXPORT_API main(int argc, char** argv) { - Application application = Application::New( &argc, &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("--use-image-actor") == 0) - { - gUseImageActor = true; - } - else if( arg.compare("--nine-patch" ) == 0) + else if(arg.compare("--nine-patch") == 0) { gNinePatch = true; } - else if( arg.compare(0, 2, "-r" ) == 0) + else if(arg.compare(0, 2, "-r") == 0) { - gRowsPerPage = atoi( arg.substr( 2, arg.size()).c_str()); + gRowsPerPage = atoi(arg.substr(2, arg.size()).c_str()); } - else if( arg.compare(0, 2, "-c" ) == 0) + else if(arg.compare(0, 2, "-c") == 0) { - gColumnsPerPage = atoi( arg.substr( 2, arg.size()).c_str()); + gColumnsPerPage = atoi(arg.substr(2, arg.size()).c_str()); } - else if( arg.compare(0, 2, "-p" ) == 0) + else if(arg.compare(0, 2, "-p") == 0) { - gPageCount = atoi( arg.substr( 2, arg.size()).c_str()); + gPageCount = atoi(arg.substr(2, arg.size()).c_str()); } } - RunTest( application ); + Benchmark test(application); + application.MainLoop(); return 0; }