X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fmotion-stretch%2Fmotion-stretch-example.cpp;h=0dc404d6914fcba08653726d26f2f29235faad1b;hb=2e182925204bf3ef9f2a36cbfbf998e79fbafaf5;hp=98a838011625f0a3babe2753f424e652abd17c75;hpb=d6045205a5493e9d1509fa286cf9bc588e3529ac;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp index 98a8380..0dc404d 100644 --- a/examples/motion-stretch/motion-stretch-example.cpp +++ b/examples/motion-stretch/motion-stretch-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -21,6 +21,7 @@ #include "shared/view.h" #include #include +#include using namespace Dali; using namespace Dali::Toolkit; @@ -39,11 +40,11 @@ const float MOTION_STRETCH_ACTOR_WIDTH = 256; const float MOTION_STRETCH_ACTOR_HEIGHT = 256; // "" const int MOTION_STRETCH_NUM_ACTOR_IMAGES = 5; -const char* MOTION_STRETCH_ACTOR_IMAGE1( DALI_IMAGE_DIR "image-with-border-1.jpg" ); -const char* MOTION_STRETCH_ACTOR_IMAGE2( DALI_IMAGE_DIR "image-with-border-2.jpg" ); -const char* MOTION_STRETCH_ACTOR_IMAGE3( DALI_IMAGE_DIR "image-with-border-3.jpg" ); -const char* MOTION_STRETCH_ACTOR_IMAGE4( DALI_IMAGE_DIR "image-with-border-4.jpg" ); -const char* MOTION_STRETCH_ACTOR_IMAGE5( DALI_IMAGE_DIR "image-with-border-5.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE1( DEMO_IMAGE_DIR "image-with-border-1.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE2( DEMO_IMAGE_DIR "image-with-border-2.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE3( DEMO_IMAGE_DIR "image-with-border-3.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE4( DEMO_IMAGE_DIR "image-with-border-4.jpg" ); +const char* MOTION_STRETCH_ACTOR_IMAGE5( DEMO_IMAGE_DIR "image-with-border-5.jpg" ); const char* MOTION_STRETCH_ACTOR_IMAGES[] = { MOTION_STRETCH_ACTOR_IMAGE1, @@ -57,13 +58,16 @@ const int NUM_ACTOR_ANIMATIONS = 4; const int NUM_CAMERA_ANIMATIONS = 2; -const char* BACKGROUND_IMAGE_PATH = DALI_IMAGE_DIR "background-default.png"; +const char* BACKGROUND_IMAGE_PATH = DEMO_IMAGE_DIR "background-default.png"; -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); -const char* LAYOUT_IMAGE( DALI_IMAGE_DIR "icon-change.png" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); +const char* LAYOUT_IMAGE( DEMO_IMAGE_DIR "icon-change.png" ); +const char* LAYOUT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-change-selected.png" ); const char* APPLICATION_TITLE( "Motion Stretch" ); -const char* EFFECTS_OFF_ICON( DALI_IMAGE_DIR "icon-effects-off.png" ); -const char* EFFECTS_ON_ICON( DALI_IMAGE_DIR "icon-effects-on.png" ); +const char* EFFECTS_OFF_ICON( DEMO_IMAGE_DIR "icon-effects-off.png" ); +const char* EFFECTS_OFF_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-off-selected.png" ); +const char* EFFECTS_ON_ICON( DEMO_IMAGE_DIR "icon-effects-on.png" ); +const char* EFFECTS_ON_ICON_SELECTED( DEMO_IMAGE_DIR "icon-effects-on-selected.png" ); // These values depend on the button background image const Vector4 BUTTON_IMAGE_BORDER( Vector4::ONE * 3.0f ); @@ -106,7 +110,8 @@ public: : mApplication(app), mActorEffectsEnabled(false), mCurrentActorAnimation(0), - mCurrentImage(0) + mCurrentImage(0), + mOrientation( PORTRAIT ) { // Connect to the Application's Init signal app.InitSignal().Connect(this, &MotionStretchExampleApp::OnInit); @@ -124,8 +129,6 @@ public: { // The Init signal is received once (only) during the Application lifetime - DemoHelper::RequestThemeChange(); - Stage::GetCurrent().KeyEventSignal().Connect(this, &MotionStretchExampleApp::OnKeyEvent); // Creates a default view with a default tool bar. @@ -137,21 +140,25 @@ public: TOOLBAR_IMAGE, 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.SetProperty( Actor::Property::SIZE, Vector2( size, size ) ); + //Add an slideshow icon on the right of the title - mIconEffectsOff = ResourceImage::New( EFFECTS_OFF_ICON ); - mIconEffectsOn = ResourceImage::New( EFFECTS_ON_ICON ); mActorEffectsButton = Toolkit::PushButton::New(); - mActorEffectsButton.SetBackgroundImage( mIconEffectsOff ); + 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, &MotionStretchExampleApp::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) - Image imageLayout = ResourceImage::New( LAYOUT_IMAGE ); Toolkit::PushButton layoutButton = Toolkit::PushButton::New(); - layoutButton.SetBackgroundImage(imageLayout); + 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, &MotionStretchExampleApp::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 @@ -165,27 +172,27 @@ public: winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE ); winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); + winHandle.ResizedSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized ); - app.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged ); - unsigned int degrees = app.GetOrientation().GetDegrees(); - Rotate( static_cast< DeviceOrientation >( degrees ) ); - + // set initial orientation + Rotate( PORTRAIT ); /////////////////////////////////////////////////////// // // Motion stretched actor // + mMotionStretchEffect = Toolkit::CreateMotionStretchEffect(); + mMotionStretchEffect["url"] = MOTION_STRETCH_ACTOR_IMAGE1; + mMotionStretchImageView = ImageView::New(); + mMotionStretchImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionStretchEffect ); + mMotionStretchImageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mMotionStretchImageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); + mMotionStretchImageView.SetProperty( Actor::Property::SIZE, Vector2( MOTION_STRETCH_ACTOR_WIDTH, MOTION_STRETCH_ACTOR_HEIGHT ) ); - Image image = ResourceImage::New( MOTION_STRETCH_ACTOR_IMAGE1 ); - mMotionStretchImageActor = ImageActor::New(image); - mMotionStretchImageActor.SetParentOrigin( ParentOrigin::CENTER ); - mMotionStretchImageActor.SetAnchorPoint( AnchorPoint::CENTER ); - mMotionStretchImageActor.SetSize(MOTION_STRETCH_ACTOR_WIDTH, MOTION_STRETCH_ACTOR_HEIGHT); - - mContentLayer.Add( mMotionStretchImageActor ); + mContentLayer.Add( mMotionStretchImageView ); // Create shader used for doing motion stretch - mMotionStretchEffect = MotionStretchEffect::Apply(mMotionStretchImageActor); + Toolkit::SetMotionStretchProperties( mMotionStretchImageView ); } ////////////////////////////////////////////////////////////// @@ -194,22 +201,15 @@ public: // // - void OnOrientationChanged( Orientation orientation ) + void OnWindowResized( Window::WindowSize size ) { - unsigned int degrees = orientation.GetDegrees(); - Rotate( static_cast< DeviceOrientation >( degrees ) ); + Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT ); } void Rotate( DeviceOrientation orientation ) { // Resize the root actor - Vector2 stageSize = Stage::GetCurrent().GetSize(); - Vector2 targetSize = stageSize; - if( orientation == LANDSCAPE || - orientation == LANDSCAPE_INVERSE ) - { - targetSize = Vector2( stageSize.y, stageSize.x ); - } + const Vector2 targetSize = Stage::GetCurrent().GetSize(); if( mOrientation != orientation ) { @@ -220,22 +220,19 @@ public: { // has parent so we expect it to be on stage, start animation mRotateAnimation = Animation::New( ORIENTATION_DURATION ); - mRotateAnimation.AnimateTo( Property( mView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( -orientation ) ), Vector3::ZAXIS ), AlphaFunctions::EaseOut ); mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_WIDTH ), targetSize.width ); mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_HEIGHT ), targetSize.height ); mRotateAnimation.Play(); } else { - // set the rotation to match the orientation - mView.SetOrientation( Degree( -orientation ), Vector3::ZAXIS ); - 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 ); } } @@ -262,9 +259,9 @@ public: float animDuration = 0.5f; mActorTapMovementAnimation = Animation::New( animDuration ); - if ( mMotionStretchImageActor ) + if ( mMotionStretchImageView ) { - mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) ); + mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) ); } mActorTapMovementAnimation.SetEndAction( Animation::Bake ); mActorTapMovementAnimation.Play(); @@ -280,7 +277,7 @@ public: { float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunctions::EaseInOut ); + mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); mActorAnimation.SetEndAction( Animation::Bake ); mActorAnimation.Play(); } @@ -291,7 +288,7 @@ public: { float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunctions::EaseInOut ); + mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); mActorAnimation.SetEndAction( Animation::Bake ); mActorAnimation.Play(); } @@ -302,8 +299,8 @@ public: { float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunctions::EaseInOut ); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunctions::EaseInOut ); + mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); + mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); mActorAnimation.SetEndAction( Animation::Bake ); mActorAnimation.Play(); } @@ -314,7 +311,7 @@ public: { float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunctions::Bounce, TimePeriod( 0.0f, 1.0f ) ); + mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) ); mActorAnimation.SetEndAction( Animation::Bake ); mActorAnimation.Play(); } @@ -337,12 +334,14 @@ public: if(!mActorEffectsEnabled) { mActorEffectsEnabled = true; - mActorEffectsButton.SetBackgroundImage( mIconEffectsOn ); + 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.SetBackgroundImage( mIconEffectsOff ); + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON ); + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); } } @@ -393,24 +392,22 @@ public: mCurrentImage = 0; } - Image stretchImage = ResourceImage::New( MOTION_STRETCH_ACTOR_IMAGES[mCurrentImage] ); - mMotionStretchImageActor.SetImage(stretchImage); + mMotionStretchEffect["url"] = MOTION_STRETCH_ACTOR_IMAGES[mCurrentImage]; + mMotionStretchImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionStretchEffect ); } private: Application& mApplication; ///< Application instance - Toolkit::View mView; + Toolkit::Control mView; Toolkit::ToolBar mToolBar; - Image mIconEffectsOff; - Image mIconEffectsOn; Layer mContentLayer; ///< Content layer (contains actor for this stretch demo) PushButton mActorEffectsButton; ///< The actor effects toggling Button. // Motion stretch - MotionStretchEffect mMotionStretchEffect; - ImageActor mMotionStretchImageActor; + Property::Map mMotionStretchEffect; + ImageView mMotionStretchImageView; // animate actor to position where user taps screen Animation mActorTapMovementAnimation; @@ -430,20 +427,10 @@ private: }; -void RunTest(Application& app) +int DALI_EXPORT_API main(int argc, char **argv) { + Application app = Application::New(&argc, &argv, DEMO_THEME_PATH); MotionStretchExampleApp test(app); - app.MainLoop(); -} - -// Entry point for Linux & Tizen applications -// -int main(int argc, char **argv) -{ - Application app = Application::New(&argc, &argv); - - RunTest(app); - return 0; }