/*
- * 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-blur-effect.h>
-#include <dali-toolkit/devel-api/controls/popup/popup.h>
using namespace Dali;
using namespace Dali::Toolkit;
// Demo setup parameters
//
-//#define MULTIPLE_MOTION_BLURRED_ACTORS
-#ifndef MULTIPLE_MOTION_BLURRED_ACTORS
-
const float MOTION_BLUR_ACTOR_WIDTH = 256; // actor size on screen
const float MOTION_BLUR_ACTOR_HEIGHT = 256; // ""
-
-#else //#ifndef MULTIPLE_MOTION_BLURRED_ACTORS
-
-const float MOTION_BLUR_ACTOR_WIDTH = 150; // actor size on screen
-const float MOTION_BLUR_ACTOR_HEIGHT = 112; // ""
-
-#endif //#ifndef MULTIPLE_MOTION_BLURRED_ACTORS
-
-
const unsigned int MOTION_BLUR_NUM_SAMPLES = 8;
const int MOTION_BLUR_NUM_ACTOR_IMAGES = 5;
const float ORIENTATION_DURATION = 0.5f; ///< Time to rotate to new orientation.
/**
- * @brief Load an image, scaled-down to no more than the dimensions passed in.
+ * @brief Set an image to image view, scaled-down to no more than the dimensions passed in.
*
* Uses SHRINK_TO_FIT which ensures the resulting image is
- * smaller than or equal to the specified dimensions while preserving its
- * original aspect ratio.
+ * smaller than or equal to the specified dimensions while preserving its original aspect ratio.
*/
-ResourceImage LoadImageFittedInBox( const char * const imagePath, uint32_t maxWidth, uint32_t maxHeight )
+void SetImageFittedInBox( ImageView& imageView, Property::Map& shaderEffect, const char * const imagePath, int maxWidth, int maxHeight )
{
+ Property::Map map;
+ map[Visual::Property::TYPE] = Visual::IMAGE;
+ map[ImageVisual::Property::URL] = imagePath;
// Load the image nicely scaled-down to fit within the specified max width and height:
- return ResourceImage::New( imagePath, ImageDimensions( maxWidth, maxHeight ), FittingMode::SHRINK_TO_FIT, Dali::SamplingMode::BOX_THEN_LINEAR );
+ map[ImageVisual::Property::DESIRED_WIDTH] = maxWidth;
+ map[ImageVisual::Property::DESIRED_HEIGHT] = maxHeight;
+ map[ImageVisual::Property::FITTING_MODE] = FittingMode::SHRINK_TO_FIT;
+ map[ImageVisual::Property::SAMPLING_MODE] = SamplingMode::BOX_THEN_LINEAR;
+ map.Merge( shaderEffect );
+
+ imageView.SetProperty( ImageView::Property::IMAGE, map );
}
} // unnamed namespace
: mApplication(app),
mActorEffectsEnabled(false),
mCurrentActorAnimation(0),
- mCurrentImage(0)
+ mCurrentImage(0),
+ mOrientation( PORTRAIT )
{
// Connect to the Application's Init signal
app.InitSignal().Connect(this, &MotionBlurExampleApp::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, &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,
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 effects icon on the right of the title
mActorEffectsButton = Toolkit::PushButton::New();
- mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
- mActorEffectsButton.SetSelectedImage( 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.SetUnselectedImage( LAYOUT_IMAGE );
- layoutButton.SetSelectedImage( 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
winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+ winHandle.ResizeSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized );
// set initial orientation
- // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged );
- unsigned int degrees = 0;
- Rotate( static_cast< DeviceOrientation >( degrees ) );
-
+ Rotate( PORTRAIT );
///////////////////////////////////////////////////////
//
//
// Scale down actor to fit on very low resolution screens with space to interact:
- Size stageSize = Stage::GetCurrent().GetSize();
- 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 ) );
- Image image = LoadImageFittedInBox( MOTION_BLUR_ACTOR_IMAGE1, mMotionBlurActorSize.x, mMotionBlurActorSize.y );
- mMotionBlurImageView = ImageView::New(image);
- mMotionBlurImageView.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageView.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
+ mMotionBlurEffect = CreateMotionBlurEffect();
+ mMotionBlurImageView = ImageView::New();
+ SetImageFittedInBox( mMotionBlurImageView, mMotionBlurEffect, MOTION_BLUR_ACTOR_IMAGE1, 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 );
// set actor shader to the blur one
Toolkit::SetMotionBlurProperties( mMotionBlurImageView, MOTION_BLUR_NUM_SAMPLES );
- mMotionBlurImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
-
-
-#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
-
- ///////////////////////////////////////////////////////
- //
- // Motion blurred actor 2
- //
-
- mMotionBlurImageView2 = ImageView::New(image);
- mMotionBlurImageView2.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageView2.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
- mMotionBlurImageView2.SetPosition(mMotionBlurActorSize.x * 1.1f, 0.0f);
- mMotionBlurImageView.Add( mMotionBlurImageView2 );
-
- // set actor shader to the blur one
- Toolkit::SetMotionBlurProperties( mMotionBlurImageView2, MOTION_BLUR_NUM_SAMPLES );
- mMotionBlurImageView2.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
-
-
- ///////////////////////////////////////////////////////
- //
- // Motion blurred actor 3
- //
-
- mMotionBlurImageView3 = ImageView::New(image);
- mMotionBlurImageView3.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageView3.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
- mMotionBlurImageView3.SetPosition(-mMotionBlurActorSize.x * 1.1f, 0.0f);
- mMotionBlurImageView.Add( mMotionBlurImageView3 );
-
- // set actor shader to the blur one
- Toolkit::SetMotionBlurProperties( mMotionBlurImageView3, MOTION_BLUR_NUM_SAMPLES );
- mMotionBlurImageView3.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
-
- ///////////////////////////////////////////////////////
- //
- // Motion blurred actor 4
- //
-
- mMotionBlurImageView4 = ImageView::New(image);
- mMotionBlurImageView4.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageView4.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
- mMotionBlurImageView4.SetPosition(0.0f, mMotionBlurActorSize.y * 1.1f);
- mMotionBlurImageView.Add( mMotionBlurImageView4 );
-
- // set actor shader to the blur one
- Toolkit::SetMotionBlurProperties( mMotionBlurImageView4, MOTION_BLUR_NUM_SAMPLES );
- mMotionBlurImageView4.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
-
- ///////////////////////////////////////////////////////
- //
- // Motion blurred actor 5
- //
-
- mMotionBlurImageView5 = ImageView::New(image);
- mMotionBlurImageView5.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageView5.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
- mMotionBlurImageView5.SetPosition(0.0f, -mMotionBlurActorSize.y * 1.1f);
- mMotionBlurImageView.Add( mMotionBlurImageView5 );
-
- // set actor shader to the blur one
- Toolkit::SetMotionBlurProperties( mMotionBlurImageView5, MOTION_BLUR_NUM_SAMPLES );
- mMotionBlurImageView5.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
-#endif //#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
}
//////////////////////////////////////////////////////////////
//
//
- 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.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 );
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;
{
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();
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;
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;
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;
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;
if(!mActorEffectsEnabled)
{
mActorEffectsEnabled = true;
- mActorEffectsButton.SetUnselectedImage( EFFECTS_ON_ICON );
- mActorEffectsButton.SetSelectedImage( 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.SetUnselectedImage( EFFECTS_OFF_ICON );
- mActorEffectsButton.SetSelectedImage( 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 );
}
}
*/
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;
}
+ SetImageFittedInBox( mMotionBlurImageView, mMotionBlurEffect, MOTION_BLUR_ACTOR_IMAGES[mCurrentImage], mMotionBlurActorSize.x, mMotionBlurActorSize.y );
- Image blurImage = LoadImageFittedInBox( MOTION_BLUR_ACTOR_IMAGES[mCurrentImage], mMotionBlurActorSize.x, mMotionBlurActorSize.y );
-
- mMotionBlurImageView.SetImage(blurImage);
-#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
- mMotionBlurImageView2.SetImage(blurImage);
- mMotionBlurImageView3.SetImage(blurImage);
- mMotionBlurImageView4.SetImage(blurImage);
- mMotionBlurImageView5.SetImage(blurImage);
-#endif
}
Property::Map mMotionBlurEffect;
ImageView mMotionBlurImageView;
Size mMotionBlurActorSize;
-
-#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
- ImageView mMotionBlurImageView2;
- ImageView mMotionBlurImageView3;
- ImageView mMotionBlurImageView4;
- ImageView mMotionBlurImageView5;
-#endif //#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
+ Size mMotionBlurActorUpdateSize;
// animate actor to position where user taps screen
Animation mActorTapMovementAnimation;
DeviceOrientation mOrientation; ///< Current Device orientation
Animation mRotateAnimation; ///< Animation for rotating between landscape and portrait.
-
- Popup mInstructionsPopup; ///< Info Popup
};
-void RunTest(Application& app)
+int DALI_EXPORT_API main(int argc, char **argv)
{
+ Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
MotionBlurExampleApp test(app);
-
app.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
-int main(int argc, char **argv)
-{
- Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
- RunTest(app);
-
return 0;
}
projects / platform / core / uifw / dali-demo.git / blobdiff