X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=blobdiff_plain;f=examples%2Fperf-scroll%2Fperf-scroll.cpp;h=798194a87e918fee57cab0f718d50853b2988488;hp=ea9b63363661b5fe04aa824d25a77c97f1e52484;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hpb=b26d446b0cb6a316abc3a79d4fc70d0ae1b7994c diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp index ea9b633..798194a 100644 --- a/examples/perf-scroll/perf-scroll.cpp +++ b/examples/perf-scroll/perf-scroll.cpp @@ -22,125 +22,124 @@ 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 { @@ -148,6 +147,8 @@ struct VertexWithTexture Vector2 texCoord; }; +// clang-format off + const char* VERTEX_SHADER_TEXTURE = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n attribute mediump vec2 aTexCoord;\n @@ -173,27 +174,28 @@ const char* FRAGMENT_SHADER_TEXTURE = DALI_COMPOSE_SHADER( }\n ); -bool gUseMesh(false); -bool gNinePatch(false); +// clang-format on + +bool gUseMesh(false); +bool gNinePatch(false); unsigned int gRowsPerPage(15); unsigned int gColumnsPerPage(15); unsigned int gPageCount(10); -float gDuration(10.0f); +float gDuration(10.0f); -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 = !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; } - -} +} // 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 ) @@ -204,15 +206,14 @@ Renderer CreateRenderer( unsigned int index, Geometry geometry, Shader shader ) class PerfScroll : public ConnectionTracker { public: - - PerfScroll( Application& application ) - : mApplication( application ), - mRowsPerPage( gRowsPerPage ), - mColumnsPerPage( gColumnsPerPage ), - mPageCount( gPageCount ) + PerfScroll(Application& application) + : mApplication(application), + mRowsPerPage(gRowsPerPage), + mColumnsPerPage(gColumnsPerPage), + mPageCount(gPageCount) { // Connect to the Application's Init signal - mApplication.InitSignal().Connect( this, &PerfScroll::Create ); + mApplication.InitSignal().Connect(this, &PerfScroll::Create); } ~PerfScroll() @@ -221,28 +222,28 @@ public: } // 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().TouchedSignal().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(); } @@ -254,25 +255,25 @@ 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 CreateImageViews() { - Window window = mApplication.GetWindow(); - unsigned int actorCount( mRowsPerPage*mColumnsPerPage * mPageCount ); - mImageView.resize( actorCount ); + Window window = mApplication.GetWindow(); + unsigned int actorCount(mRowsPerPage * mColumnsPerPage * mPageCount); + mImageView.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 renderers(numImages); + Shader shader = Shader::New(VERTEX_SHADER_TEXTURE, FRAGMENT_SHADER_TEXTURE); + 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( mRowsPerPage ) * mColumnsPerPage ) ) + if(count < (static_cast(mRowsPerPage) * mColumnsPerPage)) { duration = durationPerActor; - delay = delayBetweenActors * count; + delay = delayBetweenActors * count; } - if( gUseMesh ) + 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 ) ); + 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 ) ); + 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)); } ++count; } } mShow.Play(); - mShow.FinishedSignal().Connect( this, &PerfScroll::OnAnimationEnd ); + mShow.FinishedSignal().Connect(this, &PerfScroll::OnAnimationEnd); } void ScrollAnimation() { - Window window = mApplication.GetWindow(); - Vector3 windowSize( window.GetSize() ); + Window window = mApplication.GetWindow(); + Vector3 windowSize(window.GetSize()); - mScroll = Animation::New( gDuration ); + mScroll = Animation::New(gDuration); - mScroll.AnimateBy( Property( mParent, Actor::Property::POSITION ), Vector3( -(gPageCount-1.)*windowSize.x,0.0f, 0.0f) ); + mScroll.AnimateBy(Property(mParent, Actor::Property::POSITION), Vector3(-(gPageCount - 1.) * windowSize.x, 0.0f, 0.0f)); mScroll.Play(); - mScroll.FinishedSignal().Connect( this, &PerfScroll::OnAnimationEnd ); + mScroll.FinishedSignal().Connect(this, &PerfScroll::OnAnimationEnd); } void HideAnimation() { - size_t count(0); - unsigned int actorsPerPage( mRowsPerPage*mColumnsPerPage ); - mHide = Animation::New( 0.0f ); + size_t count(0); + unsigned int actorsPerPage(mRowsPerPage * mColumnsPerPage); + mHide = Animation::New(0.0f); unsigned int totalColumns = mColumnsPerPage * mPageCount; - float totalDuration( 0.0f ); - float durationPerActor( 0.0f ); - float delayBetweenActors = ( totalDuration - durationPerActor ) / ( mRowsPerPage * mColumnsPerPage ); - for( size_t i(0); i mActor; - std::vector mImageView; - Actor mParent; + std::vector mActor; + std::vector mImageView; + Actor mParent; - 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; }; -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("--nine-patch" ) == 0) + else if(arg.compare("--nine-patch") == 0) { gNinePatch = true; } - else if( arg.compare(0, 2, "-t" ) == 0) + else if(arg.compare(0, 2, "-t") == 0) { - gDuration = atof( arg.substr( 2, arg.size()).c_str()); + gDuration = atof(arg.substr(2, arg.size()).c_str()); } } - PerfScroll test( application ); + PerfScroll test(application); application.MainLoop(); return 0;