X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fanimated-vector-image-visual.cpp;h=5b0c1c473601f76e8ceffa71ec4a206804025fd9;hp=aed37a208786098a1599c9016a5fb4b02a2829eb;hb=52f294c7dc6b1bbd3265489a2d8f70659ed88931;hpb=31b36444ed21fdf36b641ba9de528cc154b332ee diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp index aed37a2..5b0c1c4 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -52,10 +52,29 @@ const Dali::Vector4 FULL_TEXTURE_RECT( 0.f, 0.f, 1.f, 1.f ); // Flags for re-sending data to the rasterize thread enum Flags { - RESEND_PLAY_RANGE = 1 << 0, - RESEND_LOOP_COUNT = 1 << 1 + RESEND_PLAY_RANGE = 1 << 0, + RESEND_LOOP_COUNT = 1 << 1, + RESEND_STOP_BEHAVIOR = 1 << 2, + RESEND_LOOPING_MODE = 1 << 3 }; +// stop behavior +DALI_ENUM_TO_STRING_TABLE_BEGIN( STOP_BEHAVIOR ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, CURRENT_FRAME ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, FIRST_FRAME ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, LAST_FRAME ) +DALI_ENUM_TO_STRING_TABLE_END( STOP_BEHAVIOR ) + +// looping mode +DALI_ENUM_TO_STRING_TABLE_BEGIN( LOOPING_MODE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::LoopingMode, RESTART ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::LoopingMode, AUTO_REVERSE ) +DALI_ENUM_TO_STRING_TABLE_END( LOOPING_MODE ) + +#if defined(DEBUG_ENABLED) +Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VECTOR_ANIMATION" ); +#endif + } // unnamed namespace AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties ) @@ -79,16 +98,21 @@ AnimatedVectorImageVisual::AnimatedVectorImageVisual( VisualFactoryCache& factor mUrl( imageUrl ), mVectorRasterizeThread( imageUrl.GetUrl() ), mVisualSize(), - mPlayRange( 0.0f, 1.0f ), + mVisualScale( Vector2::ONE ), mPlacementActor(), mLoopCount( LOOP_FOREVER ), + mStartFrame( 0 ), + mEndFrame( 0 ), mResendFlag( 0 ), - mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP ) + mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP ), + mStopBehavior( DevelImageVisual::StopBehavior::CURRENT_FRAME ), + mLoopingMode( DevelImageVisual::LoopingMode::RESTART ), + mRendererAdded( false ) { // the rasterized image is with pre-multiplied alpha format mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; - mVectorRasterizeThread.SetResourceReadyCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnResourceReady ) ) ); + mVectorRasterizeThread.UploadCompletedSignal().Connect( this, &AnimatedVectorImageVisual::OnUploadCompleted ); mVectorRasterizeThread.SetAnimationFinishedCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnAnimationFinished ) ) ); mVectorRasterizeThread.Start(); @@ -100,7 +124,19 @@ AnimatedVectorImageVisual::~AnimatedVectorImageVisual() void AnimatedVectorImageVisual::GetNaturalSize( Vector2& naturalSize ) { - naturalSize = mVisualSize; + if( mVisualSize != Vector2::ZERO ) + { + naturalSize = mVisualSize; + } + else + { + uint32_t width, height; + mVectorRasterizeThread.GetDefaultSize( width, height ); + naturalSize.x = width; + naturalSize.y = height; + } + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::GetNaturalSize: w = %f, h = %f [%p]\n", naturalSize.width, naturalSize.height, this ); } void AnimatedVectorImageVisual::DoCreatePropertyMap( Property::Map& map ) const @@ -112,9 +148,18 @@ void AnimatedVectorImageVisual::DoCreatePropertyMap( Property::Map& map ) const map.Insert( Toolkit::ImageVisual::Property::URL, mUrl.GetUrl() ); } map.Insert( Toolkit::DevelImageVisual::Property::LOOP_COUNT, mLoopCount ); - map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, mPlayRange ); + + Property::Array playRange; + playRange.PushBack( mStartFrame ); + playRange.PushBack( mEndFrame ); + map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, playRange ); + map.Insert( Toolkit::DevelImageVisual::Property::PLAY_STATE, static_cast< int >( mVectorRasterizeThread.GetPlayState() ) ); - map.Insert( Toolkit::DevelImageVisual::Property::CURRENT_PROGRESS, mVectorRasterizeThread.GetCurrentProgress() ); + map.Insert( Toolkit::DevelImageVisual::Property::CURRENT_FRAME_NUMBER, static_cast< int32_t >( mVectorRasterizeThread.GetCurrentFrameNumber() ) ); + map.Insert( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, static_cast< int32_t >( mVectorRasterizeThread.GetTotalFrameNumber() ) ); + + map.Insert( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, mStopBehavior ); + map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mLoopingMode ); } void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const @@ -142,6 +187,14 @@ void AnimatedVectorImageVisual::DoSetProperties( const Property::Map& propertyMa { DoSetProperty( Toolkit::DevelImageVisual::Property::PLAY_RANGE, keyValue.second ); } + else if( keyValue.first == STOP_BEHAVIOR_NAME ) + { + DoSetProperty( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, keyValue.second ); + } + else if( keyValue.first == LOOPING_MODE_NAME ) + { + DoSetProperty( Toolkit::DevelImageVisual::Property::LOOPING_MODE, keyValue.second ); + } } } } @@ -162,11 +215,48 @@ void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Prop } case Toolkit::DevelImageVisual::Property::PLAY_RANGE: { - Vector2 range; - if( value.Get( range ) ) + Property::Array* array = value.GetArray(); + if( array ) + { + size_t count = array->Count(); + if( count >= 2 ) + { + int startFrame, endFrame; + int totalFrame = mVectorRasterizeThread.GetTotalFrameNumber(); + array->GetElementAt( 0 ).Get( startFrame ); + array->GetElementAt( 1 ).Get( endFrame ); + + if( startFrame >= 0 && startFrame < totalFrame && endFrame >= 0 && endFrame < totalFrame ) + { + mStartFrame = startFrame; + mEndFrame = endFrame; + mResendFlag |= RESEND_PLAY_RANGE; + } + else + { + DALI_LOG_ERROR( "Invalid play range [%d, %d / %d]\n", startFrame, endFrame, totalFrame ); + } + } + } + break; + } + case Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR: + { + int32_t stopBehavior = mStopBehavior; + if( Scripting::GetEnumerationProperty( value, STOP_BEHAVIOR_TABLE, STOP_BEHAVIOR_TABLE_COUNT, stopBehavior ) ) + { + mStopBehavior = DevelImageVisual::StopBehavior::Type( stopBehavior ); + mResendFlag |= RESEND_STOP_BEHAVIOR; + } + break; + } + case Toolkit::DevelImageVisual::Property::LOOPING_MODE: + { + int32_t loopingMode = mLoopingMode; + if( Scripting::GetEnumerationProperty( value, LOOPING_MODE_TABLE, LOOPING_MODE_TABLE_COUNT, loopingMode ) ) { - mPlayRange = range; - mResendFlag |= RESEND_PLAY_RANGE; + mLoopingMode = DevelImageVisual::LoopingMode::Type( loopingMode ); + mResendFlag |= RESEND_LOOPING_MODE; } break; } @@ -206,6 +296,15 @@ void AnimatedVectorImageVisual::DoSetOnStage( Actor& actor ) mPlacementActor = actor; mVectorRasterizeThread.SetRenderer( mImpl->mRenderer ); + + // Add property notification for scaling & size + mScaleNotification = actor.AddPropertyNotification( Actor::Property::WORLD_SCALE, StepCondition( 0.1f, 1.0f ) ); + mScaleNotification.NotifySignal().Connect( this, &AnimatedVectorImageVisual::OnScaleNotification ); + + mSizeNotification = actor.AddPropertyNotification( Actor::Property::SIZE, StepCondition( 3.0f ) ); + mSizeNotification.NotifySignal().Connect( this, &AnimatedVectorImageVisual::OnSizeNotification ); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnStage [%p]\n", this ); } void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) @@ -220,29 +319,34 @@ void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); + + mRendererAdded = false; } + // Remove property notification + actor.RemovePropertyNotification( mScaleNotification ); + actor.RemovePropertyNotification( mSizeNotification ); + mPlacementActor.Reset(); // Reset the visual size to zero so that when adding the actor back to stage the rasterization is forced mVisualSize = Vector2::ZERO; + mVisualScale = Vector2::ONE; + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOffStage [%p]\n", this ); } void AnimatedVectorImageVisual::OnSetTransform() { Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize ); - if( IsOnStage() ) + if( IsOnStage() && visualSize != mVisualSize ) { - if( visualSize != mVisualSize ) - { - mVisualSize = visualSize; + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f [%p]\n", visualSize.width, visualSize.height, this ); - uint32_t width = static_cast< uint32_t >( visualSize.width ); - uint32_t height = static_cast< uint32_t >( visualSize.height ); + mVisualSize = visualSize; - mVectorRasterizeThread.SetSize( width, height ); - } + SetVectorImageSize(); SendAnimationData(); @@ -257,18 +361,6 @@ void AnimatedVectorImageVisual::OnSetTransform() // Render one frame mVectorRasterizeThread.RenderFrame(); } - - if( mVectorRasterizeThread.IsResourceReady() ) - { - Actor actor = mPlacementActor.GetHandle(); - if( actor ) - { - actor.AddRenderer( mImpl->mRenderer ); - mPlacementActor.Reset(); - } - - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); - } } } @@ -305,18 +397,28 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons if( mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::STOPPED ) { mVectorRasterizeThread.StopAnimation(); + } - OnAnimationFinished(); + if( mImpl->mRenderer ) + { + mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); } + mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; break; } case DevelAnimatedVectorImageVisual::Action::JUMP_TO: { - float progress; - if( attributes.Get( progress ) ) + int32_t frameNumber; + if( attributes.Get( frameNumber ) ) { - mVectorRasterizeThread.SetCurrentProgress( progress ); + mVectorRasterizeThread.SetCurrentFrameNumber( frameNumber ); + + if( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING ) + { + mVectorRasterizeThread.RenderFrame(); + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering + } } break; } @@ -334,28 +436,34 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons } } -void AnimatedVectorImageVisual::OnResourceReady() +void AnimatedVectorImageVisual::OnUploadCompleted() { // If weak handle is holding a placement actor, it is the time to add the renderer to actor. Actor actor = mPlacementActor.GetHandle(); - if( actor ) + if( actor && !mRendererAdded ) { actor.AddRenderer( mImpl->mRenderer ); - // reset the weak handle so that the renderer only get added to actor once - mPlacementActor.Reset(); - - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + mRendererAdded = true; } + + ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnUploadCompleted: Renderer is added [%p]\n", this ); } void AnimatedVectorImageVisual::OnAnimationFinished() { - if( mImpl->mEventObserver ) + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnAnimationFinished: action state = %d [%p]\n", mActionStatus, this ); + + if( mActionStatus != DevelAnimatedVectorImageVisual::Action::STOP ) { - mImpl->mEventObserver->NotifyVisualEvent( *this, DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED ); - } + mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; - mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; + if( mImpl->mEventObserver ) + { + mImpl->mEventObserver->NotifyVisualEvent( *this, DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED ); + } + } if( mImpl->mRenderer ) { @@ -381,23 +489,80 @@ void AnimatedVectorImageVisual::SendAnimationData() if( mResendFlag & RESEND_PLAY_RANGE ) { - mVectorRasterizeThread.SetPlayRange( mPlayRange ); + mVectorRasterizeThread.SetPlayRange( mStartFrame, mEndFrame ); } - if( isPlaying ) + if( mResendFlag & RESEND_STOP_BEHAVIOR ) { - mVectorRasterizeThread.PlayAnimation(); + mVectorRasterizeThread.SetStopBehavior( mStopBehavior ); } - else + + if( mResendFlag & RESEND_LOOPING_MODE ) { - mVectorRasterizeThread.RenderFrame(); - Stage::GetCurrent().KeepRendering( 0.0f ); + mVectorRasterizeThread.SetLoopingMode( mLoopingMode ); + } + + if( IsOnStage() ) + { + if( isPlaying ) + { + mVectorRasterizeThread.PlayAnimation(); + } + else + { + mVectorRasterizeThread.RenderFrame(); + Stage::GetCurrent().KeepRendering( 0.0f ); + } } mResendFlag = 0; } } +void AnimatedVectorImageVisual::SetVectorImageSize() +{ + uint32_t width = static_cast< uint32_t >( mVisualSize.width * mVisualScale.width ); + uint32_t height = static_cast< uint32_t >( mVisualSize.height * mVisualScale.height ); + + mVectorRasterizeThread.SetSize( width, height ); + + if( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING ) + { + mVectorRasterizeThread.RenderFrame(); + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering + } +} + +void AnimatedVectorImageVisual::OnScaleNotification( PropertyNotification& source ) +{ + Actor actor = mPlacementActor.GetHandle(); + if( actor ) + { + Vector3 scale = actor.GetProperty< Vector3 >( Actor::Property::WORLD_SCALE ); + mVisualScale.width = scale.width; + mVisualScale.height = scale.height; + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnScaleNotification: scale = %f, %f [%p]\n", mVisualScale.width, mVisualScale.height, this ); + + SetVectorImageSize(); + } +} + +void AnimatedVectorImageVisual::OnSizeNotification( PropertyNotification& source ) +{ + Actor actor = mPlacementActor.GetHandle(); + if( actor ) + { + Vector3 size = actor.GetCurrentSize(); + mVisualSize.width = size.width; + mVisualSize.height = size.height; + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSizeNotification: size = %f, %f [%p]\n", mVisualSize.width, mVisualSize.height, this ); + + SetVectorImageSize(); + } +} + } // namespace Internal } // namespace Toolkit