X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fmotion-stretch%2Fmotion-stretch-example.cpp;h=7b815fa6a18e64ba097102ff2f722b1d23661390;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hp=9653df01e461c63035200b9e02f7f9987a3dd4ab;hpb=c86f3253994d6ed529aa07fcc943c60093a1a3ad;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 9653df0..7b815fa 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) 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. @@ -15,36 +15,34 @@ * */ -#include #include +#include -#include "shared/view.h" -#include #include #include +#include +#include +#include "shared/view.h" using namespace Dali; using namespace Dali::Toolkit; - - namespace // unnamed namespace { - //////////////////////////////////////////////////// // // Demo setup parameters // -const float MOTION_STRETCH_ACTOR_WIDTH = 256; // actor size on screen -const float MOTION_STRETCH_ACTOR_HEIGHT = 256; // "" +const float MOTION_STRETCH_ACTOR_WIDTH = 256; // actor size on screen +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 int MOTION_STRETCH_NUM_ACTOR_IMAGES = 5; +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, @@ -54,51 +52,46 @@ const char* MOTION_STRETCH_ACTOR_IMAGES[] = { MOTION_STRETCH_ACTOR_IMAGE5, }; -const int NUM_ACTOR_ANIMATIONS = 4; +const int NUM_ACTOR_ANIMATIONS = 4; const int NUM_CAMERA_ANIMATIONS = 2; +const char* BACKGROUND_IMAGE_PATH = DEMO_IMAGE_DIR "background-default.png"; -const char* BACKGROUND_IMAGE_PATH = DALI_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* LAYOUT_IMAGE_SELECTED( DALI_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_OFF_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-off-selected.png" ); -const char* EFFECTS_ON_ICON( DALI_IMAGE_DIR "icon-effects-on.png" ); -const char* EFFECTS_ON_ICON_SELECTED( DALI_IMAGE_DIR "icon-effects-on-selected.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(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 ); +const Vector4 BUTTON_IMAGE_BORDER(Vector4::ONE * 3.0f); -const float UI_MARGIN = 4.0f; ///< Screen Margin for placement of UI buttons +const float UI_MARGIN = 4.0f; ///< Screen Margin for placement of UI buttons -const Vector3 BUTTON_SIZE_CONSTRAINT( 0.24f, 0.09f, 1.0f ); +const Vector3 BUTTON_SIZE_CONSTRAINT(0.24f, 0.09f, 1.0f); // move this button down a bit so it is visible on target and not covered up by toolbar const float BUTTON_TITLE_LABEL_Y_OFFSET = 0.05f; -const float ORIENTATION_DURATION = 0.5f; ///< Time to rotate to new orientation. +const float ORIENTATION_DURATION = 0.5f; ///< Time to rotate to new orientation. } // unnamed namespace - - - // class MotionStretchExampleApp : public ConnectionTracker { public: - /** * DeviceOrientation describes the four different * orientations the device can be in based on accelerometer reports. */ enum DeviceOrientation { - PORTRAIT = 0, - LANDSCAPE = 90, - PORTRAIT_INVERSE = 180, + PORTRAIT = 0, + LANDSCAPE = 90, + PORTRAIT_INVERSE = 180, LANDSCAPE_INVERSE = 270 }; @@ -106,11 +99,12 @@ public: * Constructor * @param application class, stored as reference */ - MotionStretchExampleApp(Application &app) + MotionStretchExampleApp(Application& app) : 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); @@ -127,77 +121,74 @@ 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, &MotionStretchExampleApp::OnKeyEvent); + window.KeyEventSignal().Connect(this, &MotionStretchExampleApp::OnKeyEvent); // Creates a default view with a default tool bar. - // The view is added to the stage. - mContentLayer = DemoHelper::CreateView( mApplication, - mView, - mToolBar, - BACKGROUND_IMAGE_PATH, - TOOLBAR_IMAGE, - APPLICATION_TITLE ); + // The view is added to the window. + mContentLayer = DemoHelper::CreateView(mApplication, + mView, + mToolBar, + BACKGROUND_IMAGE_PATH, + TOOLBAR_IMAGE, + APPLICATION_TITLE); + + // Ensure the content layer is a square so the touch area works in all orientations + Vector2 windowSize = window.GetSize(); + float size = std::max(windowSize.width, windowSize.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 ); - mIconEffectsOffSelected = ResourceImage::New( EFFECTS_OFF_ICON_SELECTED ); - mIconEffectsOn = ResourceImage::New( EFFECTS_ON_ICON ); - mIconEffectsOnSelected = ResourceImage::New( EFFECTS_ON_ICON_SELECTED ); mActorEffectsButton = Toolkit::PushButton::New(); - mActorEffectsButton.SetButtonImage( mIconEffectsOff ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected ); - mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked ); - mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); + 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::HORIZONTAL_CENTER, DemoHelper::DEFAULT_PLAY_PADDING); // Creates a mode button. // Create a effect toggle button. (right of toolbar) - Image imageLayout = ResourceImage::New( LAYOUT_IMAGE ); - Image imageLayoutSelected = ResourceImage::New( LAYOUT_IMAGE_SELECTED ); Toolkit::PushButton layoutButton = Toolkit::PushButton::New(); - layoutButton.SetButtonImage( imageLayout ); - layoutButton.SetSelectedImage( imageLayoutSelected ); - layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked); - layoutButton.SetLeaveRequired( true ); - mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); + 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.SetProperty(Actor::Property::LEAVE_REQUIRED, true); + mToolBar.AddControl(layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING); // Input mTapGestureDetector = TapGestureDetector::New(); - mTapGestureDetector.Attach( mContentLayer ); - mTapGestureDetector.DetectedSignal().Connect( this, &MotionStretchExampleApp::OnTap ); + mTapGestureDetector.Attach(mContentLayer); + mTapGestureDetector.DetectedSignal().Connect(this, &MotionStretchExampleApp::OnTap); // set initial orientation Dali::Window winHandle = app.GetWindow(); - winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT ); - winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE ); - winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); - winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); - - // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionStretchExampleApp::OnOrientationChanged ); - unsigned int degrees = 0; - Rotate( static_cast< DeviceOrientation >( degrees ) ); + winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT); + winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE); + winHandle.AddAvailableOrientation(Dali::Window::PORTRAIT_INVERSE); + winHandle.AddAvailableOrientation(Dali::Window::LANDSCAPE_INVERSE); + winHandle.ResizeSignal().Connect(this, &MotionStretchExampleApp::OnWindowResized); + // set initial orientation + Rotate(PORTRAIT); /////////////////////////////////////////////////////// // // Motion stretched actor // - - 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 ); + 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)); + // Add stretch padding + mMotionStretchImageView.SetProperty(DevelActor::Property::UPDATE_SIZE_HINT, Vector2(MOTION_STRETCH_ACTOR_WIDTH + 32, MOTION_STRETCH_ACTOR_HEIGHT + 32)); + + mContentLayer.Add(mMotionStretchImageView); // Create shader used for doing motion stretch - mMotionStretchEffect = Toolkit::CreateMotionStretchEffect(); - Dali::Property::Index uModelProperty = mMotionStretchEffect.GetPropertyIndex( "uModelLastFrame" ); - Constraint constraint = Constraint::New( mMotionStretchEffect, uModelProperty, EqualToConstraint() ); - constraint.AddSource( Source( mMotionStretchImageActor , Actor::Property::WORLD_MATRIX ) ); - constraint.Apply(); - mMotionStretchImageActor.SetShaderEffect( mMotionStretchEffect ); + Toolkit::SetMotionStretchProperties(mMotionStretchImageView); } ////////////////////////////////////////////////////////////// @@ -206,48 +197,38 @@ public: // // - void OnOrientationChanged( Orientation orientation ) + void OnWindowResized(Window window, Window::WindowSize size) { - unsigned int degrees = orientation.GetDegrees(); - Rotate( static_cast< DeviceOrientation >( degrees ) ); + Rotate(size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT); } - void Rotate( DeviceOrientation orientation ) + 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 = mApplication.GetWindow().GetSize(); - if( mOrientation != orientation ) + if(mOrientation != orientation) { mOrientation = orientation; - // check if actor is on stage - if( mView.GetParent() ) + // check if actor is on window + if(mView.GetParent()) { - // 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 ), AlphaFunction::EASE_OUT ); - mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_WIDTH ), targetSize.width ); - mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_HEIGHT ), targetSize.height ); + // 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); 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); } } @@ -258,30 +239,30 @@ public: // // move to point on screen that was tapped - void OnTap( Actor actor, const TapGesture& tapGesture ) + void OnTap(Actor actor, const TapGesture& tapGesture) { Vector3 destPos; - float originOffsetX, originOffsetY; + 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; - destPos.y = tapGesture.localPoint.y - originOffsetY; - destPos.z = 0.0f; - - float animDuration = 0.5f; - mActorTapMovementAnimation = Animation::New( animDuration ); - if ( mMotionStretchImageActor ) + const Vector2& localPoint = tapGesture.GetLocalPoint(); + destPos.x = localPoint.x - originOffsetX; + destPos.y = localPoint.y - originOffsetY; + destPos.z = 0.0f; + + float animDuration = 0.5f; + mActorTapMovementAnimation = Animation::New(animDuration); + if(mMotionStretchImageView) { - mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) ); + mActorTapMovementAnimation.AnimateTo(Property(mMotionStretchImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration)); } - mActorTapMovementAnimation.SetEndAction( Animation::Bake ); + mActorTapMovementAnimation.SetEndAction(Animation::BAKE); mActorTapMovementAnimation.Play(); - // perform some spinning etc if(mActorEffectsEnabled) { @@ -291,9 +272,9 @@ public: case 0: { float animDuration = 1.0f; - mActorAnimation = Animation::New(animDuration); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); - mActorAnimation.SetEndAction( Animation::Bake ); + mActorAnimation = Animation::New(animDuration); + mActorAnimation.AnimateBy(Property(mMotionStretchImageView, Actor::Property::ORIENTATION), Quaternion(Radian(Degree(360.0f)), Vector3::YAXIS), AlphaFunction::EASE_IN_OUT); + mActorAnimation.SetEndAction(Animation::BAKE); mActorAnimation.Play(); } break; @@ -302,9 +283,9 @@ public: case 1: { float animDuration = 1.0f; - mActorAnimation = Animation::New(animDuration); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); - mActorAnimation.SetEndAction( Animation::Bake ); + mActorAnimation = Animation::New(animDuration); + mActorAnimation.AnimateBy(Property(mMotionStretchImageView, Actor::Property::ORIENTATION), Quaternion(Radian(Degree(360.0f)), Vector3::ZAXIS), AlphaFunction::EASE_IN_OUT); + mActorAnimation.SetEndAction(Animation::BAKE); mActorAnimation.Play(); } break; @@ -313,10 +294,10 @@ public: case 2: { float animDuration = 1.0f; - mActorAnimation = Animation::New(animDuration); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); - mActorAnimation.SetEndAction( Animation::Bake ); + mActorAnimation = Animation::New(animDuration); + 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(); } break; @@ -325,9 +306,9 @@ public: case 3: { float animDuration = 1.0f; - mActorAnimation = Animation::New(animDuration); - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) ); - mActorAnimation.SetEndAction( Animation::Bake ); + mActorAnimation = Animation::New(animDuration); + 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(); } break; @@ -349,14 +330,14 @@ public: if(!mActorEffectsEnabled) { mActorEffectsEnabled = true; - mActorEffectsButton.SetButtonImage( mIconEffectsOn ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOnSelected ); + 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.SetButtonImage( mIconEffectsOff ); - mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected ); + mActorEffectsButton.SetProperty(Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON); + mActorEffectsButton.SetProperty(Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED); } } @@ -366,13 +347,13 @@ public: // // - bool OnLayoutButtonClicked( Toolkit::Button button ) + bool OnLayoutButtonClicked(Toolkit::Button button) { ChangeImage(); return true; } - bool OnEffectButtonClicked( Toolkit::Button button ) + bool OnEffectButtonClicked(Toolkit::Button button) { ToggleActorEffects(); return true; @@ -383,9 +364,9 @@ 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) ) + if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK)) { mApplication.Quit(); } @@ -398,7 +379,6 @@ public: // // - void ChangeImage() { mCurrentImage++; @@ -407,59 +387,43 @@ 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::Control mView; - Toolkit::ToolBar mToolBar; - Image mIconEffectsOff; - Image mIconEffectsOffSelected; - Image mIconEffectsOn; - Image mIconEffectsOnSelected; - Layer mContentLayer; ///< Content layer (contains actor for this stretch demo) + Application& mApplication; ///< Application instance + Toolkit::Control mView; + Toolkit::ToolBar mToolBar; + Layer mContentLayer; ///< Content layer (contains actor for this stretch demo) - PushButton mActorEffectsButton; ///< The actor effects toggling Button. + PushButton mActorEffectsButton; ///< The actor effects toggling Button. // Motion stretch - ShaderEffect mMotionStretchEffect; - ImageActor mMotionStretchImageActor; + Property::Map mMotionStretchEffect; + ImageView mMotionStretchImageView; // animate actor to position where user taps screen Animation mActorTapMovementAnimation; // show different animations to demonstrate stretch effect working on an object only movement basis - bool mActorEffectsEnabled; + bool mActorEffectsEnabled; Animation mActorAnimation; - int mCurrentActorAnimation; + int mCurrentActorAnimation; // offer a selection of images that user can cycle between int mCurrentImage; TapGestureDetector mTapGestureDetector; - DeviceOrientation mOrientation; ///< Current Device orientation - Animation mRotateAnimation; ///< Animation for rotating between landscape and portrait. - + DeviceOrientation mOrientation; ///< Current Device orientation + Animation mRotateAnimation; ///< Animation for rotating between landscape and portrait. }; -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, DALI_DEMO_THEME_PATH); - - RunTest(app); - return 0; }