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=96367759e5f920550577ba2365f94445956f26ea;hp=7b263e168155c3c2250e1adb2522d2b08ed0708c;hb=23446c257d6ae1977bb69e53353fb1ccd5409432;hpb=3e429d522301e97a4333153145d56b9a127d89e8 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 7b263e1..9636775 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) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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,196 +19,248 @@ #include // EXTERNAL INCLUDES +#include #include #include -#include -#include #include +#include // INTERNAL INCLUDES -#include -#include -#include #include +#include +#include +#include #include +#include #include #include -#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { +const int CUSTOM_PROPERTY_COUNT(1); // pixel area, -const Dali::Vector4 FULL_TEXTURE_RECT( 0.f, 0.f, 1.f, 1.f ); +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, static_cast( Toolkit::DevelVisual::ANIMATED_VECTOR_IMAGE ) ), - mUrl( imageUrl ), +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, imageUrl.GetUrl() ) ), - mImageVisualShaderFactory( shaderFactory ), + mVectorAnimationTask(new VectorAnimationTask(factoryCache)), + mImageVisualShaderFactory(shaderFactory), mVisualSize(), - mVisualScale( Vector2::ONE ), + mVisualScale(Vector2::ONE), mPlacementActor(), - mPlayState( DevelImageVisual::PlayState::STOPPED ), - mRendererAdded( false ), - mRasterizationTriggered( 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; + mImpl->mFlags |= Visual::Base::Impl::IS_PREMULTIPLIED_ALPHA; + + mVectorAnimationTask->RequestLoad(mUrl.GetUrl()); - mVectorAnimationTask->UploadCompletedSignal().Connect( this, &AnimatedVectorImageVisual::OnUploadCompleted ); - mVectorAnimationTask->SetAnimationFinishedCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnAnimationFinished ) ) ); + mVectorAnimationTask->ResourceReadySignal().Connect(this, &AnimatedVectorImageVisual::OnResourceReady); + mVectorAnimationTask->SetAnimationFinishedCallback(new EventThreadCallback(MakeCallback(this, &AnimatedVectorImageVisual::OnAnimationFinished))); + + auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager(); + vectorAnimationManager.AddObserver(*this); } AnimatedVectorImageVisual::~AnimatedVectorImageVisual() { - if( mRasterizationTriggered && Adaptor::IsAvailable() ) + if(!mCoreShutdown) { - Adaptor::Get().UnregisterProcessor( *this ); + 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->ResourceReadySignal().Disconnect(this, &AnimatedVectorImageVisual::OnResourceReady); + mVectorAnimationTask->Finalize(); } +} - // 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 ); - naturalSize.x = width; - naturalSize.y = height; + if(mLoadFailed && mImpl->mRenderer) + { + // Load failed, use broken image size + auto textureSet = mImpl->mRenderer.GetTextures(); + if(textureSet && textureSet.GetTextureCount()) + { + auto texture = textureSet.GetTexture(0); + if(texture) + { + naturalSize.x = texture.GetWidth(); + naturalSize.y = texture.GetHeight(); + return; + } + } + } + else + { + uint32_t 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, mAnimationData.loopCount ); + 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 >( 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::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, mAnimationData.stopBehavior ); - map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mAnimationData.loopingMode ); + 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::EnablePreMultipliedAlpha(bool preMultiplied) +{ + // Make always enable pre multiplied alpha whether preMultiplied value is false. + if(!preMultiplied) + { + DALI_LOG_WARNING("Note : AnimatedVectorVisual cannot disable PreMultipliedAlpha\n"); + } +} + +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)) { mAnimationData.loopCount = loopCount; mAnimationData.resendFlag |= VectorAnimationTask::RESEND_LOOP_COUNT; @@ -217,8 +269,8 @@ void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Prop } case Toolkit::DevelImageVisual::Property::PLAY_RANGE: { - Property::Array* array = value.GetArray(); - if( array ) + const Property::Array* array = value.GetArray(); + if(array) { mAnimationData.playRange = *array; mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_RANGE; @@ -228,9 +280,9 @@ void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Prop case Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR: { int32_t stopBehavior = mAnimationData.stopBehavior; - if( Scripting::GetEnumerationProperty( value, STOP_BEHAVIOR_TABLE, STOP_BEHAVIOR_TABLE_COUNT, stopBehavior ) ) + if(Scripting::GetEnumerationProperty(value, STOP_BEHAVIOR_TABLE, STOP_BEHAVIOR_TABLE_COUNT, stopBehavior)) { - mAnimationData.stopBehavior = DevelImageVisual::StopBehavior::Type( stopBehavior ); + mAnimationData.stopBehavior = DevelImageVisual::StopBehavior::Type(stopBehavior); mAnimationData.resendFlag |= VectorAnimationTask::RESEND_STOP_BEHAVIOR; } break; @@ -238,115 +290,134 @@ void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Prop case Toolkit::DevelImageVisual::Property::LOOPING_MODE: { int32_t loopingMode = mAnimationData.loopingMode; - if( Scripting::GetEnumerationProperty( value, LOOPING_MODE_TABLE, LOOPING_MODE_TABLE_COUNT, loopingMode ) ) + if(Scripting::GetEnumerationProperty(value, LOOPING_MODE_TABLE, LOOPING_MODE_TABLE_COUNT, loopingMode)) { - mAnimationData.loopingMode = DevelImageVisual::LoopingMode::Type( 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::DoSetOnScene( Actor& actor ) +void AnimatedVectorImageVisual::OnInitialize(void) { - Shader shader; + Shader shader = GenerateShader(); - 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 ); + Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); - shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); - } - else - { - shader = mImageVisualShaderFactory.GetShader( mFactoryCache, false, true, false ); - } - - Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); - - mImpl->mRenderer = Renderer::New( geometry, shader ); + mImpl->mRenderer = DecoratedVisualRenderer::New(geometry, shader); + mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); 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.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mVectorAnimationTask->SetRenderer(mImpl->mRenderer); +} + +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 ); + if(mLoadFailed) + { + Vector2 imageSize = actor.GetProperty(Actor::Property::SIZE).Get(); + mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize); + actor.AddRenderer(mImpl->mRenderer); + ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); + } + else + { + // Add property notification for scaling & size + mScaleNotification = actor.AddPropertyNotification(Actor::Property::WORLD_SCALE, StepCondition(0.1f, 1.0f)); + mScaleNotification.NotifySignal().Connect(this, &AnimatedVectorImageVisual::OnScaleNotification); - // 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); - mSizeNotification = actor.AddPropertyNotification( Actor::Property::SIZE, StepCondition( 3.0f ) ); - mSizeNotification.NotifySignal().Connect( this, &AnimatedVectorImageVisual::OnSizeNotification ); + DevelActor::VisibilityChangedSignal(actor).Connect(this, &AnimatedVectorImageVisual::OnControlVisibilityChanged); - DevelActor::VisibilityChangedSignal( actor ).Connect( this, &AnimatedVectorImageVisual::OnControlVisibilityChanged ); + Window window = DevelWindow::Get(actor); + if(window) + { + DevelWindow::VisibilityChangedSignal(window).Connect(this, &AnimatedVectorImageVisual::OnWindowVisibilityChanged); + } - Window window = DevelWindow::Get( actor ); - if( window ) - { - DevelWindow::VisibilityChangedSignal( window ).Connect( this, &AnimatedVectorImageVisual::OnWindowVisibilityChanged ); + if(mImpl->mEventObserver) + { + // The visual needs it's size set before it can be rasterized hence request relayout once on stage + mImpl->mEventObserver->RelayoutRequest(*this); + } + + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_NEED_RESOURCE_READY; + TriggerVectorRasterization(); } - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnScene [%p]\n", this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnScene [%p]\n", this); } -void AnimatedVectorImageVisual::DoSetOffScene( Actor& actor ) +void AnimatedVectorImageVisual::DoSetOffScene(Actor& actor) { 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; - mVisualScale = Vector2::ONE; + mVisualSize = Vector2::ZERO; + mVisualScale = Vector2::ONE; + mAnimationData.width = 0; + mAnimationData.height = 0; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOffScene [%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( IsOnScene() && 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(); - if( mPlayState == DevelImageVisual::PlayState::PLAYING && mAnimationData.playState != DevelImageVisual::PlayState::PLAYING ) + if(mPlayState == DevelImageVisual::PlayState::PLAYING && mAnimationData.playState != DevelImageVisual::PlayState::PLAYING) { mAnimationData.playState = DevelImageVisual::PlayState::PLAYING; mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; @@ -356,16 +427,25 @@ void AnimatedVectorImageVisual::OnSetTransform() } } -void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, const Property::Value& attributes ) +void AnimatedVectorImageVisual::UpdateShader() +{ + if(mImpl->mRenderer) + { + Shader shader = GenerateShader(); + mImpl->mRenderer.SetShader(shader); + } +} + +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( IsOnScene() && mVisualSize != Vector2::ZERO ) + if(IsOnScene() && mVisualSize != Vector2::ZERO) { - if( mAnimationData.playState != DevelImageVisual::PlayState::PLAYING ) + if(mAnimationData.playState != DevelImageVisual::PlayState::PLAYING) { mAnimationData.playState = DevelImageVisual::PlayState::PLAYING; mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; @@ -376,7 +456,7 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons } case DevelAnimatedVectorImageVisual::Action::PAUSE: { - if( mAnimationData.playState == DevelImageVisual::PlayState::PLAYING ) + if(mAnimationData.playState == DevelImageVisual::PlayState::PLAYING) { mAnimationData.playState = DevelImageVisual::PlayState::PAUSED; mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; @@ -386,7 +466,7 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons } case DevelAnimatedVectorImageVisual::Action::STOP: { - if( mAnimationData.playState != DevelImageVisual::PlayState::STOPPED ) + if(mAnimationData.playState != DevelImageVisual::PlayState::STOPPED) { mAnimationData.playState = DevelImageVisual::PlayState::STOPPED; mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; @@ -397,88 +477,82 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons case DevelAnimatedVectorImageVisual::Action::JUMP_TO: { int32_t frameNumber; - if( attributes.Get( frameNumber ) ) + if(attributes.Get(frameNumber)) { mAnimationData.currentFrame = frameNumber; mAnimationData.resendFlag |= VectorAnimationTask::RESEND_CURRENT_FRAME; } break; } - case DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY: - { - Property::Map* map = attributes.GetMap(); - if( map ) - { - DoSetProperties( *map ); - } - break; - } } TriggerVectorRasterization(); } -void AnimatedVectorImageVisual::Process() +void AnimatedVectorImageVisual::OnResourceReady(bool success) { - SendAnimationData(); - - mRasterizationTriggered = false; + mLoadFailed = !success; - Adaptor::Get().UnregisterProcessor( *this ); -} - -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 ); - mRendererAdded = true; + if(success) + { + actor.AddRenderer(mImpl->mRenderer); + ResourceReady(Toolkit::Visual::ResourceStatus::READY); + } + else + { + Vector2 imageSize = actor.GetProperty(Actor::Property::SIZE).Get(); + mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize); + actor.AddRenderer(mImpl->mRenderer); + ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); + } - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + mRendererAdded = true; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnUploadCompleted: Renderer is added [%p]\n", this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "Renderer is added (success = %d) [%p]\n", success, this); } } void AnimatedVectorImageVisual::OnAnimationFinished() { - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnAnimationFinished: action state = %d [%p]\n", mPlayState, this ); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnAnimationFinished: action state = %d [%p]\n", mPlayState, this); - if( mPlayState != DevelImageVisual::PlayState::STOPPED ) + if(mPlayState != DevelImageVisual::PlayState::STOPPED) { 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( mAnimationData.resendFlag ) + if(mAnimationData.resendFlag) { - mVectorAnimationTask->SetAnimationData( mAnimationData ); + mVectorAnimationTask->SetAnimationData(mAnimationData); - if( mImpl->mRenderer ) + if(mImpl->mRenderer) { - if( mAnimationData.playState == DevelImageVisual::PlayState::PLAYING ) + if(mAnimationData.playState == DevelImageVisual::PlayState::PLAYING) { - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY ); + mImpl->mRenderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY); } else { - mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); + mImpl->mRenderer.SetProperty(DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED); } } @@ -488,17 +562,20 @@ void AnimatedVectorImageVisual::SendAnimationData() 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); - mAnimationData.width = width; - mAnimationData.height = height; - mAnimationData.resendFlag |= VectorAnimationTask::RESEND_SIZE; + if(mAnimationData.width != width || mAnimationData.height != height) + { + mAnimationData.width = width; + mAnimationData.height = height; + mAnimationData.resendFlag |= VectorAnimationTask::RESEND_SIZE; + } } void AnimatedVectorImageVisual::StopAnimation() { - if( mAnimationData.playState != DevelImageVisual::PlayState::STOPPED ) + if(mAnimationData.playState != DevelImageVisual::PlayState::STOPPED) { mAnimationData.playState = DevelImageVisual::PlayState::STOPPED; mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; @@ -509,71 +586,108 @@ void AnimatedVectorImageVisual::StopAnimation() void AnimatedVectorImageVisual::TriggerVectorRasterization() { - if( !mRasterizationTriggered ) + if(!mEventCallback && !mCoreShutdown) { - Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger event processing - - Adaptor::Get().RegisterProcessor( *this ); - mRasterizationTriggered = true; + 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((mVisualScale.width != scale.width || mVisualScale.height != scale.height) && (mRedrawInScalingDown || scale.width >= 1.0f || scale.height >= 1.0f)) + { + mVisualScale.width = scale.width; + mVisualScale.height = scale.height; - SetVectorImageSize(); - SendAnimationData(); + 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 + 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.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); - mVisualSize.width = size.width; - mVisualSize.height = size.height; + Vector3 size = actor.GetCurrentProperty(Actor::Property::SIZE); + + if(mVisualSize.width != size.width || mVisualSize.height != size.height) + { + 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(); + SetVectorImageSize(); + SendAnimationData(); - Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger event processing + 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) { 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) { 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 +} + +Shader AnimatedVectorImageVisual::GenerateShader() const +{ + Shader shader; + if(mImpl->mCustomShader) + { + 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, + ImageVisualShaderFeature::FeatureBuilder() + .EnableRoundedCorner(IsRoundedCornerRequired()) + .EnableBorderline(IsBorderlineRequired())); } + return shader; } } // namespace Internal