From 619495a15784b2e5e3d09727dd8200e524db114f Mon Sep 17 00:00:00 2001 From: suhyung Eom Date: Tue, 5 Apr 2016 16:55:38 +0900 Subject: [PATCH] Revert "[3.0]add perf-scroll sample" This reverts commit eac11f6754453be02224b98ad46c619a725cb02d. Change-Id: Ibd27a1d25acabe76e741aa2f2ae3b0bed4fa881a --- com.samsung.dali-demo.xml | 3 - examples/perf-scroll/perf-scroll-example.cpp | 552 --------------------------- 2 files changed, 555 deletions(-) delete mode 100755 examples/perf-scroll/perf-scroll-example.cpp diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml index 755b7af..e388766 100644 --- a/com.samsung.dali-demo.xml +++ b/com.samsung.dali-demo.xml @@ -139,7 +139,4 @@ - - - diff --git a/examples/perf-scroll/perf-scroll-example.cpp b/examples/perf-scroll/perf-scroll-example.cpp deleted file mode 100755 index 39740cc..0000000 --- a/examples/perf-scroll/perf-scroll-example.cpp +++ /dev/null @@ -1,552 +0,0 @@ -/* - * Copyright (c) 2015 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include -#include -#include -#include -#include -#include -#include - -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", -}; - -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", -}; - -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 - -struct VertexWithTexture -{ - Vector2 position; - 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 ) } -}; - -const char* VERTEX_SHADER_TEXTURE = DALI_COMPOSE_SHADER( - attribute mediump vec2 aPosition;\n - attribute mediump vec2 aTexCoord;\n - uniform mediump mat4 uMvpMatrix;\n - uniform mediump vec3 uSize;\n - varying mediump vec2 vTexCoord;\n - void main()\n - {\n - vec4 position = vec4(aPosition,0.0,1.0)*vec4(uSize,1.0);\n - gl_Position = uMvpMatrix * position;\n - vTexCoord = aTexCoord;\n - }\n -); - -const char* FRAGMENT_SHADER_TEXTURE = DALI_COMPOSE_SHADER( - uniform lowp vec4 uColor;\n - uniform sampler2D sTexture;\n - varying mediump vec2 vTexCoord;\n - - void main()\n - {\n - gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n - }\n -); - - -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, 4u ); - vertexBuffer.SetData( gQuadWithTexture ); - - //Create the geometry - mesh = Geometry::New(); - mesh.AddVertexBuffer( vertexBuffer ); - mesh.SetGeometryType( Geometry::TRIANGLE_STRIP ); - } - return mesh; -} - -bool gUseMesh(false); -bool gUseImageView(false); -bool gNinePatch(false); -unsigned int gRowsPerPage(15); -unsigned int gColumnsPerPage(15); -unsigned int gPageCount(10); -float gDuration(10.0f); - -Renderer CreateRenderer( unsigned int index ) -{ - - 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 ); - Material material = Material::New( shader ); - material.AddTexture( image, "sTexture" ); -// material.SetBlendMode( BlendingMode::OFF ); - renderers[index] = Renderer::New( QuadMesh(), material ); - renderers[index].SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::OFF ); - - } - return renderers[index]; -} - -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 -// By default, the application consist of 10 pages of 25x25 ImageActors, 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 ) -// -t duration (sec ) -// --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 ) -// --animate-parent ( Animate one parent actor instead of all child actors ) - -// -class PerfScroll : public ConnectionTracker -{ -public: - - PerfScroll( Application& application ) - : mApplication( application ), - mRowsPerPage( gRowsPerPage ), - mColumnsPerPage( gColumnsPerPage ), - mPageCount( gPageCount ) - { - // Connect to the Application's Init signal - mApplication.InitSignal().Connect( this, &PerfScroll::Create ); - } - - ~PerfScroll() - { - // Nothing to do here; - } - - // The Init signal is received once (only) during the Application lifetime - void Create( Application& application ) - { - // Get a handle to the stage - Stage stage = Stage::GetCurrent(); - stage.SetBackgroundColor( Color::WHITE ); - Vector2 stageSize = stage.GetSize(); - - stage.GetRootLayer().SetDepthTestDisabled(true); - - mSize = Vector3( stageSize.x / mColumnsPerPage, stageSize.y / mRowsPerPage, 0.0f ); - - // Respond to a click anywhere on the stage - stage.GetRootLayer().TouchedSignal().Connect( this, &PerfScroll::OnTouch ); - - mParent = Actor::New(); - mParent.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - stage.Add(mParent); - - if( gUseMesh ) - { - CreateMeshActors(); - } - else if( gUseImageView ) - { - CreateImageViews(); - } - else - { - CreateImageActors(); - } - - ShowAnimation(); - } - - bool OnTouch( Actor actor, const TouchEvent& touch ) - { - // quit the application - mApplication.Quit(); - 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(); - unsigned int actorCount( mRowsPerPage*mColumnsPerPage * mPageCount ); - mActor.resize( actorCount ); - - for( size_t i(0); i mActor; - std::vector mImageView; - Actor mParent; - - Vector3 mSize; - unsigned int mRowsPerPage; - unsigned int mColumnsPerPage; - unsigned int mPageCount; - - Animation mShow; - Animation mScroll; - Animation mHide; -}; - -void RunTest( Application& application ) -{ - PerfScroll test( application ); - - application.MainLoop(); -} - -// Entry point for Linux & Tizen applications -// -int main( int argc, char **argv ) -{ - Application application = Application::New( &argc, &argv ); - - for( int i(1) ; i < argc; ++i ) - { - std::string arg( argv[i] ); - if( arg.compare("--use-mesh") == 0) - { - gUseMesh = true; - } - else if( arg.compare("--use-imageview") == 0) - { - gUseImageView = true; - } - else if( arg.compare("--nine-patch" ) == 0) - { - gNinePatch = true; - } - else if( arg.compare(0, 2, "-t" ) == 0) - { - gDuration = atof( arg.substr( 2, arg.size()).c_str()); - } - } - - RunTest( application ); - - return 0; -} -- 2.7.4