X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fdissolve-effect%2Fdissolve-effect-example.cpp;h=cd927aedf91f31ce3efbe1a6ff36c379b4c67550;hb=28946d814d1f11fddcc23a887a0e318133147549;hp=6108f2bbdfe465a8b193f8a47f19dc3956dcbef4;hpb=d40e848d230c9823d7b97f0205ff74a921dde353;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp index 6108f2b..cd927ae 100644 --- a/examples/dissolve-effect/dissolve-effect-example.cpp +++ b/examples/dissolve-effect/dissolve-effect-example.cpp @@ -23,6 +23,7 @@ #include #include +#include using namespace Dali; @@ -32,37 +33,41 @@ using Dali::Toolkit::TextLabel; namespace { -const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char * const APPLICATION_TITLE_HIGHP( "Dissolve Effect(highp)" ); const char * const APPLICATION_TITLE_MEDIUMP( "Dissolve Effect(mediump)" ); -const char * const EFFECT_HIGHP_IMAGE( DALI_IMAGE_DIR "icon-highp.png" ); -const char * const EFFECT_MEDIUMP_IMAGE( DALI_IMAGE_DIR "icon-mediump.png" ); -const char * const PLAY_ICON( DALI_IMAGE_DIR "icon-play.png" ); -const char * const STOP_ICON( DALI_IMAGE_DIR "icon-stop.png" ); +const char * const EFFECT_HIGHP_IMAGE( DEMO_IMAGE_DIR "icon-highp.png" ); +const char * const EFFECT_HIGHP_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-highp-selected.png" ); +const char * const EFFECT_MEDIUMP_IMAGE( DEMO_IMAGE_DIR "icon-mediump.png" ); +const char * const EFFECT_MEDIUMP_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-mediump-selected.png" ); +const char * const PLAY_ICON( DEMO_IMAGE_DIR "icon-play.png" ); +const char * const PLAY_ICON_SELECTED( DEMO_IMAGE_DIR "icon-play-selected.png" ); +const char * const STOP_ICON( DEMO_IMAGE_DIR "icon-stop.png" ); +const char * const STOP_ICON_SELECTED( DEMO_IMAGE_DIR "icon-stop-selected.png" ); const char* IMAGES[] = { - DALI_IMAGE_DIR "gallery-large-1.jpg", - DALI_IMAGE_DIR "gallery-large-2.jpg", - DALI_IMAGE_DIR "gallery-large-3.jpg", - DALI_IMAGE_DIR "gallery-large-4.jpg", - DALI_IMAGE_DIR "gallery-large-5.jpg", - DALI_IMAGE_DIR "gallery-large-6.jpg", - DALI_IMAGE_DIR "gallery-large-7.jpg", - DALI_IMAGE_DIR "gallery-large-8.jpg", - DALI_IMAGE_DIR "gallery-large-9.jpg", - DALI_IMAGE_DIR "gallery-large-10.jpg", - DALI_IMAGE_DIR "gallery-large-11.jpg", - DALI_IMAGE_DIR "gallery-large-12.jpg", - DALI_IMAGE_DIR "gallery-large-13.jpg", - DALI_IMAGE_DIR "gallery-large-14.jpg", - DALI_IMAGE_DIR "gallery-large-15.jpg", - DALI_IMAGE_DIR "gallery-large-16.jpg", - DALI_IMAGE_DIR "gallery-large-17.jpg", - DALI_IMAGE_DIR "gallery-large-18.jpg", - DALI_IMAGE_DIR "gallery-large-19.jpg", - DALI_IMAGE_DIR "gallery-large-20.jpg", - DALI_IMAGE_DIR "gallery-large-21.jpg", + DEMO_IMAGE_DIR "gallery-large-1.jpg", + DEMO_IMAGE_DIR "gallery-large-2.jpg", + DEMO_IMAGE_DIR "gallery-large-3.jpg", + DEMO_IMAGE_DIR "gallery-large-4.jpg", + DEMO_IMAGE_DIR "gallery-large-5.jpg", + DEMO_IMAGE_DIR "gallery-large-6.jpg", + DEMO_IMAGE_DIR "gallery-large-7.jpg", + DEMO_IMAGE_DIR "gallery-large-8.jpg", + DEMO_IMAGE_DIR "gallery-large-9.jpg", + DEMO_IMAGE_DIR "gallery-large-10.jpg", + DEMO_IMAGE_DIR "gallery-large-11.jpg", + DEMO_IMAGE_DIR "gallery-large-12.jpg", + DEMO_IMAGE_DIR "gallery-large-13.jpg", + DEMO_IMAGE_DIR "gallery-large-14.jpg", + DEMO_IMAGE_DIR "gallery-large-15.jpg", + DEMO_IMAGE_DIR "gallery-large-16.jpg", + DEMO_IMAGE_DIR "gallery-large-17.jpg", + DEMO_IMAGE_DIR "gallery-large-18.jpg", + DEMO_IMAGE_DIR "gallery-large-19.jpg", + DEMO_IMAGE_DIR "gallery-large-20.jpg", + DEMO_IMAGE_DIR "gallery-large-21.jpg", }; const int NUM_IMAGES( sizeof(IMAGES) / sizeof(IMAGES[0]) ); @@ -72,24 +77,20 @@ const int VIEWINGTIME = 2000; // 2 seconds const float TRANSITION_DURATION = 2.5f; //2.5 second -const float INITIAL_DEPTH = -10.0f; +const float INITIAL_DEPTH = 10.0f; /** * @brief Load an image, scaled-down to no more than the stage dimensions. * - * Uses image scaling mode ImageAttributes::ScaleToFill to resize the image at + * Uses image scaling mode SCALE_TO_FILL to resize the image at * load time to cover the entire stage with pixels with no borders, - * and filter mode ImageAttributes::BoxThenLinear to sample the image with + * and filter mode BOX_THEN_LINEAR to sample the image with * maximum quality. */ ResourceImage LoadStageFillingImage( const char * const imagePath ) { Size stageSize = Stage::GetCurrent().GetSize(); - ImageAttributes attributes; - attributes.SetSize( stageSize.x, stageSize.y ); - attributes.SetFilterMode( ImageAttributes::BoxThenLinear ); - attributes.SetScalingMode( ImageAttributes::ScaleToFill ); - return ResourceImage::New( imagePath, attributes ); + return ResourceImage::New( imagePath, ImageDimensions( stageSize.x, stageSize.y ), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR ); } } // namespace @@ -156,19 +157,19 @@ private: private: Application& mApplication; - Toolkit::View mView; + Toolkit::Control mView; Toolkit::ToolBar mToolBar; Layer mContent; Toolkit::TextLabel mTitleActor; Actor mParent; - ImageActor mCurrentImage; - ImageActor mNextImage; + Toolkit::ImageView mCurrentImage; + Toolkit::ImageView mNextImage; unsigned int mIndex; - Constraint mSizeConstraint; - Toolkit::DissolveEffect mCurrentImageEffect; - Toolkit::DissolveEffect mNextImageEffect; + Property::Map mDissolveEffect; + Property::Map mEmptyEffect; + bool mUseHighPrecision; Animation mAnimation; @@ -181,11 +182,15 @@ private: unsigned int mCentralLineIndex; Image mIconPlay; + Image mIconPlaySelected; Image mIconStop; + Image mIconStopSelected; Toolkit::PushButton mPlayStopButton; Image mIconHighP; + Image mIconHighPSelected; Image mIconMediumP; + Image mIconMediumPSelected; Toolkit::PushButton mEffectChangeButton; }; @@ -215,9 +220,12 @@ void DissolveEffectApp::OnInit( Application& application ) // Add an effect-changing button on the right of the tool bar. mIconHighP = ResourceImage::New( EFFECT_HIGHP_IMAGE ); + mIconHighPSelected = ResourceImage::New( EFFECT_HIGHP_IMAGE_SELECTED ); mIconMediumP = ResourceImage::New( EFFECT_MEDIUMP_IMAGE ); + mIconMediumPSelected = ResourceImage::New( EFFECT_MEDIUMP_IMAGE_SELECTED ); mEffectChangeButton = Toolkit::PushButton::New(); - mEffectChangeButton.SetBackgroundImage(mIconHighP); + mEffectChangeButton.SetButtonImage( mIconHighP ); + mEffectChangeButton.SetSelectedImage( mIconHighPSelected ); mEffectChangeButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnEffectButtonClicked ); mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); @@ -227,9 +235,12 @@ void DissolveEffectApp::OnInit( Application& application ) // Add an slide-show button on the right of the title mIconPlay = ResourceImage::New( PLAY_ICON ); + mIconPlaySelected = ResourceImage::New( PLAY_ICON_SELECTED ); mIconStop = ResourceImage::New( STOP_ICON ); + mIconStopSelected = ResourceImage::New( STOP_ICON_SELECTED ); mPlayStopButton = Toolkit::PushButton::New(); - mPlayStopButton.SetBackgroundImage( mIconPlay ); + mPlayStopButton.SetButtonImage( mIconPlay ); + mPlayStopButton.SetSelectedImage( mIconPlaySelected ); mPlayStopButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnSildeshowButtonClicked ); mToolBar.AddControl( mPlayStopButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); @@ -237,10 +248,6 @@ void DissolveEffectApp::OnInit( Application& application ) mPanGestureDetector = PanGestureDetector::New(); mPanGestureDetector.DetectedSignal().Connect( this, &DissolveEffectApp::OnPanGesture ); - // create the dissolve effect object - mCurrentImageEffect = Toolkit::DissolveEffect::New(mUseHighPrecision); - mNextImageEffect = Toolkit::DissolveEffect::New(mUseHighPrecision); - mViewTimer = Timer::New( VIEWINGTIME ); mViewTimer.TickSignal().Connect( this, &DissolveEffectApp::OnTimerTick ); mTimerReady = true; @@ -248,18 +255,20 @@ void DissolveEffectApp::OnInit( Application& application ) // Set size to stage size to avoid seeing a black border on transition mParent = Actor::New(); mParent.SetSize( Stage::GetCurrent().GetSize() ); - mParent.SetPositionInheritanceMode( USE_PARENT_POSITION ); + mParent.SetParentOrigin( ParentOrigin::CENTER ); mContent.Add( mParent ); - mSizeConstraint= Constraint::New( Actor::Property::SCALE, LocalSource( Actor::Property::SIZE ), ParentSource( Actor::Property::SIZE ), ScaleToFitKeepAspectRatioConstraint() ); - // show the first image - mCurrentImage = ImageActor::New( LoadStageFillingImage( IMAGES[mIndex] ) ); - mCurrentImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION); - mCurrentImage.ApplyConstraint( mSizeConstraint ); + mCurrentImage = Toolkit::ImageView::New( LoadStageFillingImage( IMAGES[mIndex] ) ); + mCurrentImage.SetParentOrigin( ParentOrigin::CENTER ); + mCurrentImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + mCurrentImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); mParent.Add( mCurrentImage ); mPanGestureDetector.Attach( mCurrentImage ); + + mDissolveEffect = Dali::Toolkit::CreateDissolveEffect( mUseHighPrecision ); + mEmptyEffect.Insert( "shader", Property::Value() ); } // signal handler, called when the pan gesture is detected @@ -283,9 +292,10 @@ void DissolveEffectApp::OnPanGesture( Actor actor, const PanGesture& gesture ) } Image image = LoadStageFillingImage( IMAGES[ mIndex ] ); - mNextImage = ImageActor::New( image ); - mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION); - mNextImage.ApplyConstraint( mSizeConstraint ); + mNextImage = Toolkit::ImageView::New( image ); + mNextImage.SetParentOrigin( ParentOrigin::CENTER ); + mNextImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + mNextImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); mNextImage.SetZ(INITIAL_DEPTH); mParent.Add( mNextImage ); Vector2 size = Vector2( mCurrentImage.GetCurrentSize() ); @@ -297,24 +307,22 @@ void DissolveEffectApp::StartTransition(Vector2 position, Vector2 displacement) { mAnimation = Animation::New(TRANSITION_DURATION); - mCurrentImageEffect.SetCentralLine(position,displacement); - mCurrentImageEffect.SetDistortion(0.0f); - mCurrentImage.SetShaderEffect(mCurrentImageEffect); - mAnimation.AnimateTo( Property(mCurrentImageEffect, mCurrentImageEffect.GetDistortionPropertyName()), 1.0f, AlphaFunctions::Linear ); + Dali::Toolkit::DissolveEffectSetCentralLine( mCurrentImage, position, displacement, 0.0f ); + mCurrentImage.SetProperty( Toolkit::ImageView::Property::IMAGE, mDissolveEffect ); + mAnimation.AnimateTo( Property( mCurrentImage, "uPercentage" ), 1.0f, AlphaFunction::LINEAR ); mNextImage.SetOpacity(0.0f); - mAnimation.OpacityTo( mNextImage, 1.0, AlphaFunctions::Linear ); + mAnimation.AnimateTo( Property( mNextImage, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::LINEAR ); if(mUseHighPrecision) { - mNextImageEffect.SetCentralLine(position,-displacement); - mNextImageEffect.SetDistortion(1.0f); - mNextImage.SetShaderEffect(mNextImageEffect); - mAnimation.AnimateTo( Property(mNextImageEffect, mNextImageEffect.GetDistortionPropertyName()), 0.0f, AlphaFunctions::Linear ); + Dali::Toolkit::DissolveEffectSetCentralLine( mNextImage, position, displacement, 1.0f ); + mNextImage.SetProperty( Toolkit::ImageView::Property::IMAGE, mDissolveEffect ); + mAnimation.AnimateTo( Property( mNextImage, "uPercentage" ), 0.0f, AlphaFunction::LINEAR ); } else { - mAnimation.MoveTo(mNextImage, Vector3(0.0f, 0.0f, 0.0f), AlphaFunctions::Linear); + mAnimation.AnimateTo( Property( mNextImage, Actor::Property::POSITION ), Vector3( 0.0f, 0.0f, 0.0f ), AlphaFunction::LINEAR ); } mAnimation.FinishedSignal().Connect( this, &DissolveEffectApp::OnTransitionCompleted ); @@ -336,15 +344,18 @@ void DissolveEffectApp::OnKeyEvent(const KeyEvent& event) bool DissolveEffectApp::OnEffectButtonClicked( Toolkit::Button button ) { mUseHighPrecision = !mUseHighPrecision; - mCurrentImageEffect = Toolkit::DissolveEffect::New(mUseHighPrecision); + mDissolveEffect = Dali::Toolkit::CreateDissolveEffect(mUseHighPrecision); if(mUseHighPrecision) { mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_HIGHP) ); - mEffectChangeButton.SetBackgroundImage(mIconHighP); + mEffectChangeButton.SetButtonImage( mIconHighP ); + mEffectChangeButton.SetSelectedImage( mIconHighPSelected ); } else { - mEffectChangeButton.SetBackgroundImage(mIconMediumP); + mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_MEDIUMP) ); + mEffectChangeButton.SetButtonImage( mIconMediumP ); + mEffectChangeButton.SetSelectedImage( mIconMediumPSelected ); } return true; @@ -355,14 +366,16 @@ bool DissolveEffectApp::OnSildeshowButtonClicked( Toolkit::Button button ) mSlideshow = !mSlideshow; if( mSlideshow ) { - mPlayStopButton.SetBackgroundImage( mIconStop ); + mPlayStopButton.SetButtonImage( mIconStop ); + mPlayStopButton.SetSelectedImage( mIconStopSelected ); mPanGestureDetector.Detach( mParent ); mViewTimer.Start(); mTimerReady = false; } else { - mPlayStopButton.SetBackgroundImage( mIconPlay ); + mPlayStopButton.SetButtonImage( mIconPlay ); + mPlayStopButton.SetSelectedImage( mIconPlaySelected ); mTimerReady = true; mPanGestureDetector.Attach( mParent ); } @@ -371,8 +384,7 @@ bool DissolveEffectApp::OnSildeshowButtonClicked( Toolkit::Button button ) void DissolveEffectApp::OnTransitionCompleted( Animation& source ) { - mCurrentImage.RemoveShaderEffect(); - mNextImage.RemoveShaderEffect(); + mNextImage.SetProperty( Toolkit::ImageView::Property::IMAGE, mEmptyEffect ); mParent.Remove( mCurrentImage ); mPanGestureDetector.Detach( mCurrentImage ); mCurrentImage = mNextImage; @@ -393,9 +405,10 @@ bool DissolveEffectApp::OnTimerTick() { mIndex = (mIndex + 1)%NUM_IMAGES; Image image = LoadStageFillingImage( IMAGES[ mIndex ] ); - mNextImage = ImageActor::New( image ); - mNextImage.SetPositionInheritanceMode(USE_PARENT_POSITION_PLUS_LOCAL_POSITION); - mNextImage.ApplyConstraint( mSizeConstraint ); + mNextImage = Toolkit::ImageView::New( image ); + mNextImage.SetParentOrigin( ParentOrigin::CENTER ); + mNextImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + mNextImage.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); mNextImage.SetZ(INITIAL_DEPTH); mParent.Add( mNextImage ); switch( mCentralLineIndex%4 ) @@ -428,9 +441,9 @@ bool DissolveEffectApp::OnTimerTick() } // Entry point for Linux & Tizen applications -int main( int argc, char **argv ) +int DALI_EXPORT_API main( int argc, char **argv ) { - Application application = Application::New( &argc, &argv ); + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); DissolveEffectApp test( application ); application.MainLoop();