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=a2d102a10a768d5f8635ec1bc2477450a5ef8018;hp=fbb727b8332ac06725507d2e48b85b9d02845bc1;hb=55e5ea8082729deca6f0f43f01aeae8dd51a4bdb;hpb=b0d0b451bd3414c8f502810f45fcacba2882d717 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 fbb727b..a2d102a 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) 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. @@ -19,8 +19,9 @@ #include // EXTERNAL INCLUDES -#include +#include #include +#include #include // INTERNAL INCLUDES @@ -32,6 +33,7 @@ #include #include #include +#include namespace Dali { @@ -45,16 +47,20 @@ namespace Internal namespace { -constexpr auto LOOP_FOREVER = -1; - 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 -}; +// 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" ); @@ -78,52 +84,69 @@ AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New( VisualFactoryCache& } AnimatedVectorImageVisual::AnimatedVectorImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL ), - mImageVisualShaderFactory( shaderFactory ), +: Visual::Base( factoryCache, Visual::FittingMode::FILL, static_cast( Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE ) ), mUrl( imageUrl ), - mVectorRasterizeThread( imageUrl.GetUrl() ), + mAnimationData(), + mVectorAnimationTask( new VectorAnimationTask( factoryCache, imageUrl.GetUrl() ) ), + mImageVisualShaderFactory( shaderFactory ), mVisualSize(), + mVisualScale( Vector2::ONE ), mPlacementActor(), - mLoopCount( LOOP_FOREVER ), - mStartFrame( 0 ), - mEndFrame( 0 ), - mResendFlag( 0 ), - mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP ) + mPlayState( DevelImageVisual::PlayState::STOPPED ), + mEventCallback( nullptr ), + mRendererAdded( false ), + mCoreShutdown(false), + mRedrawInScalingDown(true) { // the rasterized image is with pre-multiplied alpha format mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; - mVectorRasterizeThread.SetResourceReadyCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnResourceReady ) ) ); - mVectorRasterizeThread.SetAnimationFinishedCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnAnimationFinished ) ) ); + mVectorAnimationTask->UploadCompletedSignal().Connect( this, &AnimatedVectorImageVisual::OnUploadCompleted ); + mVectorAnimationTask->SetAnimationFinishedCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnAnimationFinished ) ) ); - mVectorRasterizeThread.Start(); + auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager(); + vectorAnimationManager.AddObserver(*this); } AnimatedVectorImageVisual::~AnimatedVectorImageVisual() { + if( ! mCoreShutdown ) + { + auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager(); + vectorAnimationManager.RemoveObserver(*this); + + if( mEventCallback ) + { + mFactoryCache.GetVectorAnimationManager().UnregisterEventCallback( mEventCallback ); + } + + // Finalize animation task and disconnect the signal in the main thread + mVectorAnimationTask->UploadCompletedSignal().Disconnect( this, &AnimatedVectorImageVisual::OnUploadCompleted ); + mVectorAnimationTask->Finalize(); + } +} + +void AnimatedVectorImageVisual::VectorAnimationManagerDestroyed() +{ + // Core is shutting down. Don't talk to the plugin any more. + mCoreShutdown = true; } void AnimatedVectorImageVisual::GetNaturalSize( Vector2& naturalSize ) { - if( mImpl->mRenderer ) // Check if we have a rendered image + if( mVisualSize != Vector2::ZERO ) { - auto textureSet = mImpl->mRenderer.GetTextures(); - if( textureSet ) - { - if( textureSet.GetTextureCount() > 0 ) - { - auto texture = textureSet.GetTexture( 0 ); - naturalSize.x = texture.GetWidth(); - naturalSize.y = texture.GetHeight(); - return; - } - } + naturalSize = mVisualSize; + } + else + { + uint32_t width, height; + mVectorAnimationTask->GetDefaultSize( width, height ); + naturalSize.x = width; + naturalSize.y = height; } - 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 @@ -134,16 +157,27 @@ 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::LOOP_COUNT, mAnimationData.loopCount ); + + uint32_t startFrame, endFrame; + mVectorAnimationTask->GetPlayRange( startFrame, endFrame ); Property::Array playRange; - playRange.PushBack( mStartFrame ); - playRange.PushBack( mEndFrame ); + playRange.PushBack( static_cast< int32_t >( startFrame ) ); + playRange.PushBack( static_cast< int32_t >( endFrame ) ); 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_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::PLAY_STATE, static_cast< int32_t >( mPlayState ) ); + map.Insert( Toolkit::DevelImageVisual::Property::CURRENT_FRAME_NUMBER, static_cast< int32_t >( mVectorAnimationTask->GetCurrentFrameNumber() ) ); + map.Insert( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, static_cast< int32_t >( mVectorAnimationTask->GetTotalFrameNumber() ) ); + + map.Insert( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, mAnimationData.stopBehavior ); + map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mAnimationData.loopingMode ); + map.Insert( Toolkit::DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, mRedrawInScalingDown ); + + Property::Map layerInfo; + mVectorAnimationTask->GetLayerInfo( layerInfo ); + map.Insert( Toolkit::DevelImageVisual::Property::CONTENT_INFO, layerInfo ); } void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const @@ -171,8 +205,22 @@ 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 ); + } + else if( keyValue.first == REDRAW_IN_SCALING_DOWN_NAME ) + { + DoSetProperty( Toolkit::DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, keyValue.second ); + } } } + + TriggerVectorRasterization(); } void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Property::Value& value ) @@ -184,56 +232,68 @@ void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Prop int32_t loopCount; if( value.Get( loopCount ) ) { - mLoopCount = loopCount; - mResendFlag |= RESEND_LOOP_COUNT; + mAnimationData.loopCount = loopCount; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_LOOP_COUNT; } break; } case Toolkit::DevelImageVisual::Property::PLAY_RANGE: { - Property::Array* array = value.GetArray(); + const 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 ); - } - } + mAnimationData.playRange = *array; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_RANGE; + } + break; + } + case Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR: + { + int32_t stopBehavior = mAnimationData.stopBehavior; + if( Scripting::GetEnumerationProperty( value, STOP_BEHAVIOR_TABLE, STOP_BEHAVIOR_TABLE_COUNT, stopBehavior ) ) + { + mAnimationData.stopBehavior = DevelImageVisual::StopBehavior::Type( stopBehavior ); + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_STOP_BEHAVIOR; + } + break; + } + case Toolkit::DevelImageVisual::Property::LOOPING_MODE: + { + int32_t loopingMode = mAnimationData.loopingMode; + if( Scripting::GetEnumerationProperty( value, LOOPING_MODE_TABLE, LOOPING_MODE_TABLE_COUNT, loopingMode ) ) + { + mAnimationData.loopingMode = DevelImageVisual::LoopingMode::Type( loopingMode ); + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_LOOPING_MODE; + } + break; + } + case Toolkit::DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN: + { + bool redraw; + if( value.Get( redraw ) ) + { + mRedrawInScalingDown = redraw; } break; } } } -void AnimatedVectorImageVisual::DoSetOnStage( Actor& actor ) +void AnimatedVectorImageVisual::DoSetOnScene( Actor& actor ) { Shader shader; if( mImpl->mCustomShader ) { - shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource() : mImpl->mCustomShader->mVertexShader, - mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource() : mImpl->mCustomShader->mFragmentShader, + shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource().data() : mImpl->mCustomShader->mVertexShader, + mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource().data() : mImpl->mCustomShader->mFragmentShader, mImpl->mCustomShader->mHints ); shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); } else { - shader = mImageVisualShaderFactory.GetShader( mFactoryCache, false, true ); + shader = mImageVisualShaderFactory.GetShader( mFactoryCache, false, true, false ); } Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); @@ -251,72 +311,79 @@ void AnimatedVectorImageVisual::DoSetOnStage( Actor& actor ) // Hold the weak handle of the placement actor and delay the adding of renderer until the rasterization is finished. mPlacementActor = actor; - mVectorRasterizeThread.SetRenderer( mImpl->mRenderer ); + mVectorAnimationTask->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 ); + + DevelActor::VisibilityChangedSignal( actor ).Connect( this, &AnimatedVectorImageVisual::OnControlVisibilityChanged ); + + Window window = DevelWindow::Get( actor ); + if( window ) + { + DevelWindow::VisibilityChangedSignal( window ).Connect( this, &AnimatedVectorImageVisual::OnWindowVisibilityChanged ); + } + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnScene [%p]\n", this ); } -void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) +void AnimatedVectorImageVisual::DoSetOffScene( Actor& actor ) { - mVectorRasterizeThread.PauseAnimation(); - - mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE; + StopAnimation(); + SendAnimationData(); if( mImpl->mRenderer ) { - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); - actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); + + mRendererAdded = false; + } + + // Remove property notification + actor.RemovePropertyNotification( mScaleNotification ); + actor.RemovePropertyNotification( mSizeNotification ); + + DevelActor::VisibilityChangedSignal( actor ).Disconnect( this, &AnimatedVectorImageVisual::OnControlVisibilityChanged ); + + Window window = DevelWindow::Get( actor ); + if( window ) + { + DevelWindow::VisibilityChangedSignal( window ).Disconnect( this, &AnimatedVectorImageVisual::OnWindowVisibilityChanged ); } 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::DoSetOffScene [%p]\n", this ); } void AnimatedVectorImageVisual::OnSetTransform() { Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize ); - if( IsOnStage() ) + if( IsOnScene() && visualSize != mVisualSize ) { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f\n", visualSize.width, visualSize.height ); - - if( visualSize != mVisualSize ) - { - mVisualSize = visualSize; - - uint32_t width = static_cast< uint32_t >( visualSize.width ); - uint32_t height = static_cast< uint32_t >( visualSize.height ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f [%p]\n", visualSize.width, visualSize.height, this ); - mVectorRasterizeThread.SetSize( width, height ); - } + mVisualSize = visualSize; - SendAnimationData(); + SetVectorImageSize(); - if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY ) - { - mVectorRasterizeThread.PlayAnimation(); - - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY ); - } - else + if( mPlayState == DevelImageVisual::PlayState::PLAYING && mAnimationData.playState != DevelImageVisual::PlayState::PLAYING ) { - // Render one frame - mVectorRasterizeThread.RenderFrame(); + mAnimationData.playState = DevelImageVisual::PlayState::PLAYING; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; } - if( mVectorRasterizeThread.IsResourceReady() ) - { - Actor actor = mPlacementActor.GetHandle(); - if( actor ) - { - actor.AddRenderer( mImpl->mRenderer ); - mPlacementActor.Reset(); - } - - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); - } + SendAnimationData(); } } @@ -327,36 +394,35 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons { case DevelAnimatedVectorImageVisual::Action::PLAY: { - if( IsOnStage() && mVisualSize != Vector2::ZERO ) + if( IsOnScene() && mVisualSize != Vector2::ZERO ) { - mVectorRasterizeThread.PlayAnimation(); - - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY ); + if( mAnimationData.playState != DevelImageVisual::PlayState::PLAYING ) + { + mAnimationData.playState = DevelImageVisual::PlayState::PLAYING; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; + } } - mActionStatus = DevelAnimatedVectorImageVisual::Action::PLAY; + mPlayState = DevelImageVisual::PlayState::PLAYING; break; } case DevelAnimatedVectorImageVisual::Action::PAUSE: { - mVectorRasterizeThread.PauseAnimation(); - - if( mImpl->mRenderer ) + if( mAnimationData.playState == DevelImageVisual::PlayState::PLAYING ) { - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); + mAnimationData.playState = DevelImageVisual::PlayState::PAUSED; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; } - - mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE; + mPlayState = DevelImageVisual::PlayState::PAUSED; break; } case DevelAnimatedVectorImageVisual::Action::STOP: { - if( mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::STOPPED ) + if( mAnimationData.playState != DevelImageVisual::PlayState::STOPPED ) { - mVectorRasterizeThread.StopAnimation(); - - OnAnimationFinished(); + mAnimationData.playState = DevelImageVisual::PlayState::STOPPED; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; } - mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; + mPlayState = DevelImageVisual::PlayState::STOPPED; break; } case DevelAnimatedVectorImageVisual::Action::JUMP_TO: @@ -364,52 +430,55 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons int32_t frameNumber; if( attributes.Get( frameNumber ) ) { - mVectorRasterizeThread.SetCurrentFrameNumber( frameNumber ); - - if( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING ) - { - mVectorRasterizeThread.RenderFrame(); - Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering - } + mAnimationData.currentFrame = frameNumber; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_CURRENT_FRAME; } break; } case DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY: { - Property::Map* map = attributes.GetMap(); + const Property::Map* map = attributes.GetMap(); if( map ) { DoSetProperties( *map ); - - SendAnimationData(); } break; } } + + TriggerVectorRasterization(); } -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(); + 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", mPlayState, this ); + + if( mPlayState != DevelImageVisual::PlayState::STOPPED ) { - mImpl->mEventObserver->NotifyVisualEvent( *this, DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED ); - } + mPlayState = DevelImageVisual::PlayState::STOPPED; - mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; + mAnimationData.playState = DevelImageVisual::PlayState::STOPPED; + + if( mImpl->mEventObserver ) + { + mImpl->mEventObserver->NotifyVisualEvent( *this, DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED ); + } + } if( mImpl->mRenderer ) { @@ -419,42 +488,127 @@ void AnimatedVectorImageVisual::OnAnimationFinished() void AnimatedVectorImageVisual::SendAnimationData() { - if( mResendFlag ) + if( mAnimationData.resendFlag ) { - bool isPlaying = false; - if( mVectorRasterizeThread.GetPlayState() == DevelImageVisual::PlayState::PLAYING ) - { - mVectorRasterizeThread.PauseAnimation(); - isPlaying = true; - } - - if( mResendFlag & RESEND_LOOP_COUNT ) - { - mVectorRasterizeThread.SetLoopCount( mLoopCount ); - } - - if( mResendFlag & RESEND_PLAY_RANGE ) - { - mVectorRasterizeThread.SetPlayRange( mStartFrame, mEndFrame ); - } + mVectorAnimationTask->SetAnimationData( mAnimationData ); - if( IsOnStage() ) + if( mImpl->mRenderer ) { - if( isPlaying ) + if( mAnimationData.playState == DevelImageVisual::PlayState::PLAYING ) { - mVectorRasterizeThread.PlayAnimation(); + mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY ); } else { - mVectorRasterizeThread.RenderFrame(); - Stage::GetCurrent().KeepRendering( 0.0f ); + mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); } } - mResendFlag = 0; + mAnimationData.resendFlag = 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 ); + + mAnimationData.width = width; + mAnimationData.height = height; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_SIZE; +} + +void AnimatedVectorImageVisual::StopAnimation() +{ + if( mAnimationData.playState != DevelImageVisual::PlayState::STOPPED ) + { + mAnimationData.playState = DevelImageVisual::PlayState::STOPPED; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; + + mPlayState = DevelImageVisual::PlayState::STOPPED; + } +} + +void AnimatedVectorImageVisual::TriggerVectorRasterization() +{ + if( !mEventCallback && !mCoreShutdown ) + { + mEventCallback = MakeCallback( this, &AnimatedVectorImageVisual::OnProcessEvents ); + auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager(); + vectorAnimationManager.RegisterEventCallback( mEventCallback ); + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger event processing + } +} + +void AnimatedVectorImageVisual::OnScaleNotification( PropertyNotification& source ) +{ + Actor actor = mPlacementActor.GetHandle(); + if( actor ) + { + Vector3 scale = actor.GetProperty< Vector3 >( Actor::Property::WORLD_SCALE ); + + if(mRedrawInScalingDown || scale.width >= 1.0f || scale.height >= 1.0f) + { + 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(); + SendAnimationData(); + + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger event processing + } + } +} + +void AnimatedVectorImageVisual::OnSizeNotification( PropertyNotification& source ) +{ + Actor actor = mPlacementActor.GetHandle(); + if( actor ) + { + Vector3 size = actor.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); + 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(); + SendAnimationData(); + + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger event processing + } +} + +void AnimatedVectorImageVisual::OnControlVisibilityChanged( Actor actor, bool visible, DevelActor::VisibilityChange::Type type ) +{ + if( !visible ) + { + StopAnimation(); + TriggerVectorRasterization(); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnControlVisibilityChanged: invisibile. Pause animation [%p]\n", this ); + } +} + +void AnimatedVectorImageVisual::OnWindowVisibilityChanged( Window window, bool visible ) +{ + if( !visible ) + { + StopAnimation(); + TriggerVectorRasterization(); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnWindowVisibilityChanged: invisibile. Pause animation [%p]\n", this ); + } +} + +void AnimatedVectorImageVisual::OnProcessEvents() +{ + SendAnimationData(); + + mEventCallback = nullptr; // The callback will be deleted in the VectorAnimationManager +} + } // namespace Internal } // namespace Toolkit