/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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-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;
const unsigned int MOTION_BLUR_NUM_SAMPLES = 8;
const int MOTION_BLUR_NUM_ACTOR_IMAGES = 5;
-const char* MOTION_BLUR_ACTOR_IMAGE1( DALI_IMAGE_DIR "image-with-border-1.jpg" );
-const char* MOTION_BLUR_ACTOR_IMAGE2( DALI_IMAGE_DIR "image-with-border-2.jpg" );
-const char* MOTION_BLUR_ACTOR_IMAGE3( DALI_IMAGE_DIR "image-with-border-3.jpg" );
-const char* MOTION_BLUR_ACTOR_IMAGE4( DALI_IMAGE_DIR "image-with-border-4.jpg" );
-const char* MOTION_BLUR_ACTOR_IMAGE5( DALI_IMAGE_DIR "image-with-border-1.jpg" );
+const char* MOTION_BLUR_ACTOR_IMAGE1( DEMO_IMAGE_DIR "image-with-border-1.jpg" );
+const char* MOTION_BLUR_ACTOR_IMAGE2( DEMO_IMAGE_DIR "image-with-border-2.jpg" );
+const char* MOTION_BLUR_ACTOR_IMAGE3( DEMO_IMAGE_DIR "image-with-border-3.jpg" );
+const char* MOTION_BLUR_ACTOR_IMAGE4( DEMO_IMAGE_DIR "image-with-border-4.jpg" );
+const char* MOTION_BLUR_ACTOR_IMAGE5( DEMO_IMAGE_DIR "image-with-border-1.jpg" );
const char* MOTION_BLUR_ACTOR_IMAGES[] = {
MOTION_BLUR_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 Blur" );
-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" );
const float UI_MARGIN = 4.0f; ///< Screen Margin for placement of UI buttons
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 ImageAttributes::ShrinkToFit which ensures the resulting image is
- * smaller than or equal to the specified dimensions while preserving its
- * original aspect ratio.
+ * Uses SHRINK_TO_FIT which ensures the resulting image is
+ * 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:
- ImageAttributes attributes;
- attributes.SetSize( maxWidth, maxHeight);
- attributes.SetFilterMode( ImageAttributes::BoxThenLinear );
- attributes.SetScalingMode( ImageAttributes::ShrinkToFit );
- return ResourceImage::New( imagePath, attributes );
+ 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);
APPLICATION_TITLE );
//Add an effects 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.SetUnselectedImage( EFFECTS_OFF_ICON );
+ mActorEffectsButton.SetSelectedImage( 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)
- Image imageLayout = ResourceImage::New( LAYOUT_IMAGE );
Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
- layoutButton.SetBackgroundImage(imageLayout);
+ layoutButton.SetUnselectedImage( LAYOUT_IMAGE );
+ layoutButton.SetSelectedImage( LAYOUT_IMAGE_SELECTED );
layoutButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnLayoutButtonClicked);
layoutButton.SetLeaveRequired( true );
mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
// set initial orientation
- winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged );
- unsigned int degrees = winHandle.GetOrientation().GetDegrees();
+ unsigned int degrees = 0;
Rotate( static_cast< DeviceOrientation >( degrees ) );
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( mMotionBlurActorSize.x, mMotionBlurActorSize.y ), std::min( mMotionBlurActorSize.x, mMotionBlurActorSize.y ) );
- Image image = LoadImageFittedInBox( MOTION_BLUR_ACTOR_IMAGE1, mMotionBlurActorSize.x, mMotionBlurActorSize.y );
- mMotionBlurImageActor = ImageActor::New(image);
- mMotionBlurImageActor.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageActor.SetSize(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);
- mContentLayer.Add( mMotionBlurImageActor );
+ mContentLayer.Add( mMotionBlurImageView );
// Create shader used for doing motion blur
- mMotionBlurEffect = MotionBlurEffect::Apply(mMotionBlurImageActor);
+ mMotionBlurEffect = CreateMotionBlurEffect();
+
+ // set actor shader to the blur one
+ Toolkit::SetMotionBlurProperties( mMotionBlurImageView, MOTION_BLUR_NUM_SAMPLES );
#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
// Motion blurred actor 2
//
- mMotionBlurImageActor2 = ImageActor::New(image);
- mMotionBlurImageActor2.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageActor2.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
- mMotionBlurImageActor2.SetPosition(mMotionBlurActorSize.x * 1.1f, 0.0f);
- mMotionBlurImageActor.Add( mMotionBlurImageActor2 );
-
- // Create shader used for doing motion blur
- mMotionBlurEffect2 = MotionBlurEffect::New(MOTION_BLUR_NUM_SAMPLES);
+ 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
- mMotionBlurImageActor2.SetShaderEffect( mMotionBlurEffect2 );
+ Toolkit::SetMotionBlurProperties( mMotionBlurImageView2, MOTION_BLUR_NUM_SAMPLES );
+ mMotionBlurImageView2.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
///////////////////////////////////////////////////////
// Motion blurred actor 3
//
- mMotionBlurImageActor3 = ImageActor::New(image);
- mMotionBlurImageActor3.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageActor3.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
- mMotionBlurImageActor3.SetPosition(-mMotionBlurActorSize.x * 1.1f, 0.0f);
- mMotionBlurImageActor.Add( mMotionBlurImageActor3 );
-
- // Create shader used for doing motion blur
- mMotionBlurEffect3 = MotionBlurEffect::New(MOTION_BLUR_NUM_SAMPLES);
+ 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
- mMotionBlurImageActor3.SetShaderEffect( mMotionBlurEffect3 );
+ Toolkit::SetMotionBlurProperties( mMotionBlurImageView3, MOTION_BLUR_NUM_SAMPLES );
+ mMotionBlurImageView3.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
///////////////////////////////////////////////////////
// Motion blurred actor 4
//
- mMotionBlurImageActor4 = ImageActor::New(image);
- mMotionBlurImageActor4.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageActor4.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
- mMotionBlurImageActor4.SetPosition(0.0f, mMotionBlurActorSize.y * 1.1f);
- mMotionBlurImageActor.Add( mMotionBlurImageActor4 );
-
- // Create shader used for doing motion blur
- mMotionBlurEffect4 = MotionBlurEffect::New(MOTION_BLUR_NUM_SAMPLES);
+ 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
- mMotionBlurImageActor4.SetShaderEffect( mMotionBlurEffect4 );
-
+ Toolkit::SetMotionBlurProperties( mMotionBlurImageView4, MOTION_BLUR_NUM_SAMPLES );
+ mMotionBlurImageView4.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
///////////////////////////////////////////////////////
//
// Motion blurred actor 5
//
- mMotionBlurImageActor5 = ImageActor::New(image);
- mMotionBlurImageActor5.SetParentOrigin( ParentOrigin::CENTER );
- mMotionBlurImageActor5.SetSize(mMotionBlurActorSize.x, mMotionBlurActorSize.y);
- mMotionBlurImageActor5.SetPosition(0.0f, -mMotionBlurActorSize.y * 1.1f);
- mMotionBlurImageActor.Add( mMotionBlurImageActor5 );
-
- // Create shader used for doing motion blur
- mMotionBlurEffect5 = MotionBlurEffect::New(MOTION_BLUR_NUM_SAMPLES);
+ 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
- mMotionBlurImageActor5.SetShaderEffect( mMotionBlurEffect5 );
+ Toolkit::SetMotionBlurProperties( mMotionBlurImageView5, MOTION_BLUR_NUM_SAMPLES );
+ mMotionBlurImageView5.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionBlurEffect );
#endif //#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
}
- //////////////////////////////////////////////////////////////
- //
- // Device Orientation Support
- //
- //
-
- void OnOrientationChanged( Orientation orientation )
- {
- unsigned int degrees = orientation.GetDegrees();
- Rotate( static_cast< DeviceOrientation >( degrees ) );
- }
-
void Rotate( DeviceOrientation orientation )
{
// Resize the root actor
{
// 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::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();
float animDuration = 0.5f;
mActorTapMovementAnimation = Animation::New( animDuration );
- if ( mMotionBlurImageActor )
+ if ( mMotionBlurImageView )
{
- mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
+ mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) );
}
mActorTapMovementAnimation.SetEndAction( Animation::Bake );
mActorTapMovementAnimation.Play();
{
float animDuration = 1.0f;
mActorAnimation = Animation::New(animDuration);
- mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunctions::EaseInOut );
+ mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
mActorAnimation.SetEndAction( Animation::Bake );
mActorAnimation.Play();
}
{
float animDuration = 1.0f;
mActorAnimation = Animation::New(animDuration);
- mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunctions::EaseInOut );
+ mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
mActorAnimation.SetEndAction( Animation::Bake );
mActorAnimation.Play();
}
{
float animDuration = 1.0f;
mActorAnimation = Animation::New(animDuration);
- mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunctions::EaseInOut );
- mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunctions::EaseInOut );
+ 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.Play();
}
{
float animDuration = 1.0f;
mActorAnimation = Animation::New(animDuration);
- mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunctions::Bounce, TimePeriod( 0.0f, 1.0f ) );
+ 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.Play();
}
if(!mActorEffectsEnabled)
{
mActorEffectsEnabled = true;
- mActorEffectsButton.SetBackgroundImage( mIconEffectsOn );
+ mActorEffectsButton.SetUnselectedImage( EFFECTS_ON_ICON );
+ mActorEffectsButton.SetSelectedImage( EFFECTS_ON_ICON_SELECTED );
}
else
{
mActorEffectsEnabled = false;
- mActorEffectsButton.SetBackgroundImage( mIconEffectsOff );
+ mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
+ mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
}
}
{
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 );
- mMotionBlurImageActor.SetImage(blurImage);
+#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
+ mMotionBlurImageView2.SetImage(blurImage);
+ mMotionBlurImageView3.SetImage(blurImage);
+ mMotionBlurImageView4.SetImage(blurImage);
+ mMotionBlurImageView5.SetImage(blurImage);
+#endif
}
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 blur demo)
PushButton mActorEffectsButton; ///< The actor effects toggling Button.
// Motion blur
- MotionBlurEffect mMotionBlurEffect;
- ImageActor mMotionBlurImageActor;
+ Property::Map mMotionBlurEffect;
+ ImageView mMotionBlurImageView;
Size mMotionBlurActorSize;
#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
- MotionBlurEffect mMotionBlurEffect2;
- MotionBlurEffect mMotionBlurEffect3;
- MotionBlurEffect mMotionBlurEffect4;
- MotionBlurEffect mMotionBlurEffect5;
-
- ImageActor mMotionBlurImageActor2;
- ImageActor mMotionBlurImageActor3;
- ImageActor mMotionBlurImageActor4;
- ImageActor mMotionBlurImageActor5;
+ ImageView mMotionBlurImageView2;
+ ImageView mMotionBlurImageView3;
+ ImageView mMotionBlurImageView4;
+ ImageView mMotionBlurImageView5;
#endif //#ifdef MULTIPLE_MOTION_BLURRED_ACTORS
// animate actor to position where user taps screen
// Entry point for Linux & Tizen applications
//
-int main(int argc, char **argv)
+int DALI_EXPORT_API main(int argc, char **argv)
{
- Application app = Application::New(&argc, &argv);
+ Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
RunTest(app);
projects / platform / core / uifw / dali-demo.git / blobdiff