X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-visual.cpp;h=8fcbf52f86a95c8f6c57da68f78b702a99091847;hb=d0e761f11ac3a6a65ae7af1d48e559268e5316b3;hp=a0ced876dbf57dff8c7a9b0cc6ed4556649c3b5d;hpb=091c63501b18f17786c8ec850c7708837568e2ef;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index a0ced87..8fcbf52 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 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. @@ -21,7 +21,7 @@ // INTERNAL INCLUDES #include #include -#include +#include #include #include #include @@ -48,20 +48,20 @@ const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties) { - SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl)); + SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl, ImageDimensions{})); svgVisual->SetProperties(properties); svgVisual->Initialize(); return svgVisual; } -SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl) +SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size) { - SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl)); + SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl, size)); svgVisual->Initialize(); return svgVisual; } -SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl) +SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, ImageDimensions size) : Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::SVG), mImageVisualShaderFactory(shaderFactory), mAtlasRect(FULL_TEXTURE_RECT), @@ -71,6 +71,7 @@ SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& mDefaultHeight(0), mPlacementActor(), mRasterizedSize(Vector2::ZERO), + mDesiredSize(size), mLoadFailed(false), mAttemptAtlasing(false) { @@ -80,6 +81,17 @@ SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& SvgVisual::~SvgVisual() { + if(Stage::IsInstalled()) + { + if(mLoadingTask) + { + Dali::AsyncTaskManager::Get().RemoveTask(mLoadingTask); + } + if(mRasterizingTask) + { + Dali::AsyncTaskManager::Get().RemoveTask(mRasterizingTask); + } + } } void SvgVisual::OnInitialize() @@ -92,15 +104,20 @@ void SvgVisual::OnInitialize() Vector2 dpi = Stage::GetCurrent().GetDpi(); float meanDpi = (dpi.height + dpi.width) * 0.5f; - SvgTaskPtr newTask = new SvgLoadingTask(this, mVectorRenderer, mImageUrl, meanDpi); + mLoadingTask = new SvgLoadingTask(mVectorRenderer, mImageUrl, meanDpi, MakeCallback(this, &SvgVisual::ApplyRasterizedImage)); if(IsSynchronousLoadingRequired() && mImageUrl.IsLocalResource()) { - newTask->Process(); + mLoadingTask->Process(); + if(!mLoadingTask->HasSucceeded()) + { + mLoadFailed = true; + } + mLoadingTask.Reset(); // We don't need it anymore. } else { - mFactoryCache.GetSVGRasterizationManager()->AddTask(newTask); + Dali::AsyncTaskManager::Get().AddTask(mLoadingTask); } } @@ -122,6 +139,14 @@ void SvgVisual::DoSetProperties(const Property::Map& propertyMap) { DoSetProperty(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second); } + else if(keyValue.first == IMAGE_DESIRED_WIDTH) + { + DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_WIDTH, keyValue.second); + } + else if(keyValue.first == IMAGE_DESIRED_HEIGHT) + { + DoSetProperty(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, keyValue.second); + } } } @@ -154,6 +179,24 @@ void SvgVisual::DoSetProperty(Property::Index index, const Property::Value& valu } break; } + case Toolkit::ImageVisual::Property::DESIRED_WIDTH: + { + int32_t desiredWidth = 0; + if(value.Get(desiredWidth)) + { + mDesiredSize.SetWidth(desiredWidth); + } + break; + } + case Toolkit::ImageVisual::Property::DESIRED_HEIGHT: + { + int32_t desiredHeight = 0; + if(value.Get(desiredHeight)) + { + mDesiredSize.SetHeight(desiredHeight); + } + break; + } } } @@ -191,7 +234,17 @@ void SvgVisual::DoSetOnScene(Actor& actor) void SvgVisual::DoSetOffScene(Actor& actor) { - mFactoryCache.GetSVGRasterizationManager()->RemoveTask(this); + // Remove loading & rasterizing task + if(mLoadingTask) + { + Dali::AsyncTaskManager::Get().RemoveTask(mLoadingTask); + mLoadingTask.Reset(); + } + if(mRasterizingTask) + { + Dali::AsyncTaskManager::Get().RemoveTask(mRasterizingTask); + mRasterizingTask.Reset(); + } actor.RemoveRenderer(mImpl->mRenderer); mPlacementActor.Reset(); @@ -202,7 +255,12 @@ void SvgVisual::DoSetOffScene(Actor& actor) void SvgVisual::GetNaturalSize(Vector2& naturalSize) { - if(mLoadFailed && mImpl->mRenderer) + if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0) + { + naturalSize.x = mDesiredSize.GetWidth(); + naturalSize.y = mDesiredSize.GetHeight(); + } + else if(mLoadFailed && mImpl->mRenderer) { // Load failed, use broken image size auto textureSet = mImpl->mRenderer.GetTextures(); @@ -234,6 +292,8 @@ void SvgVisual::DoCreatePropertyMap(Property::Map& map) const map.Insert(Toolkit::ImageVisual::Property::ATLASING, mAttemptAtlasing); } map.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired()); + map.Insert(Toolkit::ImageVisual::Property::DESIRED_WIDTH, mDesiredSize.GetWidth()); + map.Insert(Toolkit::ImageVisual::Property::DESIRED_HEIGHT, mDesiredSize.GetHeight()); } void SvgVisual::DoCreateInstancePropertyMap(Property::Map& map) const @@ -257,27 +317,29 @@ void SvgVisual::AddRasterizationTask(const Vector2& size) unsigned int width = static_cast(size.width); unsigned int height = static_cast(size.height); - SvgTaskPtr newTask = new SvgRasterizingTask(this, mVectorRenderer, width, height); + mRasterizingTask = new SvgRasterizingTask(mVectorRenderer, width, height, MakeCallback(this, &SvgVisual::ApplyRasterizedImage)); if(IsSynchronousLoadingRequired() && mImageUrl.IsLocalResource()) { - newTask->Process(); - ApplyRasterizedImage(newTask->GetPixelData(), newTask->HasSucceeded()); + mRasterizingTask->Process(); + ApplyRasterizedImage(mRasterizingTask); + mRasterizingTask.Reset(); // We don't need it anymore. } else { - mFactoryCache.GetSVGRasterizationManager()->AddTask(newTask); + Dali::AsyncTaskManager::Get().AddTask(mRasterizingTask); } } } -void SvgVisual::ApplyRasterizedImage(PixelData rasterizedPixelData, bool success) +void SvgVisual::ApplyRasterizedImage(SvgTaskPtr task) { - if(success) + if(task->HasSucceeded()) { + PixelData rasterizedPixelData = task->GetPixelData(); if(mDefaultWidth == 0 || mDefaultHeight == 0) { - mVectorRenderer.GetDefaultSize(mDefaultWidth, mDefaultHeight); + task->GetRenderer().GetDefaultSize(mDefaultWidth, mDefaultHeight); } // Rasterization success @@ -348,7 +410,7 @@ void SvgVisual::ApplyRasterizedImage(PixelData rasterizedPixelData, bool success ResourceReady(Toolkit::Visual::ResourceStatus::READY); } } - else if(!success && !mLoadFailed) + else if(!mLoadFailed) { mLoadFailed = true; @@ -363,18 +425,38 @@ void SvgVisual::ApplyRasterizedImage(PixelData rasterizedPixelData, bool success ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); } + + // We don't need to keep tasks anymore. reset now. + if(task == mLoadingTask) + { + mLoadingTask.Reset(); + } + if(task == mRasterizingTask) + { + mRasterizingTask.Reset(); + } } void SvgVisual::OnSetTransform() { - Vector2 visualSize = mImpl->mTransform.GetVisualSize(mImpl->mControlSize); - if(IsOnScene() && !mLoadFailed) { - if(visualSize != mRasterizedSize || mDefaultWidth == 0 || mDefaultHeight == 0) + Vector2 size; + if(mDesiredSize.GetWidth() > 0 && mDesiredSize.GetHeight() > 0) + { + // Use desired size + size = Vector2(mDesiredSize.GetWidth(), mDesiredSize.GetHeight()); + } + else + { + // Use visual size + size = mImpl->mTransform.GetVisualSize(mImpl->mControlSize); + } + + if(size != mRasterizedSize || mDefaultWidth == 0 || mDefaultHeight == 0) { - mRasterizedSize = visualSize; - AddRasterizationTask(visualSize); + mRasterizedSize = size; + AddRasterizationTask(size); } }