/*
- * 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.
#include "shared/view.h"
#include <dali/dali.h>
+#include <dali/devel-api/actors/actor-devel.h>
#include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h>
using namespace Dali;
using namespace Dali::Toolkit;
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,
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 );
: 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);
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.
+ // The view is added to the window.
mContentLayer = DemoHelper::CreateView( mApplication,
mView,
mToolBar,
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 );
- 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
winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+ winHandle.ResizeSignal().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
//
-
- 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 = MotionStretchEffect::Apply(mMotionStretchImageActor);
+ Toolkit::SetMotionStretchProperties( mMotionStretchImageView );
}
//////////////////////////////////////////////////////////////
//
//
- 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 )
{
// 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 )
{
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.RotateTo( mView, Degree( -orientation ), Vector3::ZAXIS, AlphaFunctions::EaseOut );
- mRotateAnimation.Resize( mView, targetSize.width, targetSize.height );
+ 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 );
}
}
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;
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.SetEndAction( Animation::BAKE );
mActorTapMovementAnimation.Play();
{
float animDuration = 1.0f;
mActorAnimation = Animation::New(animDuration);
- mActorAnimation.RotateBy(mMotionStretchImageActor, Degree(720), Vector3::YAXIS, AlphaFunctions::EaseInOut);
- mActorAnimation.SetEndAction( Animation::Bake );
+ 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;
{
float animDuration = 1.0f;
mActorAnimation = Animation::New(animDuration);
- mActorAnimation.RotateBy(mMotionStretchImageActor, Degree(720), Vector3::ZAXIS, AlphaFunctions::EaseInOut);
- mActorAnimation.SetEndAction( Animation::Bake );
+ 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;
{
float animDuration = 1.0f;
mActorAnimation = Animation::New(animDuration);
- mActorAnimation.RotateBy(mMotionStretchImageActor, Degree(360), Vector3::YAXIS, AlphaFunctions::EaseInOut);
- mActorAnimation.RotateBy(mMotionStretchImageActor, Degree(360), Vector3::ZAXIS, AlphaFunctions::EaseInOut);
- mActorAnimation.SetEndAction( Animation::Bake );
+ 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;
{
float animDuration = 1.0f;
mActorAnimation = Animation::New(animDuration);
- mActorAnimation.ScaleBy(mMotionStretchImageActor, Vector3(2.0f, 2.0f, 2.0f), AlphaFunctions::Bounce, 0.0f, 1.0f);
- mActorAnimation.SetEndAction( Animation::Bake );
+ 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;
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 );
}
}
*/
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) )
{
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;
- TextView mTitleActor; ///< The Toolbar's Title.
- 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;
};
-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;
}
projects / platform / core / uifw / dali-demo.git / blobdiff