// EXTERNAL INCLUDES
#include <dali/public-api/common/stage.h>
#include <dali/devel-api/rendering/renderer-devel.h>
+#include <dali/devel-api/adaptor-framework/window-devel.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
AnimatedVectorImageVisual::AnimatedVectorImageVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl )
: Visual::Base( factoryCache, Visual::FittingMode::FILL ),
- mImageVisualShaderFactory( shaderFactory ),
mUrl( imageUrl ),
- mVectorRasterizeThread( imageUrl.GetUrl() ),
+ mVectorAnimationTask( new VectorAnimationTask( factoryCache, imageUrl.GetUrl() ) ),
+ mImageVisualShaderFactory( shaderFactory ),
mVisualSize(),
mVisualScale( Vector2::ONE ),
mPlacementActor(),
// the rasterized image is with pre-multiplied alpha format
mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
- mVectorRasterizeThread.UploadCompletedSignal().Connect( this, &AnimatedVectorImageVisual::OnUploadCompleted );
- mVectorRasterizeThread.SetAnimationFinishedCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnAnimationFinished ) ) );
-
- mVectorRasterizeThread.Start();
+ mVectorAnimationTask->UploadCompletedSignal().Connect( this, &AnimatedVectorImageVisual::OnUploadCompleted );
+ mVectorAnimationTask->SetAnimationFinishedCallback( new EventThreadCallback( MakeCallback( this, &AnimatedVectorImageVisual::OnAnimationFinished ) ) );
}
AnimatedVectorImageVisual::~AnimatedVectorImageVisual()
else
{
uint32_t width, height;
- mVectorRasterizeThread.GetDefaultSize( width, height );
+ mVectorAnimationTask->GetDefaultSize( width, height );
naturalSize.x = width;
naturalSize.y = height;
}
}
map.Insert( Toolkit::DevelImageVisual::Property::LOOP_COUNT, mLoopCount );
+ 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 >( 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::STOP_BEHAVIOR, mStopBehavior );
map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mLoopingMode );
+
+ Property::Map layerInfo;
+ mVectorAnimationTask->GetLayerInfo( layerInfo );
+ map.Insert( Toolkit::DevelImageVisual::Property::CONTENT_INFO, layerInfo );
}
void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
if( count >= 2 )
{
int startFrame, endFrame;
- int totalFrame = mVectorRasterizeThread.GetTotalFrameNumber();
+ int totalFrame = mVectorAnimationTask->GetTotalFrameNumber();
array->GetElementAt( 0 ).Get( startFrame );
array->GetElementAt( 1 ).Get( endFrame );
// 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 ) );
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 );
}
void AnimatedVectorImageVisual::DoSetOffStage( Actor& actor )
{
- mVectorRasterizeThread.PauseAnimation();
-
- mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE;
+ PauseAnimation();
if( mImpl->mRenderer )
{
- mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED );
-
actor.RemoveRenderer( mImpl->mRenderer );
mImpl->mRenderer.Reset();
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
if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY )
{
- mVectorRasterizeThread.PlayAnimation();
+ mVectorAnimationTask->PlayAnimation();
mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY );
}
else
{
// Render one frame
- mVectorRasterizeThread.RenderFrame();
+ mVectorAnimationTask->RenderFrame();
}
}
}
{
if( IsOnStage() && mVisualSize != Vector2::ZERO )
{
- mVectorRasterizeThread.PlayAnimation();
+ mVectorAnimationTask->PlayAnimation();
mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::CONTINUOUSLY );
}
}
case DevelAnimatedVectorImageVisual::Action::PAUSE:
{
- mVectorRasterizeThread.PauseAnimation();
+ mVectorAnimationTask->PauseAnimation();
if( mImpl->mRenderer )
{
}
case DevelAnimatedVectorImageVisual::Action::STOP:
{
- if( mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::STOPPED )
+ if( mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::STOPPED )
{
- mVectorRasterizeThread.StopAnimation();
+ mVectorAnimationTask->StopAnimation();
}
if( mImpl->mRenderer )
int32_t frameNumber;
if( attributes.Get( frameNumber ) )
{
- mVectorRasterizeThread.SetCurrentFrameNumber( frameNumber );
+ mVectorAnimationTask->SetCurrentFrameNumber( frameNumber );
- if( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING )
+ if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
{
- mVectorRasterizeThread.RenderFrame();
+ mVectorAnimationTask->RenderFrame();
Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering
}
}
if( mResendFlag )
{
bool isPlaying = false;
- if( mVectorRasterizeThread.GetPlayState() == DevelImageVisual::PlayState::PLAYING )
+ if( mVectorAnimationTask->GetPlayState() == DevelImageVisual::PlayState::PLAYING )
{
- mVectorRasterizeThread.PauseAnimation();
+ mVectorAnimationTask->PauseAnimation();
isPlaying = true;
}
if( mResendFlag & RESEND_LOOP_COUNT )
{
- mVectorRasterizeThread.SetLoopCount( mLoopCount );
+ mVectorAnimationTask->SetLoopCount( mLoopCount );
}
if( mResendFlag & RESEND_PLAY_RANGE )
{
- mVectorRasterizeThread.SetPlayRange( mStartFrame, mEndFrame );
+ mVectorAnimationTask->SetPlayRange( mStartFrame, mEndFrame );
}
if( mResendFlag & RESEND_STOP_BEHAVIOR )
{
- mVectorRasterizeThread.SetStopBehavior( mStopBehavior );
+ mVectorAnimationTask->SetStopBehavior( mStopBehavior );
}
if( mResendFlag & RESEND_LOOPING_MODE )
{
- mVectorRasterizeThread.SetLoopingMode( mLoopingMode );
+ mVectorAnimationTask->SetLoopingMode( mLoopingMode );
}
if( IsOnStage() )
{
if( isPlaying )
{
- mVectorRasterizeThread.PlayAnimation();
+ mVectorAnimationTask->PlayAnimation();
}
else
{
- mVectorRasterizeThread.RenderFrame();
+ mVectorAnimationTask->RenderFrame();
Stage::GetCurrent().KeepRendering( 0.0f );
}
}
uint32_t width = static_cast< uint32_t >( mVisualSize.width * mVisualScale.width );
uint32_t height = static_cast< uint32_t >( mVisualSize.height * mVisualScale.height );
- mVectorRasterizeThread.SetSize( width, height );
+ mVectorAnimationTask->SetSize( width, height );
- if( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING )
+ if( IsOnStage() && mVectorAnimationTask->GetPlayState() != DevelImageVisual::PlayState::PLAYING )
{
- mVectorRasterizeThread.RenderFrame();
+ mVectorAnimationTask->RenderFrame();
Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger rendering
}
}
+void AnimatedVectorImageVisual::PauseAnimation()
+{
+ if( mActionStatus == DevelAnimatedVectorImageVisual::Action::PLAY )
+ {
+ mVectorAnimationTask->PauseAnimation();
+
+ mActionStatus = DevelAnimatedVectorImageVisual::Action::PAUSE;
+
+ if( mImpl->mRenderer )
+ {
+ mImpl->mRenderer.SetProperty( DevelRenderer::Property::RENDERING_BEHAVIOR, DevelRenderer::Rendering::IF_REQUIRED );
+ }
+ }
+}
+
void AnimatedVectorImageVisual::OnScaleNotification( PropertyNotification& source )
{
Actor actor = mPlacementActor.GetHandle();
}
}
+void AnimatedVectorImageVisual::OnControlVisibilityChanged( Actor actor, bool visible, DevelActor::VisibilityChange::Type type )
+{
+ if( !visible )
+ {
+ PauseAnimation();
+
+ DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnControlVisibilityChanged: invisibile. Pause animation [%p]\n", this );
+ }
+}
+
+void AnimatedVectorImageVisual::OnWindowVisibilityChanged( Window window, bool visible )
+{
+ if( !visible )
+ {
+ PauseAnimation();
+
+ DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnWindowVisibilityChanged: invisibile. Pause animation [%p]\n", this );
+ }
+}
+
} // namespace Internal
} // namespace Toolkit
projects / platform / core / uifw / dali-toolkit.git / blobdiff