X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fmotion-blur%2Fmotion-blur-example.cpp;h=b2d14e9df885c9092e40c1cabeaee3351c3d75c5;hb=ad1313b2bb8ee3449d4faea7340cc8c2fbedf40f;hp=10086a2461f968bd4b6effad1cd19d0572f73720;hpb=6ebeb6405d0302f5aba076aa63d650b91c2b8fd9;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp index 10086a2..b2d14e9 100644 --- a/examples/motion-blur/motion-blur-example.cpp +++ b/examples/motion-blur/motion-blur-example.cpp @@ -21,6 +21,8 @@ #include "shared/view.h" #include #include +#include +#include using namespace Dali; using namespace Dali::Toolkit; @@ -74,9 +76,12 @@ 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 Blur" ); 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 float UI_MARGIN = 4.0f; ///< Screen Margin for placement of UI buttons @@ -92,18 +97,14 @@ const float ORIENTATION_DURATION = 0.5f; ///< Time to rotate to /** * @brief Load an image, scaled-down to no more than the dimensions passed in. * - * Uses ImageAttributes::ShrinkToFit which ensures the resulting image is + * 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 ) { // 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 ); + return ResourceImage::New( imagePath, ImageDimensions( maxWidth, maxHeight ), FittingMode::SHRINK_TO_FIT, Dali::SamplingMode::BOX_THEN_LINEAR ); } } // unnamed namespace @@ -166,17 +167,22 @@ public: //Add an effects 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.SetBackgroundImage( mIconEffectsOff ); + mActorEffectsButton.SetButtonImage( mIconEffectsOff ); + mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected ); 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 ); + Image imageLayoutSelected = ResourceImage::New( LAYOUT_IMAGE_SELECTED ); Toolkit::PushButton layoutButton = Toolkit::PushButton::New(); - layoutButton.SetBackgroundImage(imageLayout); + layoutButton.SetButtonImage( imageLayout ); + layoutButton.SetSelectedImage( imageLayoutSelected ); 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 ); @@ -193,8 +199,8 @@ public: winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); // set initial orientation - app.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged ); - unsigned int degrees = app.GetOrientation().GetDegrees(); + // winHandle.GetOrientation().ChangedSignal().Connect( this, &MotionBlurExampleApp::OnOrientationChanged ); + unsigned int degrees = 0; Rotate( static_cast< DeviceOrientation >( degrees ) ); @@ -216,7 +222,12 @@ public: mContentLayer.Add( mMotionBlurImageActor ); // Create shader used for doing motion blur - mMotionBlurEffect = MotionBlurEffect::Apply(mMotionBlurImageActor); + mMotionBlurEffect = Toolkit::CreateMotionBlurEffect(); + Dali::Property::Index uModelProperty = mMotionBlurEffect.GetPropertyIndex( "uModelLastFrame" ); + Constraint constraint = Constraint::New( mMotionBlurEffect, uModelProperty, EqualToConstraint() ); + constraint.AddSource( Source( mMotionBlurImageActor , Actor::Property::WORLD_MATRIX ) ); + constraint.Apply(); + mMotionBlurImageActor.SetShaderEffect( mMotionBlurEffect ); #ifdef MULTIPLE_MOTION_BLURRED_ACTORS @@ -233,7 +244,7 @@ public: mMotionBlurImageActor.Add( mMotionBlurImageActor2 ); // Create shader used for doing motion blur - mMotionBlurEffect2 = MotionBlurEffect::New(MOTION_BLUR_NUM_SAMPLES); + mMotionBlurEffect2 = CreateMotionBlurEffect(MOTION_BLUR_NUM_SAMPLES); // set actor shader to the blur one mMotionBlurImageActor2.SetShaderEffect( mMotionBlurEffect2 ); @@ -251,7 +262,7 @@ public: mMotionBlurImageActor.Add( mMotionBlurImageActor3 ); // Create shader used for doing motion blur - mMotionBlurEffect3 = MotionBlurEffect::New(MOTION_BLUR_NUM_SAMPLES); + mMotionBlurEffect3 = CreateMotionBlurEffect(MOTION_BLUR_NUM_SAMPLES); // set actor shader to the blur one mMotionBlurImageActor3.SetShaderEffect( mMotionBlurEffect3 ); @@ -269,7 +280,7 @@ public: mMotionBlurImageActor.Add( mMotionBlurImageActor4 ); // Create shader used for doing motion blur - mMotionBlurEffect4 = MotionBlurEffect::New(MOTION_BLUR_NUM_SAMPLES); + mMotionBlurEffect4 = CreateMotionBlurEffect(MOTION_BLUR_NUM_SAMPLES); // set actor shader to the blur one mMotionBlurImageActor4.SetShaderEffect( mMotionBlurEffect4 ); @@ -287,7 +298,7 @@ public: mMotionBlurImageActor.Add( mMotionBlurImageActor5 ); // Create shader used for doing motion blur - mMotionBlurEffect5 = MotionBlurEffect::New(MOTION_BLUR_NUM_SAMPLES); + mMotionBlurEffect5 = CreateMotionBlurEffect(MOTION_BLUR_NUM_SAMPLES); // set actor shader to the blur one mMotionBlurImageActor5.SetShaderEffect( mMotionBlurEffect5 ); @@ -326,8 +337,9 @@ public: { // has parent so we expect it to be on stage, 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::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 @@ -370,7 +382,7 @@ public: mActorTapMovementAnimation = Animation::New( animDuration ); if ( mMotionBlurImageActor ) { - mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) ); + mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) ); } mActorTapMovementAnimation.SetEndAction( Animation::Bake ); mActorTapMovementAnimation.Play(); @@ -386,7 +398,7 @@ public: { float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); - mActorAnimation.RotateBy(mMotionBlurImageActor, Degree(720), Vector3::YAXIS, AlphaFunctions::EaseInOut); + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); mActorAnimation.SetEndAction( Animation::Bake ); mActorAnimation.Play(); } @@ -397,7 +409,7 @@ public: { float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); - mActorAnimation.RotateBy(mMotionBlurImageActor, Degree(720), Vector3::ZAXIS, AlphaFunctions::EaseInOut); + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); mActorAnimation.SetEndAction( Animation::Bake ); mActorAnimation.Play(); } @@ -408,8 +420,8 @@ public: { float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); - mActorAnimation.RotateBy(mMotionBlurImageActor, Degree(360), Vector3::YAXIS, AlphaFunctions::EaseInOut); - mActorAnimation.RotateBy(mMotionBlurImageActor, Degree(360), Vector3::ZAXIS, AlphaFunctions::EaseInOut); + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); mActorAnimation.SetEndAction( Animation::Bake ); mActorAnimation.Play(); } @@ -420,7 +432,7 @@ public: { float animDuration = 1.0f; mActorAnimation = Animation::New(animDuration); - mActorAnimation.ScaleBy(mMotionBlurImageActor, Vector3(2.0f, 2.0f, 2.0f), AlphaFunctions::Bounce, 0.0f, 1.0f); + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) ); mActorAnimation.SetEndAction( Animation::Bake ); mActorAnimation.Play(); } @@ -443,12 +455,14 @@ public: if(!mActorEffectsEnabled) { mActorEffectsEnabled = true; - mActorEffectsButton.SetBackgroundImage( mIconEffectsOn ); + mActorEffectsButton.SetButtonImage( mIconEffectsOn ); + mActorEffectsButton.SetSelectedImage( mIconEffectsOnSelected ); } else { mActorEffectsEnabled = false; - mActorEffectsButton.SetBackgroundImage( mIconEffectsOff ); + mActorEffectsButton.SetButtonImage( mIconEffectsOff ); + mActorEffectsButton.SetSelectedImage( mIconEffectsOffSelected ); } } @@ -506,25 +520,27 @@ public: private: Application& mApplication; ///< Application instance - Toolkit::View mView; + Toolkit::Control mView; Toolkit::ToolBar mToolBar; Image mIconEffectsOff; + Image mIconEffectsOffSelected; Image mIconEffectsOn; + Image mIconEffectsOnSelected; Layer mContentLayer; ///< Content layer (contains actor for this blur demo) PushButton mActorEffectsButton; ///< The actor effects toggling Button. // Motion blur - MotionBlurEffect mMotionBlurEffect; + ShaderEffect mMotionBlurEffect; ImageActor mMotionBlurImageActor; Size mMotionBlurActorSize; #ifdef MULTIPLE_MOTION_BLURRED_ACTORS - MotionBlurEffect mMotionBlurEffect2; - MotionBlurEffect mMotionBlurEffect3; - MotionBlurEffect mMotionBlurEffect4; - MotionBlurEffect mMotionBlurEffect5; + ShaderEffect mMotionBlurEffect2; + ShaderEffect mMotionBlurEffect3; + ShaderEffect mMotionBlurEffect4; + ShaderEffect mMotionBlurEffect5; ImageActor mMotionBlurImageActor2; ImageActor mMotionBlurImageActor3; @@ -562,7 +578,7 @@ void RunTest(Application& app) // int main(int argc, char **argv) { - Application app = Application::New(&argc, &argv); + Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH); RunTest(app);