X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fmotion-blur%2Fmotion-blur-example.cpp;h=5df3cc4241ac2593846c4f051ddfe87f1e42505b;hb=4f818cd12c9bf2773d44e5cfdc2fc0a344abf7f5;hp=08f5feadc84dcf88320441cfb9ab51735e62bc5c;hpb=87fcf735248b99b2b722c7f2ee1df12164807dc4;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp index 08f5fea..5df3cc4 100644 --- a/examples/motion-blur/motion-blur-example.cpp +++ b/examples/motion-blur/motion-blur-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -20,8 +20,8 @@ #include "shared/view.h" #include +#include #include -#include #include using namespace Dali; @@ -149,12 +149,13 @@ public: void OnInit(Application& app) { // The Init signal is received once (only) during the Application lifetime + Window window = app.GetWindow(); - Stage::GetCurrent().KeyEventSignal().Connect(this, &MotionBlurExampleApp::OnKeyEvent); + window.KeyEventSignal().Connect(this, &MotionBlurExampleApp::OnKeyEvent); // Creates a default view with a default tool bar. - // The view is added to the stage. + // The view is added to the window. mContentLayer = DemoHelper::CreateView( mApplication, mView, mToolBar, @@ -163,24 +164,24 @@ public: APPLICATION_TITLE ); // Ensure the content layer is a square so the touch area works in all orientations - Vector2 stageSize = Stage::GetCurrent().GetSize(); - float size = std::max( stageSize.width, stageSize.height ); - mContentLayer.SetSize( size, size ); + Vector2 windowSize = window.GetSize(); + float size = std::max( windowSize.width, windowSize.height ); + mContentLayer.SetProperty( Actor::Property::SIZE, Vector2( size, size ) ); //Add an effects icon on the right of the title mActorEffectsButton = Toolkit::PushButton::New(); - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON ); - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON ); + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); mActorEffectsButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnEffectButtonClicked ); mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); // Creates a mode button. // Create a effect toggle button. (right of toolbar) Toolkit::PushButton layoutButton = Toolkit::PushButton::New(); - layoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE ); - layoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED ); + layoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE ); + layoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED ); layoutButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnLayoutButtonClicked); - layoutButton.SetLeaveRequired( true ); + layoutButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); // Input @@ -193,7 +194,7 @@ public: winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE ); winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); - winHandle.ResizedSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized ); + winHandle.ResizeSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized ); // set initial orientation Rotate( PORTRAIT ); @@ -204,14 +205,16 @@ public: // // Scale down actor to fit on very low resolution screens with space to interact: - mMotionBlurActorSize = Size( std::min( stageSize.x * 0.3f, MOTION_BLUR_ACTOR_WIDTH ), std::min( stageSize.y * 0.3f, MOTION_BLUR_ACTOR_HEIGHT ) ); + mMotionBlurActorSize = Size( std::min( windowSize.x * 0.3f, MOTION_BLUR_ACTOR_WIDTH ), std::min( windowSize.y * 0.3f, MOTION_BLUR_ACTOR_HEIGHT ) ); + mMotionBlurActorUpdateSize = Size( std::max( mMotionBlurActorSize.x, mMotionBlurActorSize.y ), std::max( mMotionBlurActorSize.x, mMotionBlurActorSize.y ) ); mMotionBlurActorSize = Size( std::min( mMotionBlurActorSize.x, mMotionBlurActorSize.y ), std::min( mMotionBlurActorSize.x, mMotionBlurActorSize.y ) ); mMotionBlurEffect = CreateMotionBlurEffect(); mMotionBlurImageView = ImageView::New(); SetImageFittedInBox( mMotionBlurImageView, mMotionBlurEffect, MOTION_BLUR_ACTOR_IMAGE1, mMotionBlurActorSize.x, mMotionBlurActorSize.y ); - mMotionBlurImageView.SetParentOrigin( ParentOrigin::CENTER ); - mMotionBlurImageView.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y); + mMotionBlurImageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mMotionBlurImageView.SetProperty( Actor::Property::SIZE, mMotionBlurActorUpdateSize ); + mMotionBlurImageView.SetProperty( DevelActor::Property::UPDATE_SIZE_HINT, mMotionBlurActorUpdateSize ); mContentLayer.Add( mMotionBlurImageView ); @@ -229,7 +232,7 @@ public: // // - void OnWindowResized( Window::WindowSize size ) + void OnWindowResized( Window window, Window::WindowSize size ) { Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT ); } @@ -237,16 +240,16 @@ public: void Rotate( DeviceOrientation orientation ) { // Resize the root actor - const Vector2 targetSize = Stage::GetCurrent().GetSize(); + const Vector2 targetSize = mApplication.GetWindow().GetSize(); if( mOrientation != orientation ) { mOrientation = orientation; - // check if actor is on stage + // check if actor is on window if( mView.GetParent() ) { - // has parent so we expect it to be on stage, start animation + // has parent so we expect it to be on window, start animation mRotateAnimation = Animation::New( ORIENTATION_DURATION ); mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_WIDTH ), targetSize.width ); mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_HEIGHT ), targetSize.height ); @@ -254,13 +257,13 @@ public: } else { - mView.SetSize( targetSize ); + mView.SetProperty( Actor::Property::SIZE, targetSize ); } } else { // for first time just set size - mView.SetSize( targetSize ); + mView.SetProperty( Actor::Property::SIZE, targetSize ); } } @@ -278,8 +281,8 @@ public: float originOffsetX, originOffsetY; // rotate offset (from top left origin to centre) into actor space - Vector2 stageSize = Dali::Stage::GetCurrent().GetSize(); - actor.ScreenToLocal(originOffsetX, originOffsetY, stageSize.width * 0.5f, stageSize.height * 0.5f); + Vector2 windowSize = mApplication.GetWindow().GetSize(); + actor.ScreenToLocal(originOffsetX, originOffsetY, windowSize.width * 0.5f, windowSize.height * 0.5f); // get dest point in local actor space destPos.x = tapGesture.localPoint.x - originOffsetX; @@ -292,7 +295,7 @@ public: { mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) ); } - mActorTapMovementAnimation.SetEndAction( Animation::Bake ); + mActorTapMovementAnimation.SetEndAction( Animation::BAKE ); mActorTapMovementAnimation.Play(); @@ -307,7 +310,7 @@ public: float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); - mActorAnimation.SetEndAction( Animation::Bake ); + mActorAnimation.SetEndAction( Animation::BAKE ); mActorAnimation.Play(); } break; @@ -318,7 +321,7 @@ public: float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); - mActorAnimation.SetEndAction( Animation::Bake ); + mActorAnimation.SetEndAction( Animation::BAKE ); mActorAnimation.Play(); } break; @@ -330,7 +333,7 @@ public: mActorAnimation = Animation::New(animDuration); mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); - mActorAnimation.SetEndAction( Animation::Bake ); + mActorAnimation.SetEndAction( Animation::BAKE ); mActorAnimation.Play(); } break; @@ -341,7 +344,7 @@ public: float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) ); - mActorAnimation.SetEndAction( Animation::Bake ); + mActorAnimation.SetEndAction( Animation::BAKE ); mActorAnimation.Play(); } break; @@ -363,14 +366,14 @@ public: if(!mActorEffectsEnabled) { mActorEffectsEnabled = true; - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON ); - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED ); + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON ); + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED ); } else { mActorEffectsEnabled = false; - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON ); - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON ); + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); } } @@ -397,7 +400,7 @@ public: */ void OnKeyEvent(const KeyEvent& event) { - if(event.state == KeyEvent::Down) + if(event.GetState() == KeyEvent::DOWN) { if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) { @@ -438,6 +441,7 @@ private: Property::Map mMotionBlurEffect; ImageView mMotionBlurImageView; Size mMotionBlurActorSize; + Size mMotionBlurActorUpdateSize; // animate actor to position where user taps screen Animation mActorTapMovementAnimation;