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=c6604ada6704ec901b67fa8e4c39df40e841083e;hp=d4de346f06cd9c02aa867835a7bb35118eee0fac;hb=7018f61b640b6fcf9cb576b537bafcb6bb8240e8;hpb=a9952e403923ff9fde73b96c0f14e177e7ba4a74 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 d4de346..c6604ad 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) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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,587 +19,614 @@ #include // EXTERNAL INCLUDES -#include -#include #include +#include +#include #include // INTERNAL INCLUDES -#include -#include -#include #include +#include +#include #include +#include #include #include -#include +#include +#include namespace Dali { - namespace Toolkit { - 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, - RESEND_STOP_BEHAVIOR = 1 << 2, - RESEND_LOOPING_MODE = 1 << 3 -}; +const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); // 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 ) +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 ) +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" ); +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 ) +AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties) { - AnimatedVectorImageVisualPtr visual( new AnimatedVectorImageVisual( factoryCache, shaderFactory, imageUrl ) ); - visual->SetProperties( properties ); - + AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl)); + visual->SetProperties(properties); + visual->Initialize(); return visual; } -AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl ) +AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl) { - AnimatedVectorImageVisualPtr visual( new AnimatedVectorImageVisual( factoryCache, shaderFactory, imageUrl ) ); - + AnimatedVectorImageVisualPtr visual(new AnimatedVectorImageVisual(factoryCache, shaderFactory, imageUrl)); + visual->Initialize(); return visual; } -AnimatedVectorImageVisual::AnimatedVectorImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL ), - mUrl( imageUrl ), - mVectorAnimationTask( new VectorAnimationTask( factoryCache, imageUrl.GetUrl() ) ), - mImageVisualShaderFactory( shaderFactory ), +AnimatedVectorImageVisual::AnimatedVectorImageVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl) +: Visual::Base(factoryCache, Visual::FittingMode::FILL, static_cast(Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE)), + mUrl(imageUrl), + mAnimationData(), + mVectorAnimationTask(new VectorAnimationTask(factoryCache)), + mImageVisualShaderFactory(shaderFactory), mVisualSize(), - mVisualScale( Vector2::ONE ), - mPlayRange(), + mVisualScale(Vector2::ONE), mPlacementActor(), - mLoopCount( LOOP_FOREVER ), - mResendFlag( 0 ), - mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP ), - mStopBehavior( DevelImageVisual::StopBehavior::CURRENT_FRAME ), - mLoopingMode( DevelImageVisual::LoopingMode::RESTART ), - mRendererAdded( false ) + mPlayState(DevelImageVisual::PlayState::STOPPED), + mEventCallback(nullptr), + mLoadFailed(false), + mRendererAdded(false), + mCoreShutdown(false), + mRedrawInScalingDown(true) { // the rasterized image is with pre-multiplied alpha format mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; - mVectorAnimationTask->UploadCompletedSignal().Connect( this, &AnimatedVectorImageVisual::OnUploadCompleted ); - mVectorAnimationTask->SetAnimationFinishedCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnAnimationFinished ) ) ); + if(!mVectorAnimationTask->Load(mUrl.GetUrl())) + { + mLoadFailed = true; + } + + mVectorAnimationTask->UploadCompletedSignal().Connect(this, &AnimatedVectorImageVisual::OnUploadCompleted); + mVectorAnimationTask->SetAnimationFinishedCallback(new EventThreadCallback(MakeCallback(this, &AnimatedVectorImageVisual::OnAnimationFinished))); + + auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager(); + vectorAnimationManager.AddObserver(*this); } AnimatedVectorImageVisual::~AnimatedVectorImageVisual() { - // Finalize animation task in the main thread - mVectorAnimationTask->Finalize(); + 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 ) +void AnimatedVectorImageVisual::GetNaturalSize(Vector2& naturalSize) { - if( mVisualSize != Vector2::ZERO ) + if(mVisualSize != Vector2::ZERO) { naturalSize = mVisualSize; } else { uint32_t width, height; - mVectorAnimationTask->GetDefaultSize( width, height ); + mVectorAnimationTask->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 ); + 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 +void AnimatedVectorImageVisual::DoCreatePropertyMap(Property::Map& map) const { map.Clear(); - map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE ); - if( mUrl.IsValid() ) + map.Insert(Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE); + if(mUrl.IsValid()) { - map.Insert( Toolkit::ImageVisual::Property::URL, mUrl.GetUrl() ); + 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 ); + mVectorAnimationTask->GetPlayRange(startFrame, endFrame); Property::Array playRange; - playRange.PushBack( static_cast< int32_t >( startFrame ) ); - playRange.PushBack( static_cast< int32_t >( endFrame ) ); - map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, playRange ); + playRange.PushBack(static_cast(startFrame)); + playRange.PushBack(static_cast(endFrame)); + map.Insert(Toolkit::DevelImageVisual::Property::PLAY_RANGE, playRange); - map.Insert( Toolkit::DevelImageVisual::Property::PLAY_STATE, static_cast< int32_t >( mVectorAnimationTask->GetPlayState() ) ); - 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::PLAY_STATE, static_cast(mPlayState)); + map.Insert(Toolkit::DevelImageVisual::Property::CURRENT_FRAME_NUMBER, static_cast(mVectorAnimationTask->GetCurrentFrameNumber())); + map.Insert(Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, static_cast(mVectorAnimationTask->GetTotalFrameNumber())); - map.Insert( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, mStopBehavior ); - map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mLoopingMode ); + 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 ); + mVectorAnimationTask->GetLayerInfo(layerInfo); + map.Insert(Toolkit::DevelImageVisual::Property::CONTENT_INFO, layerInfo); } -void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const +void AnimatedVectorImageVisual::DoCreateInstancePropertyMap(Property::Map& map) const { // Do nothing } -void AnimatedVectorImageVisual::DoSetProperties( const Property::Map& propertyMap ) +void AnimatedVectorImageVisual::DoSetProperties(const Property::Map& propertyMap) { // url already passed in from constructor - for( Property::Map::SizeType iter = 0; iter < propertyMap.Count(); ++iter ) + for(Property::Map::SizeType iter = 0; iter < propertyMap.Count(); ++iter) { - KeyValuePair keyValue = propertyMap.GetKeyValue( iter ); - if( keyValue.first.type == Property::Key::INDEX ) + KeyValuePair keyValue = propertyMap.GetKeyValue(iter); + if(keyValue.first.type == Property::Key::INDEX) { - DoSetProperty( keyValue.first.indexKey, keyValue.second ); + DoSetProperty(keyValue.first.indexKey, keyValue.second); } else { - if( keyValue.first == LOOP_COUNT_NAME ) - { - DoSetProperty( Toolkit::DevelImageVisual::Property::LOOP_COUNT, keyValue.second ); - } - else if( keyValue.first == PLAY_RANGE_NAME ) - { - 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 ); - } + if(keyValue.first == LOOP_COUNT_NAME) + { + DoSetProperty(Toolkit::DevelImageVisual::Property::LOOP_COUNT, keyValue.second); + } + else if(keyValue.first == PLAY_RANGE_NAME) + { + 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 ) +void AnimatedVectorImageVisual::DoSetProperty(Property::Index index, const Property::Value& value) { switch(index) { case Toolkit::DevelImageVisual::Property::LOOP_COUNT: { int32_t loopCount; - if( value.Get( 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(); - if( array ) + const Property::Array* array = value.GetArray(); + if(array) { - mPlayRange = *array; - mResendFlag |= RESEND_PLAY_RANGE; + mAnimationData.playRange = *array; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_RANGE; } break; } case Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR: { - int32_t stopBehavior = mStopBehavior; - if( Scripting::GetEnumerationProperty( value, STOP_BEHAVIOR_TABLE, STOP_BEHAVIOR_TABLE_COUNT, stopBehavior ) ) + int32_t stopBehavior = mAnimationData.stopBehavior; + if(Scripting::GetEnumerationProperty(value, STOP_BEHAVIOR_TABLE, STOP_BEHAVIOR_TABLE_COUNT, stopBehavior)) { - mStopBehavior = DevelImageVisual::StopBehavior::Type( stopBehavior ); - mResendFlag |= RESEND_STOP_BEHAVIOR; + mAnimationData.stopBehavior = DevelImageVisual::StopBehavior::Type(stopBehavior); + mAnimationData.resendFlag |= VectorAnimationTask::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 ) ) + int32_t loopingMode = mAnimationData.loopingMode; + if(Scripting::GetEnumerationProperty(value, LOOPING_MODE_TABLE, LOOPING_MODE_TABLE_COUNT, loopingMode)) { - mLoopingMode = DevelImageVisual::LoopingMode::Type( loopingMode ); - mResendFlag |= RESEND_LOOPING_MODE; + 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::OnInitialize(void) { Shader shader; - if( mImpl->mCustomShader ) + if(mImpl->mCustomShader) { - shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource() : mImpl->mCustomShader->mVertexShader, - mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource() : mImpl->mCustomShader->mFragmentShader, - mImpl->mCustomShader->mHints ); + 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 ); + shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT); } else { - shader = mImageVisualShaderFactory.GetShader( mFactoryCache, false, true ); + shader = mImageVisualShaderFactory.GetShader(mFactoryCache, false, true, IsRoundedCornerRequired()); } - Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); + Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); - mImpl->mRenderer = Renderer::New( geometry, shader ); + mImpl->mRenderer = Renderer::New(geometry, shader); TextureSet textureSet = TextureSet::New(); - mImpl->mRenderer.SetTextures( textureSet ); + mImpl->mRenderer.SetTextures(textureSet); // Register transform properties - mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); + mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); +} +void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor) +{ // Defer the rasterisation task until we get given a size (by Size Negotiation algorithm) // Hold the weak handle of the placement actor and delay the adding of renderer until the rasterization is finished. mPlacementActor = actor; - 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 ); + if(mLoadFailed) + { + TextureSet textureSet = TextureSet::New(); + mImpl->mRenderer.SetTextures(textureSet); - mSizeNotification = actor.AddPropertyNotification( Actor::Property::SIZE, StepCondition( 3.0f ) ); - mSizeNotification.NotifySignal().Connect( this, &AnimatedVectorImageVisual::OnSizeNotification ); + Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); + textureSet.SetTexture(0u, brokenImage); - DevelActor::VisibilityChangedSignal( actor ).Connect( this, &AnimatedVectorImageVisual::OnControlVisibilityChanged ); + actor.AddRenderer(mImpl->mRenderer); - Window window = DevelWindow::Get( actor ); - if( window ) + ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); + } + else { - DevelWindow::VisibilityChangedSignal( window ).Connect( this, &AnimatedVectorImageVisual::OnWindowVisibilityChanged ); + 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::DoSetOnStage [%p]\n", this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnScene [%p]\n", this); } -void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) +void AnimatedVectorImageVisual::DoSetOffScene(Actor& actor) { - PauseAnimation(); + StopAnimation(); + SendAnimationData(); - if( mImpl->mRenderer ) + if(mImpl->mRenderer) { - actor.RemoveRenderer( mImpl->mRenderer ); - mImpl->mRenderer.Reset(); - + actor.RemoveRenderer(mImpl->mRenderer); mRendererAdded = false; } // Remove property notification - actor.RemovePropertyNotification( mScaleNotification ); - actor.RemovePropertyNotification( mSizeNotification ); + actor.RemovePropertyNotification(mScaleNotification); + actor.RemovePropertyNotification(mSizeNotification); - DevelActor::VisibilityChangedSignal( actor ).Disconnect( this, &AnimatedVectorImageVisual::OnControlVisibilityChanged ); + DevelActor::VisibilityChangedSignal(actor).Disconnect(this, &AnimatedVectorImageVisual::OnControlVisibilityChanged); - Window window = DevelWindow::Get( actor ); - if( window ) + Window window = DevelWindow::Get(actor); + if(window) { - DevelWindow::VisibilityChangedSignal( window ).Disconnect( this, &AnimatedVectorImageVisual::OnWindowVisibilityChanged ); + 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; + mVisualSize = Vector2::ZERO; mVisualScale = Vector2::ONE; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOffStage [%p]\n", this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOffScene [%p]\n", this); } void AnimatedVectorImageVisual::OnSetTransform() { - Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize ); + Vector2 visualSize = mImpl->mTransform.GetVisualSize(mImpl->mControlSize); - if( IsOnStage() && visualSize != mVisualSize ) + if(IsOnScene() && visualSize != mVisualSize) { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f [%p]\n", visualSize.width, visualSize.height, this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f [%p]\n", visualSize.width, visualSize.height, this); mVisualSize = visualSize; SetVectorImageSize(); - SendAnimationData(); - - if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY ) + if(mPlayState == DevelImageVisual::PlayState::PLAYING && mAnimationData.playState != DevelImageVisual::PlayState::PLAYING) { - mVectorAnimationTask->PlayAnimation(); - - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY ); - } - else - { - // Render one frame - mVectorAnimationTask->RenderFrame(); + mAnimationData.playState = DevelImageVisual::PlayState::PLAYING; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; } + + SendAnimationData(); } } -void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, const Property::Value& attributes ) +void AnimatedVectorImageVisual::OnDoAction(const Property::Index actionId, const Property::Value& attributes) { // Check if action is valid for this visual type and perform action if possible - switch( actionId ) + switch(actionId) { case DevelAnimatedVectorImageVisual::Action::PLAY: { - if( IsOnStage() && mVisualSize != Vector2::ZERO ) + if(IsOnScene() && mVisualSize != Vector2::ZERO) { - mVectorAnimationTask->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: { - mVectorAnimationTask->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( mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::STOPPED ) - { - mVectorAnimationTask->StopAnimation(); - } - - if( mImpl->mRenderer ) + if(mAnimationData.playState != DevelImageVisual::PlayState::STOPPED) { - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); + 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: { int32_t frameNumber; - if( attributes.Get( frameNumber ) ) + if(attributes.Get(frameNumber)) { - mVectorAnimationTask->SetCurrentFrameNumber( frameNumber ); - - if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING ) - { - mVectorAnimationTask->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(); - if( map ) + const Property::Map* map = attributes.GetMap(); + if(map) { - DoSetProperties( *map ); - - SendAnimationData(); + DoSetProperties(*map); } break; } } + + TriggerVectorRasterization(); } 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 && !mRendererAdded ) + if(actor && !mRendererAdded) { - actor.AddRenderer( mImpl->mRenderer ); + actor.AddRenderer(mImpl->mRenderer); mRendererAdded = true; - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + ResourceReady(Toolkit::Visual::ResourceStatus::READY); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnUploadCompleted: Renderer is added [%p]\n", this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnUploadCompleted: Renderer is added [%p]\n", this); } } void AnimatedVectorImageVisual::OnAnimationFinished() { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnAnimationFinished: action state = %d [%p]\n", mActionStatus, this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnAnimationFinished: action state = %d [%p]\n", mPlayState, this); - if( mActionStatus != DevelAnimatedVectorImageVisual::Action::STOP ) + if(mPlayState != DevelImageVisual::PlayState::STOPPED) { - mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; + mPlayState = DevelImageVisual::PlayState::STOPPED; + + mAnimationData.playState = DevelImageVisual::PlayState::STOPPED; - if( mImpl->mEventObserver ) + if(mImpl->mEventObserver) { - mImpl->mEventObserver->NotifyVisualEvent( *this, DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED ); + mImpl->mEventObserver->NotifyVisualEvent(*this, DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED); } } - if( mImpl->mRenderer ) + if(mImpl->mRenderer) { - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); + mImpl->mRenderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED); } } void AnimatedVectorImageVisual::SendAnimationData() { - if( mResendFlag ) + if(mAnimationData.resendFlag) { - bool isPlaying = false; - if( mVectorAnimationTask->GetPlayState() == DevelImageVisual::PlayState::PLAYING ) - { - mVectorAnimationTask->PauseAnimation(); - isPlaying = true; - } - - if( mResendFlag & RESEND_LOOP_COUNT ) - { - mVectorAnimationTask->SetLoopCount( mLoopCount ); - } - - if( mResendFlag & RESEND_PLAY_RANGE ) - { - mVectorAnimationTask->SetPlayRange( mPlayRange ); - } - - if( mResendFlag & RESEND_STOP_BEHAVIOR ) - { - mVectorAnimationTask->SetStopBehavior( mStopBehavior ); - } + mVectorAnimationTask->SetAnimationData(mAnimationData); - if( mResendFlag & RESEND_LOOPING_MODE ) + if(mImpl->mRenderer) { - mVectorAnimationTask->SetLoopingMode( mLoopingMode ); - } - - if( IsOnStage() ) - { - if( isPlaying ) + if(mAnimationData.playState == DevelImageVisual::PlayState::PLAYING) { - mVectorAnimationTask->PlayAnimation(); + mImpl->mRenderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY); } else { - mVectorAnimationTask->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 ); + uint32_t width = static_cast(mVisualSize.width * mVisualScale.width); + uint32_t height = static_cast(mVisualSize.height * mVisualScale.height); - mVectorAnimationTask->SetSize( width, height ); + mAnimationData.width = width; + mAnimationData.height = height; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_SIZE; +} - if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING ) +void AnimatedVectorImageVisual::StopAnimation() +{ + if(mAnimationData.playState != DevelImageVisual::PlayState::STOPPED) { - mVectorAnimationTask->RenderFrame(); - Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering + mAnimationData.playState = DevelImageVisual::PlayState::STOPPED; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; + + mPlayState = DevelImageVisual::PlayState::STOPPED; } } -void AnimatedVectorImageVisual::PauseAnimation() +void AnimatedVectorImageVisual::TriggerVectorRasterization() { - if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY ) + if(!mEventCallback && !mCoreShutdown) { - mVectorAnimationTask->PauseAnimation(); - - mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE; - - if( mImpl->mRenderer ) - { - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); - } + 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 ) +void AnimatedVectorImageVisual::OnScaleNotification(PropertyNotification& source) { Actor actor = mPlacementActor.GetHandle(); - if( actor ) + if(actor) { - Vector3 scale = actor.GetProperty< Vector3 >( Actor::Property::WORLD_SCALE ); - mVisualScale.width = scale.width; - mVisualScale.height = scale.height; + Vector3 scale = actor.GetProperty(Actor::Property::WORLD_SCALE); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnScaleNotification: scale = %f, %f [%p]\n", mVisualScale.width, mVisualScale.height, this ); + if(mRedrawInScalingDown || scale.width >= 1.0f || scale.height >= 1.0f) + { + mVisualScale.width = scale.width; + mVisualScale.height = scale.height; - SetVectorImageSize(); + 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 ) +void AnimatedVectorImageVisual::OnSizeNotification(PropertyNotification& source) { Actor actor = mPlacementActor.GetHandle(); - if( actor ) + if(actor) { - Vector3 size = actor.GetCurrentSize(); - mVisualSize.width = size.width; + Vector3 size = actor.GetCurrentProperty(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 ); + 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 ) +void AnimatedVectorImageVisual::OnControlVisibilityChanged(Actor actor, bool visible, DevelActor::VisibilityChange::Type type) { - if( !visible ) + if(!visible) { - PauseAnimation(); + StopAnimation(); + TriggerVectorRasterization(); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnControlVisibilityChanged: invisibile. Pause animation [%p]\n", this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnControlVisibilityChanged: invisibile. Pause animation [%p]\n", this); } } -void AnimatedVectorImageVisual::OnWindowVisibilityChanged( Window window, bool visible ) +void AnimatedVectorImageVisual::OnWindowVisibilityChanged(Window window, bool visible) { - if( !visible ) + if(!visible) { - PauseAnimation(); + StopAnimation(); + TriggerVectorRasterization(); - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnWindowVisibilityChanged: invisibile. Pause animation [%p]\n", this ); + 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