From: Ferran Sole Date: Tue, 24 Jan 2017 17:57:39 +0000 (+0000) Subject: Removed Atlas example X-Git-Tag: dali_1.2.24~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=2174695856f00d6705e2c95c81e4d3a4b911eb91 Removed Atlas example Change-Id: I48cb4bef5d1e5bcb9f32bbd3e04cf186387dcce3 --- diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml index 4b3c4d0..056fa48 100644 --- a/com.samsung.dali-demo.xml +++ b/com.samsung.dali-demo.xml @@ -106,9 +106,6 @@ - - - diff --git a/examples/atlas/atlas-example.cpp b/examples/atlas/atlas-example.cpp deleted file mode 100644 index 05483dc..0000000 --- a/examples/atlas/atlas-example.cpp +++ /dev/null @@ -1,245 +0,0 @@ -/* - * Copyright (c) 2017 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 "shared/view.h" -#include -#include - -using namespace Dali; - -class AtlasController; - -namespace -{ -const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" ); -const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); -const char * const LOSE_CONTEXT_IMAGE( DEMO_IMAGE_DIR "icon-cluster-wobble.png" ); -const char * const LOSE_CONTEXT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-cluster-wobble-selected.png" ); - -Application gApplication; -AtlasController* gAtlasController(NULL); -} - -class AtlasController : public ConnectionTracker -{ -public: - - AtlasController( Application& application ) - : mApplication( application ) - { - // Connect to the Application's Init signal - mApplication.InitSignal().Connect( this, &AtlasController::Create ); - } - - ~AtlasController() - { - // Nothing to do here; - } - - void Create( Application& application ) - { - // Get a handle to the stage - Stage stage = Stage::GetCurrent(); - stage.SetBackgroundColor(Color::YELLOW); - - // Respond to a click anywhere on the stage - stage.KeyEventSignal().Connect(this, &AtlasController::OnKeyEvent); - - mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - - mContentLayer = DemoHelper::CreateView( mApplication, - mView, - mToolBar, - BACKGROUND_IMAGE, - TOOLBAR_IMAGE, - "Atlas" ); - - mLoseContextButton = Toolkit::PushButton::New(); - mLoseContextButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, LOSE_CONTEXT_IMAGE ); - mLoseContextButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, LOSE_CONTEXT_IMAGE_SELECTED ); - mLoseContextButton.ClickedSignal().Connect( this, &AtlasController::OnLoseContextButtonClicked ); - mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); - - mAtlas = Atlas::New( 400,700, Pixel::RGBA8888); - mAtlas.Clear(Vector4(0.f,0.5f,0.5f,0.25f)); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-change.png", 50, 30 ); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 ); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-effects-on.png", 150, 30 ); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-cross.png", 100, 80 ); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-fold.png", 150, 80 ); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-wave.png", 200, 80 ); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 ); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 ); - mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 ); - - UploadBufferImages(); - UploadPixelData(); - - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-1.jpg", 4, 304 ); - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-2.jpg", 136, 304 ); - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-3.jpg", 268, 304 ); - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-4.jpg", 4, 436 ); - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-5.jpg", 136, 436 ); - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-6.jpg", 268, 436 ); - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 4, 568 ); - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 136, 568 ); - mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 268, 568 ); - - - Toolkit::ImageView imageView = Toolkit::ImageView::New( mAtlas ); - - imageView.SetParentOrigin(ParentOrigin::CENTER); - mContentLayer.Add( imageView ); - - mPanGestureDetector = PanGestureDetector::New(); - mPanGestureDetector.DetectedSignal().Connect( this, &AtlasController::OnPanGesture ); - mPanGestureDetector.Attach( imageView ); - - stage.ContextLostSignal().Connect( this, &AtlasController::OnContextLost ); - stage.ContextRegainedSignal().Connect( this, &AtlasController::OnContextRegained ); - } - - void UploadBufferImages() - { - mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 1.f, 0.5f ), 80, 90 ), 0, 210 ); - mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 0.75f, 0.5f ), 80, 80 ), 40, 210 ); - mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 0.5f, 0.5f ), 80, 70 ), 80, 210 ); - mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 0.25f, 0.5f ), 80, 60 ), 120, 210 ); - mAtlas.Upload( CreateBufferImage( Vector4(1.f, 1.f, 0.f, 0.5f ), 80, 50 ), 160, 210 ); - mAtlas.Upload( CreateBufferImage( Vector4(0.75f, 0.75f, 0.f, 0.5f ), 80, 40 ), 200, 210 ); - mAtlas.Upload( CreateBufferImage( Vector4(0.5f, 0.5f, 0.f, 0.5f ), 80, 30 ), 240, 210 ); - mAtlas.Upload( CreateBufferImage( Vector4(0.25f, 0.25f, 0.f, 0.5f ), 80, 20 ), 280, 210 ); - mAtlas.Upload( CreateBufferImage( Vector4(0.1f, 0.1f, 0.f, 0.5f ), 80, 10 ), 320, 210 ); - } - - void UploadPixelData() - { - mAtlas.Upload( CreatePixelData( Vector3(1.f, 1.f, 0.f ), 40, 40 ), 320, 30 ); - mAtlas.Upload( CreatePixelData( Vector3(0.f, 1.f, 1.f ), 40, 40 ), 320, 80 ); - mAtlas.Upload( CreatePixelData( Vector3(1.f, 0.f, 1.f ), 40, 40 ), 320, 130 ); - } - - static void NewWindow(void) - { - PositionSize posSize(0, 0, 720, 1280); - gApplication.ReplaceWindow(posSize, "NewWindow"); // Generates a new window - } - - bool OnLoseContextButtonClicked( Toolkit::Button button ) - { - // Add as an idle callback to avoid ProcessEvents being recursively called. - mApplication.AddIdle(MakeCallback( AtlasController::NewWindow )); - return true; - } - - void OnKeyEvent( const KeyEvent& event ) - { - if(event.state == KeyEvent::Down) - { - if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) - { - mApplication.Quit(); - } - } - } - - void OnPanGesture( Actor actor, const PanGesture& gesture ) - { - if( gesture.state == Gesture::Continuing ) - { - actor.TranslateBy( Vector3( gesture.displacement ) ); - } - } - - void OnContextLost() - { - printf("Stage reporting context loss\n"); - } - - void OnContextRegained() - { - printf("Stage reporting context regain\n"); - UploadBufferImages(); - UploadPixelData(); - } - -private: - - BufferImage CreateBufferImage( const Vector4& color, const unsigned int width, const unsigned int height ) - { - BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 ); - - // Create the image - PixelBuffer* pixbuf = imageData.GetBuffer(); - const unsigned int bitmapSize = width * height; - for( size_t i = 0; i < bitmapSize; ++i ) - { - pixbuf[i*4+0] = 0xFF * color.r; - pixbuf[i*4+1] = 0xFF * color.g; - pixbuf[i*4+2] = 0xFF * color.b; - pixbuf[i*4+3] = 0xFF * color.a; - } - - return imageData; - } - - PixelData CreatePixelData( const Vector3& color, const unsigned int width, const unsigned int height ) - { - unsigned int size = width*height; - unsigned int bufferSize = size * Pixel::GetBytesPerPixel(Pixel::RGB888); - unsigned char* pixels = new unsigned char [bufferSize]; - for( unsigned int i = 0; i < size; i++ ) - { - pixels[i*3u] = 0xFF * color.x; - pixels[i*3u+1u] = 0xFF * color.y; - pixels[i*3u+2u] = 0xFF * color.z; - } - return PixelData::New( pixels, bufferSize, width, height, Pixel::RGB888, PixelData::DELETE_ARRAY ); - } - - -private: - Application& mApplication; - PanGestureDetector mPanGestureDetector; - - Toolkit::Control mView; ///< The View instance. - Toolkit::ToolBar mToolBar; ///< The View's Toolbar. - Layer mContentLayer; ///< Content layer (scrolling cluster content) - Toolkit::PushButton mLoseContextButton; - Atlas mAtlas; -}; - -void RunTest( Application& application ) -{ - gAtlasController = new AtlasController(application); - application.MainLoop(Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS); -} - -// Entry point for Linux & Tizen applications -// -int DALI_EXPORT_API main( int argc, char **argv ) -{ - gApplication = Application::New( &argc, &argv, DEMO_THEME_PATH ); - - RunTest( gApplication ); - - return 0; -} diff --git a/shared/utility.h b/shared/utility.h index ece3327..283ae33 100644 --- a/shared/utility.h +++ b/shared/utility.h @@ -19,7 +19,6 @@ */ #include -#include #include #include #include