X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=examples%2Fpage-turn-view%2Fpage-turn-view-example.cpp;h=7c40ef403f169853a4d3d1ff251bd74d3a83a974;hb=b7bac3bf4823689a0ea4d94a61c91a95e849c134;hp=c7b15f869166fcd92d96aef14306a9b804824c88;hpb=3e35e7a8d6a0a9c7b668b9dd6afc7134b65bdd60;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp index c7b15f8..7c40ef4 100644 --- a/examples/page-turn-view/page-turn-view-example.cpp +++ b/examples/page-turn-view/page-turn-view-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -17,7 +17,10 @@ #include #include -#include +#include +#include +#include +#include #include #include @@ -25,6 +28,7 @@ #include #include "shared/view.h" +#include "shared/utility.h" using namespace Dali; using namespace Dali::Toolkit; @@ -39,9 +43,9 @@ const char* const CHANGE_IMAGE_ICON_SELECTED( DEMO_IMAGE_DIR "icon-change-select // set a ratio to modify the current page number when the rotation is changed const float PAGE_NUMBER_CORRESPONDING_RATIO(1.25f); -const char* BOOK_COVER_PORTRAIT = ( DEMO_IMAGE_DIR "book-portrait-cover.jpg" ); -const char* BOOK_COVER_LANDSCAPE = ( DEMO_IMAGE_DIR "book-landscape-cover.jpg" ); -const char* BOOK_COVER_BACK_LANDSCAPE = ( DEMO_IMAGE_DIR "book-landscape-cover-back.jpg" ); +const char* BOOK_COVER_PORTRAIT( DEMO_IMAGE_DIR "book-portrait-cover.jpg" ); +const char* BOOK_COVER_LANDSCAPE( DEMO_IMAGE_DIR "book-landscape-cover.jpg" ); +const char* BOOK_COVER_BACK_LANDSCAPE( DEMO_IMAGE_DIR "book-landscape-cover-back.jpg" ); const char* PAGE_IMAGES_PORTRAIT[] = { @@ -66,6 +70,21 @@ const char* PAGE_IMAGES_LANDSCAPE[] = }; const unsigned int NUMBER_OF_LANDSCAPE_IMAGE( sizeof(PAGE_IMAGES_LANDSCAPE) / sizeof(PAGE_IMAGES_LANDSCAPE[0]) ); +Texture LoadTextures( const char* imagePath1, const char* imagePath2 ) +{ + PixelData pixelData1 = DemoHelper::LoadPixelData( imagePath1, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT ); + PixelData pixelData2 = DemoHelper::LoadPixelData( imagePath2, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT ); + + unsigned int width = pixelData1.GetWidth() + pixelData2.GetWidth(); + unsigned int height = pixelData1.GetHeight() > pixelData2.GetHeight() ? pixelData1.GetHeight() : pixelData2.GetHeight(); + + Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGB888, width, height ); + texture.Upload( pixelData1 ); + texture.Upload( pixelData2, 0u, 0u, pixelData1.GetWidth(), 0u, pixelData2.GetWidth(), pixelData2.GetHeight() ); + + return texture; +} + }// end LOCAL STUFF class PortraitPageFactory : public PageFactory @@ -79,21 +98,21 @@ class PortraitPageFactory : public PageFactory return 10*NUMBER_OF_PORTRAIT_IMAGE + 1; } /** - * Create an image to represent a page. + * Create an texture to represent a page. * @param[in] pageId The ID of the page to create. - * @return An image, or an uninitialized pointer if the ID is out of range. + * @return A texture, or an uninitialized handle if the ID is out of range. */ - virtual Image NewPage( unsigned int pageId ) + virtual Texture NewPage( unsigned int pageId ) { - Image page; + Texture page; if( pageId == 0 ) { - page = ResourceImage::New( BOOK_COVER_PORTRAIT ); + page = DemoHelper::LoadTexture( BOOK_COVER_PORTRAIT ); } else { - page = ResourceImage::New( PAGE_IMAGES_PORTRAIT[ (pageId-1) % NUMBER_OF_PORTRAIT_IMAGE ] ); + page = DemoHelper::LoadTexture( PAGE_IMAGES_PORTRAIT[ (pageId-1) % NUMBER_OF_PORTRAIT_IMAGE ] ); } return page; @@ -112,42 +131,32 @@ class LandscapePageFactory : public PageFactory return 10*NUMBER_OF_LANDSCAPE_IMAGE / 2 + 1; } /** - * Create an image to represent a page. + * Create an texture to represent a page. * @param[in] pageId The ID of the page to create. - * @return An image, or an uninitialized pointer if the ID is out of range. + * @return A texture, or an uninitialized handle if the ID is out of range. */ - virtual Image NewPage( unsigned int pageId ) + virtual Texture NewPage( unsigned int pageId ) { - if( mImageSize.GetWidth() == 0u || mImageSize.GetHeight() == 0u ) - { - mImageSize = ResourceImage::GetImageSize(BOOK_COVER_LANDSCAPE); - } - - ImageAtlas atlas = ImageAtlas::New( mImageSize.GetWidth()*2u, mImageSize.GetHeight(), Pixel::RGB888 ); - Vector4 textureRect; + Texture page; if( pageId == 0 ) { - atlas.Upload( textureRect, BOOK_COVER_LANDSCAPE, mImageSize ); - atlas.Upload( textureRect, BOOK_COVER_BACK_LANDSCAPE, mImageSize ); + page = LoadTextures( BOOK_COVER_LANDSCAPE, BOOK_COVER_BACK_LANDSCAPE ); } else { unsigned int imageId = (pageId-1)*2; - atlas.Upload( textureRect, PAGE_IMAGES_LANDSCAPE[ imageId % NUMBER_OF_LANDSCAPE_IMAGE ], mImageSize ); - atlas.Upload( textureRect, PAGE_IMAGES_LANDSCAPE[ (imageId+1) % NUMBER_OF_LANDSCAPE_IMAGE ], mImageSize ); + page = LoadTextures( PAGE_IMAGES_LANDSCAPE[ imageId % NUMBER_OF_LANDSCAPE_IMAGE ], PAGE_IMAGES_LANDSCAPE[ (imageId+1) % NUMBER_OF_LANDSCAPE_IMAGE ] ); } - return atlas.GetAtlas(); + return page; } - - ImageDimensions mImageSize; }; /** * This example shows how to use the page turn UI control to implement the page-turn demo * The effect follows the pan gesture to animate the page - * Pan the image inwards, the page will bent, - * Depends on the distance of the panning, the image might turn over or slide back + * Pan the page inwards, the page will bent, + * Depends on the distance of the panning, the page might turn over or slide back * Also, in portrait view, the pan gesture outwards from position near the spine could turn the previous page back * Allows to turn multiple pages one by one quickly towards the same direction, multiple animations are launched in this case */ @@ -234,6 +243,9 @@ void PageTurnController::OnInit( Application& app ) Stage::GetCurrent().KeyEventSignal().Connect(this, &PageTurnController::OnKeyEvent); + // Hide the indicator bar + app.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); + Stage stage = Stage::GetCurrent(); Vector2 stageSize = stage.GetSize(); @@ -353,7 +365,7 @@ void PageTurnController::OnPageFinishedPan( PageTurnView pageTurnView ) } // Entry point for applications -int main( int argc, char **argv ) +int DALI_EXPORT_API main( int argc, char **argv ) { Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); PageTurnController test ( app );