/*
- * 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.
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
#include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
-#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
+#include <dali-toolkit/internal/visuals/svg/svg-task.h>
#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
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),
mDefaultHeight(0),
mPlacementActor(),
mRasterizedSize(Vector2::ZERO),
+ mDesiredSize(size),
mLoadFailed(false),
mAttemptAtlasing(false)
{
SvgVisual::~SvgVisual()
{
+ if(Stage::IsInstalled())
+ {
+ if(mLoadingTask)
+ {
+ Dali::AsyncTaskManager::Get().RemoveTask(mLoadingTask);
+ }
+ if(mRasterizingTask)
+ {
+ Dali::AsyncTaskManager::Get().RemoveTask(mRasterizingTask);
+ }
+ }
}
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();
+ mLoadingTask.Reset(); // We don't need it now
}
else
{
- mFactoryCache.GetSVGRasterizationManager()->AddTask(newTask);
+ Dali::AsyncTaskManager::Get().AddTask(mLoadingTask);
}
}
{
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);
+ }
}
}
}
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;
+ }
}
}
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();
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();
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
unsigned int width = static_cast<unsigned int>(size.width);
unsigned int height = static_cast<unsigned int>(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 now
}
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
ResourceReady(Toolkit::Visual::ResourceStatus::READY);
}
}
- else if(!success && !mLoadFailed)
+ else if(!mLoadFailed)
{
mLoadFailed = true;
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);
}
}