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=893972906de3919e36de74d68c939ed4383f5752;hp=f4a733bbc7cac0099cd2c936490bb90ab2422cc1;hb=cd7dc06c6d16fa60bb27a2454b7e79cdf4d4d7a2;hpb=1b032e3f72c144d2da593a1c20d15041a3de00a3 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 f4a733b..8939729 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ // EXTERNAL INCLUDES #include -#include +#include #include // INTERNAL INCLUDES @@ -32,7 +32,6 @@ #include #include #include -#include namespace Dali { @@ -46,9 +45,36 @@ namespace Internal namespace { -const Dali::Vector4 FULL_TEXTURE_RECT( 0.f, 0.f, 1.f, 1.f ); 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 +}; + +// stop behavior +DALI_ENUM_TO_STRING_TABLE_BEGIN( STOP_BEHAVIOR ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, CURRENT_FRAME ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, FIRST_FRAME ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::StopBehavior, LAST_FRAME ) +DALI_ENUM_TO_STRING_TABLE_END( STOP_BEHAVIOR ) + +// looping mode +DALI_ENUM_TO_STRING_TABLE_BEGIN( LOOPING_MODE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::LoopingMode, RESTART ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Dali::Toolkit::DevelImageVisual::LoopingMode, AUTO_REVERSE ) +DALI_ENUM_TO_STRING_TABLE_END( LOOPING_MODE ) + +#if defined(DEBUG_ENABLED) +Debug::Filter* gVectorAnimationLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VECTOR_ANIMATION" ); +#endif + } // unnamed namespace AnimatedVectorImageVisualPtr AnimatedVectorImageVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties ) @@ -70,15 +96,24 @@ AnimatedVectorImageVisual::AnimatedVectorImageVisual( VisualFactoryCache& factor : Visual::Base( factoryCache, Visual::FittingMode::FILL ), mImageVisualShaderFactory( shaderFactory ), mUrl( imageUrl ), + mVectorRasterizeThread( imageUrl.GetUrl() ), mVisualSize(), - mPlayRange( 0.0f, 1.0f ), mPlacementActor(), - mVectorRasterizeThread(), mLoopCount( LOOP_FOREVER ), - mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP ) + mStartFrame( 0 ), + mEndFrame( 0 ), + mResendFlag( 0 ), + mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP ), + mStopBehavior( DevelImageVisual::StopBehavior::CURRENT_FRAME ), + mLoopingMode( DevelImageVisual::LoopingMode::RESTART ) { // 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 ) ) ); + + mVectorRasterizeThread.Start(); } AnimatedVectorImageVisual::~AnimatedVectorImageVisual() @@ -87,7 +122,25 @@ AnimatedVectorImageVisual::~AnimatedVectorImageVisual() void AnimatedVectorImageVisual::GetNaturalSize( Vector2& naturalSize ) { - naturalSize = mVisualSize; + if( mImpl->mRenderer ) // Check if we have a rendered image + { + 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; + } + } + } + + uint32_t width, height; + mVectorRasterizeThread.GetDefaultSize( width, height ); + naturalSize.x = width; + naturalSize.y = height; } void AnimatedVectorImageVisual::DoCreatePropertyMap( Property::Map& map ) const @@ -98,17 +151,19 @@ void AnimatedVectorImageVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Insert( Toolkit::ImageVisual::Property::URL, mUrl.GetUrl() ); } - map.Insert( Toolkit::DevelImageVisual::Property::LOOP_COUNT, static_cast< int >( mLoopCount ) ); - map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, static_cast< Vector2 >( mPlayRange ) ); + map.Insert( Toolkit::DevelImageVisual::Property::LOOP_COUNT, mLoopCount ); - if( mVectorRasterizeThread ) - { - map.Insert( Toolkit::DevelImageVisual::Property::PLAY_STATE, static_cast< int >( mVectorRasterizeThread->GetPlayState() ) ); - } - else - { - map.Insert( Toolkit::DevelImageVisual::Property::PLAY_STATE, static_cast< int >( DevelImageVisual::PlayState::STOPPED ) ); - } + Property::Array playRange; + playRange.PushBack( mStartFrame ); + playRange.PushBack( mEndFrame ); + map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, playRange ); + + map.Insert( Toolkit::DevelImageVisual::Property::PLAY_STATE, static_cast< int >( mVectorRasterizeThread.GetPlayState() ) ); + map.Insert( Toolkit::DevelImageVisual::Property::CURRENT_FRAME_NUMBER, static_cast< int32_t >( mVectorRasterizeThread.GetCurrentFrameNumber() ) ); + map.Insert( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, static_cast< int32_t >( mVectorRasterizeThread.GetTotalFrameNumber() ) ); + + map.Insert( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, mStopBehavior ); + map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mLoopingMode ); } void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const @@ -136,6 +191,14 @@ void AnimatedVectorImageVisual::DoSetProperties( const Property::Map& propertyMa { DoSetProperty( Toolkit::DevelImageVisual::Property::PLAY_RANGE, keyValue.second ); } + else if( keyValue.first == STOP_BEHAVIOR_NAME ) + { + DoSetProperty( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, keyValue.second ); + } + else if( keyValue.first == LOOPING_MODE_NAME ) + { + DoSetProperty( Toolkit::DevelImageVisual::Property::LOOPING_MODE, keyValue.second ); + } } } } @@ -150,38 +213,53 @@ void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Prop if( value.Get( loopCount ) ) { mLoopCount = loopCount; - if( mVectorRasterizeThread ) - { - mVectorRasterizeThread->SetLoopCount( loopCount ); - } + mResendFlag |= RESEND_LOOP_COUNT; } break; } case Toolkit::DevelImageVisual::Property::PLAY_RANGE: { - Vector2 range; - if( value.Get( range ) ) + Property::Array* array = value.GetArray(); + if( array ) { - // Make sure the range specified is between 0.0 and 1.0 - if( range.x >= 0.0f && range.x <= 1.0f && range.y >= 0.0f && range.y <= 1.0f ) + size_t count = array->Count(); + if( count >= 2 ) { - Vector2 orderedRange( range ); - // If the range is not in order swap values - if( range.x > range.y ) + 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 ) { - orderedRange = Vector2( range.y, range.x ); + mStartFrame = startFrame; + mEndFrame = endFrame; + mResendFlag |= RESEND_PLAY_RANGE; } - - mPlayRange = orderedRange; - - if( mVectorRasterizeThread ) + else { - mVectorRasterizeThread->SetPlayRange( mPlayRange ); + DALI_LOG_ERROR( "Invalid play range [%d, %d / %d]\n", startFrame, endFrame, totalFrame ); } } } break; } + case Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR: + { + int32_t stopBehavior; + Scripting::GetEnumerationProperty( value, STOP_BEHAVIOR_TABLE, STOP_BEHAVIOR_TABLE_COUNT, stopBehavior ); + mStopBehavior = DevelImageVisual::StopBehavior::Type( stopBehavior ); + mResendFlag |= RESEND_STOP_BEHAVIOR; + break; + } + case Toolkit::DevelImageVisual::Property::LOOPING_MODE: + { + int32_t loopingMode; + Scripting::GetEnumerationProperty( value, LOOPING_MODE_TABLE, LOOPING_MODE_TABLE_COUNT, loopingMode ); + mLoopingMode = DevelImageVisual::LoopingMode::Type( loopingMode ); + mResendFlag |= RESEND_LOOPING_MODE; + break; + } } } @@ -217,21 +295,21 @@ 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; - // This visual needs it's size set before it can be rasterized hence set ResourceReady once on stage - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + mVectorRasterizeThread.SetRenderer( mImpl->mRenderer ); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOnStage [%p]\n", this ); } void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) { - if( mVectorRasterizeThread ) - { - mVectorRasterizeThread->PauseAnimation(); - DevelStage::SetRenderingBehavior( Stage::GetCurrent(), DevelStage::Rendering::IF_REQUIRED ); - mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE; - } + mVectorRasterizeThread.PauseAnimation(); + + mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE; if( mImpl->mRenderer ) { + mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); + actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); } @@ -240,6 +318,8 @@ void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor ) // Reset the visual size to zero so that when adding the actor back to stage the rasterization is forced mVisualSize = Vector2::ZERO; + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::DoSetOffStage [%p]\n", this ); } void AnimatedVectorImageVisual::OnSetTransform() @@ -248,42 +328,44 @@ void AnimatedVectorImageVisual::OnSetTransform() if( IsOnStage() ) { + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: width = %f, height = %f [%p]\n", visualSize.width, visualSize.height, this ); + if( visualSize != mVisualSize ) { mVisualSize = visualSize; - if( !mVectorRasterizeThread ) - { - uint32_t width = static_cast< uint32_t >( visualSize.width ); - uint32_t height = static_cast< uint32_t >( visualSize.height ); + uint32_t width = static_cast< uint32_t >( visualSize.width ); + uint32_t height = static_cast< uint32_t >( visualSize.height ); - mVectorRasterizeThread = std::unique_ptr< VectorRasterizeThread >( new VectorRasterizeThread( mUrl.GetUrl(), mImpl->mRenderer, width, height ) ); + mVectorRasterizeThread.SetSize( width, height ); + } - mVectorRasterizeThread->SetResourceReadyCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnResourceReady ) ) ); - mVectorRasterizeThread->SetAnimationFinishedCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnAnimationFinished ) ) ); - mVectorRasterizeThread->SetLoopCount( mLoopCount ); - mVectorRasterizeThread->SetPlayRange( mPlayRange ); + SendAnimationData(); - mVectorRasterizeThread->Start(); + if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY ) + { + mVectorRasterizeThread.PlayAnimation(); - if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY ) - { - mVectorRasterizeThread->StartAnimation(); - DevelStage::SetRenderingBehavior( Stage::GetCurrent(), DevelStage::Rendering::CONTINUOUSLY ); - } - else - { - // Render one frame - mVectorRasterizeThread->RenderFrame(); - } - } - else + mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY ); + } + else + { + // Render one frame + mVectorRasterizeThread.RenderFrame(); + } + + if( mVectorRasterizeThread.IsResourceReady() ) + { + Actor actor = mPlacementActor.GetHandle(); + if( actor ) { - uint32_t width = static_cast< uint32_t >( visualSize.width ); - uint32_t height = static_cast< uint32_t >( visualSize.height ); + actor.AddRenderer( mImpl->mRenderer ); + mPlacementActor.Reset(); - mVectorRasterizeThread->SetSize( width, height ); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSetTransform: Renderer is added [%p]\n", this ); } + + ResourceReady( Toolkit::Visual::ResourceStatus::READY ); } } } @@ -295,46 +377,62 @@ void AnimatedVectorImageVisual::OnDoAction( const Property::Index actionId, cons { case DevelAnimatedVectorImageVisual::Action::PLAY: { - if( IsOnStage()) + if( IsOnStage() && mVisualSize != Vector2::ZERO ) { - if( mVectorRasterizeThread ) - { - mVectorRasterizeThread->StartAnimation(); - DevelStage::SetRenderingBehavior( Stage::GetCurrent(), DevelStage::Rendering::CONTINUOUSLY ); //TODO: Should manage this globally - } + mVectorRasterizeThread.PlayAnimation(); + + mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY ); } mActionStatus = DevelAnimatedVectorImageVisual::Action::PLAY; break; } case DevelAnimatedVectorImageVisual::Action::PAUSE: { - if( mVectorRasterizeThread ) + mVectorRasterizeThread.PauseAnimation(); + + if( mImpl->mRenderer ) { - mVectorRasterizeThread->PauseAnimation(); - DevelStage::SetRenderingBehavior( Stage::GetCurrent(), DevelStage::Rendering::IF_REQUIRED ); + mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); } + mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE; break; } case DevelAnimatedVectorImageVisual::Action::STOP: { - if( mVectorRasterizeThread ) + if( mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::STOPPED ) { - bool emitSignal = false; - if( mVectorRasterizeThread->GetPlayState() != DevelImageVisual::PlayState::STOPPED ) - { - emitSignal = true; - } + mVectorRasterizeThread.StopAnimation(); - mVectorRasterizeThread->StopAnimation(); - DevelStage::SetRenderingBehavior( Stage::GetCurrent(), DevelStage::Rendering::IF_REQUIRED ); + OnAnimationFinished(); + } + mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; + break; + } + case DevelAnimatedVectorImageVisual::Action::JUMP_TO: + { + int32_t frameNumber; + if( attributes.Get( frameNumber ) ) + { + mVectorRasterizeThread.SetCurrentFrameNumber( frameNumber ); - if( emitSignal ) + if( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING ) { - OnAnimationFinished(); + mVectorRasterizeThread.RenderFrame(); + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering } } - mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; + break; + } + case DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY: + { + Property::Map* map = attributes.GetMap(); + if( map ) + { + DoSetProperties( *map ); + + SendAnimationData(); + } break; } } @@ -350,7 +448,9 @@ void AnimatedVectorImageVisual::OnResourceReady() // reset the weak handle so that the renderer only get added to actor once mPlacementActor.Reset(); - Stage::GetCurrent().KeepRendering( 0.0f ); + ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnResourceReady: Renderer is added [%p]\n", this ); } } @@ -360,6 +460,61 @@ void AnimatedVectorImageVisual::OnAnimationFinished() { mImpl->mEventObserver->NotifyVisualEvent( *this, DevelAnimatedVectorImageVisual::Signal::ANIMATION_FINISHED ); } + + mActionStatus = DevelAnimatedVectorImageVisual::Action::STOP; + + if( mImpl->mRenderer ) + { + mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED ); + } +} + +void AnimatedVectorImageVisual::SendAnimationData() +{ + if( mResendFlag ) + { + 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 ); + } + + if( mResendFlag & RESEND_STOP_BEHAVIOR ) + { + mVectorRasterizeThread.SetStopBehavior( mStopBehavior ); + } + + if( mResendFlag & RESEND_LOOPING_MODE ) + { + mVectorRasterizeThread.SetLoopingMode( mLoopingMode ); + } + + if( IsOnStage() ) + { + if( isPlaying ) + { + mVectorRasterizeThread.PlayAnimation(); + } + else + { + mVectorRasterizeThread.RenderFrame(); + Stage::GetCurrent().KeepRendering( 0.0f ); + } + } + + mResendFlag = 0; + } } } // namespace Internal