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=4b547b4e8a5e904cbaa302c29b1b071b9109a613;hp=a7d1f76777332b64143b9d0b201b9552c6ffc7a7;hb=e8954068388a568c9d89de31ae033fe94d0ce20d;hpb=cef6d2324d9ecca71abf3c9e63db8e371a636b8a 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 a7d1f76..4b547b4 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 @@ -23,6 +23,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -44,7 +45,7 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(6); // 5 transform properties + pixel area, +const int CUSTOM_PROPERTY_COUNT(1); // pixel area, const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); @@ -99,14 +100,11 @@ AnimatedVectorImageVisual::AnimatedVectorImageVisual(VisualFactoryCache& factory 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; - if(!mVectorAnimationTask->Load(mUrl.GetUrl())) - { - mLoadFailed = true; - } + mVectorAnimationTask->RequestLoad(mUrl.GetUrl()); - mVectorAnimationTask->UploadCompletedSignal().Connect(this, &AnimatedVectorImageVisual::OnUploadCompleted); + mVectorAnimationTask->ResourceReadySignal().Connect(this, &AnimatedVectorImageVisual::OnResourceReady); mVectorAnimationTask->SetAnimationFinishedCallback(new EventThreadCallback(MakeCallback(this, &AnimatedVectorImageVisual::OnAnimationFinished))); auto& vectorAnimationManager = mFactoryCache.GetVectorAnimationManager(); @@ -126,7 +124,7 @@ AnimatedVectorImageVisual::~AnimatedVectorImageVisual() } // Finalize animation task and disconnect the signal in the main thread - mVectorAnimationTask->UploadCompletedSignal().Disconnect(this, &AnimatedVectorImageVisual::OnUploadCompleted); + mVectorAnimationTask->ResourceReadySignal().Disconnect(this, &AnimatedVectorImageVisual::OnResourceReady); mVectorAnimationTask->Finalize(); } } @@ -145,10 +143,28 @@ void AnimatedVectorImageVisual::GetNaturalSize(Vector2& naturalSize) } 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); @@ -299,7 +315,7 @@ void AnimatedVectorImageVisual::OnInitialize(void) Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); - mImpl->mRenderer = VisualRenderer::New(geometry, shader); + mImpl->mRenderer = DecoratedVisualRenderer::New(geometry, shader); mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); TextureSet textureSet = TextureSet::New(); @@ -307,6 +323,8 @@ void AnimatedVectorImageVisual::OnInitialize(void) // Register transform properties mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + + mVectorAnimationTask->SetRenderer(mImpl->mRenderer); } void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor) @@ -318,16 +336,13 @@ void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor) if(mLoadFailed) { - Vector2 imageSize = Vector2::ZERO; - imageSize = actor.GetProperty(Actor::Property::SIZE).Get(); + Vector2 imageSize = actor.GetProperty(Actor::Property::SIZE).Get(); mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize); actor.AddRenderer(mImpl->mRenderer); ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); } else { - 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); @@ -342,6 +357,15 @@ void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor) { 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); @@ -350,7 +374,7 @@ void AnimatedVectorImageVisual::DoSetOnScene(Actor& actor) void AnimatedVectorImageVisual::DoSetOffScene(Actor& actor) { StopAnimation(); - SendAnimationData(); + TriggerVectorRasterization(); if(mImpl->mRenderer) { @@ -373,8 +397,10 @@ void AnimatedVectorImageVisual::DoSetOffScene(Actor& actor) 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); } @@ -397,7 +423,7 @@ void AnimatedVectorImageVisual::OnSetTransform() mAnimationData.resendFlag |= VectorAnimationTask::RESEND_PLAY_STATE; } - SendAnimationData(); + TriggerVectorRasterization(); } } @@ -463,19 +489,41 @@ void AnimatedVectorImageVisual::OnDoAction(const Property::Index actionId, const TriggerVectorRasterization(); } -void AnimatedVectorImageVisual::OnUploadCompleted() +void AnimatedVectorImageVisual::OnResourceReady(VectorAnimationTask::ResourceStatus status) { - // 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(status == VectorAnimationTask::ResourceStatus::LOADED) { - actor.AddRenderer(mImpl->mRenderer); - mRendererAdded = true; + if(mImpl->mEventObserver) + { + mImpl->mEventObserver->RelayoutRequest(*this); + } + } + else + { + mLoadFailed = status == VectorAnimationTask::ResourceStatus::FAILED ? true : false; - ResourceReady(Toolkit::Visual::ResourceStatus::READY); + // 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(!mLoadFailed) + { + 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); + } - DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnUploadCompleted: Renderer is added [%p]\n", this); + mRendererAdded = true; + } } + + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "Renderer is added (status = %d) [%p]\n", status, this); } void AnimatedVectorImageVisual::OnAnimationFinished() @@ -527,9 +575,12 @@ void AnimatedVectorImageVisual::SetVectorImageSize() 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() @@ -561,7 +612,7 @@ void AnimatedVectorImageVisual::OnScaleNotification(PropertyNotification& source { Vector3 scale = actor.GetProperty(Actor::Property::WORLD_SCALE); - if(mRedrawInScalingDown || scale.width >= 1.0f || scale.height >= 1.0f) + 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; @@ -581,16 +632,20 @@ void AnimatedVectorImageVisual::OnSizeNotification(PropertyNotification& source) Actor actor = mPlacementActor.GetHandle(); if(actor) { - Vector3 size = actor.GetCurrentProperty(Actor::Property::SIZE); - mVisualSize.width = size.width; - mVisualSize.height = size.height; + Vector3 size = actor.GetCurrentProperty(Actor::Property::SIZE); - DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSizeNotification: size = %f, %f [%p]\n", mVisualSize.width, mVisualSize.height, this); + if(mVisualSize.width != size.width || mVisualSize.height != size.height) + { + mVisualSize.width = size.width; + mVisualSize.height = size.height; - SetVectorImageSize(); - SendAnimationData(); + DALI_LOG_INFO(gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnSizeNotification: size = %f, %f [%p]\n", mVisualSize.width, mVisualSize.height, this); - Stage::GetCurrent().KeepRendering(0.0f); // Trigger event processing + SetVectorImageSize(); + SendAnimationData(); + + Stage::GetCurrent().KeepRendering(0.0f); // Trigger event processing + } } }