X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-visual.cpp;h=9d0a2cc81ed4b564be77500006ef929acd19bb17;hp=ec19635ff53dadbb73fa834920a30776db42847c;hb=45ad62cd772319bc585a48c868b31892881374bb;hpb=f3e45e41c5f16ccc2538b283897ed6efb07e4ea9 diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index ec19635..9d0a2cc 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) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -19,47 +19,44 @@ #include "svg-visual.h" // INTERNAL INCLUDES -#include #include -#include -#include #include +#include +#include +#include #include // EXTERNAL INCLUDES #include -#include #include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { +const int CUSTOM_PROPERTY_COUNT(1); // atlas + // property name const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); -} +} // namespace -SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties ) +SvgVisualPtr SvgVisual::New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties) { - SvgVisualPtr svgVisual( new SvgVisual( factoryCache, shaderFactory, imageUrl ) ); - svgVisual->Load(); + SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl)); 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) { - SvgVisualPtr svgVisual( new SvgVisual( factoryCache, shaderFactory, imageUrl ) ); - svgVisual->Load(); + SvgVisualPtr svgVisual(new SvgVisual(factoryCache, shaderFactory, imageUrl)); svgVisual->Initialize(); return svgVisual; } @@ -73,7 +70,7 @@ SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& mDefaultWidth(0), mDefaultHeight(0), mPlacementActor(), - mVisualSize(Vector2::ZERO), + mRasterizedSize(Vector2::ZERO), mLoadFailed(false), mAttemptAtlasing(false) { @@ -87,60 +84,62 @@ SvgVisual::~SvgVisual() void SvgVisual::OnInitialize() { - Shader shader; - if(!mImpl->mCustomShader) + Shader shader = GenerateShader(); + Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); + mImpl->mRenderer = DecoratedVisualRenderer::New(geometry, shader); + mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); + + Vector2 dpi = Stage::GetCurrent().GetDpi(); + float meanDpi = (dpi.height + dpi.width) * 0.5f; + + SvgTaskPtr newTask = new SvgLoadingTask(this, mVectorRenderer, mImageUrl, meanDpi); + + if(IsSynchronousLoadingRequired() && mImageUrl.IsLocalResource()) { - shader = mImageVisualShaderFactory.GetShader(mFactoryCache, mAttemptAtlasing, true, IsRoundedCornerRequired()); + newTask->Process(); } else { - shader = Shader::New(mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource().data() : mImpl->mCustomShader->mVertexShader, - mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource().data() : mImpl->mCustomShader->mFragmentShader, - mImpl->mCustomShader->mHints); - - shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT); + mFactoryCache.GetSVGRasterizationThread()->AddTask(newTask); } - - Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); - mImpl->mRenderer = Renderer::New(geometry, shader); } -void SvgVisual::DoSetProperties( const Property::Map& propertyMap ) +void SvgVisual::DoSetProperties(const Property::Map& propertyMap) { // url already passed in from constructor - for( Property::Map::SizeType iter = 0; iter < propertyMap.Count(); ++iter ) + for(Property::Map::SizeType iter = 0; iter < propertyMap.Count(); ++iter) { - KeyValuePair keyValue = propertyMap.GetKeyValue( iter ); - if( keyValue.first.type == Property::Key::INDEX ) + KeyValuePair keyValue = propertyMap.GetKeyValue(iter); + if(keyValue.first.type == Property::Key::INDEX) { - DoSetProperty( keyValue.first.indexKey, keyValue.second ); + DoSetProperty(keyValue.first.indexKey, keyValue.second); } - else if( keyValue.first == IMAGE_ATLASING ) + else if(keyValue.first == IMAGE_ATLASING) { - DoSetProperty( Toolkit::ImageVisual::Property::ATLASING, keyValue.second ); + DoSetProperty(Toolkit::ImageVisual::Property::ATLASING, keyValue.second); } - else if( keyValue.first == SYNCHRONOUS_LOADING ) + else if(keyValue.first == SYNCHRONOUS_LOADING) { - DoSetProperty( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second ); + DoSetProperty(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, keyValue.second); } } } -void SvgVisual::DoSetProperty( Property::Index index, const Property::Value& value ) +void SvgVisual::DoSetProperty(Property::Index index, const Property::Value& value) { - switch( index ) + switch(index) { case Toolkit::ImageVisual::Property::ATLASING: { - value.Get( mAttemptAtlasing ); + value.Get(mAttemptAtlasing); break; } case Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING: { bool sync = false; - if( value.Get( sync ) ) + if(value.Get(sync)) { - if( sync ) + if(sync) { mImpl->mFlags |= Impl::IS_SYNCHRONOUS_RESOURCE_LOADING; } @@ -158,13 +157,13 @@ void SvgVisual::DoSetProperty( Property::Index index, const Property::Value& val } } -void SvgVisual::DoSetOnScene( Actor& actor ) +void SvgVisual::DoSetOnScene(Actor& actor) { TextureSet textureSet = TextureSet::New(); - mImpl->mRenderer.SetTextures( textureSet ); + mImpl->mRenderer.SetTextures(textureSet); // Register transform properties - mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); // Defer the rasterisation task until we get given a size (by Size Negotiation algorithm) @@ -173,212 +172,248 @@ void SvgVisual::DoSetOnScene( Actor& actor ) if(mLoadFailed) { - Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); - textureSet.SetTexture(0u, brokenImage); - + Vector2 imageSize = Vector2::ZERO; + imageSize = actor.GetProperty(Actor::Property::SIZE).Get(); + mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize); actor.AddRenderer(mImpl->mRenderer); ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); } else { - // SVG visual needs it's size set before it can be rasterized hence set ResourceReady once on stage - ResourceReady(Toolkit::Visual::ResourceStatus::READY); + if(mImpl->mEventObserver) + { + // SVG visual needs it's size set before it can be rasterized hence request relayout once on stage + mImpl->mEventObserver->RelayoutRequest(*this); + } } } -void SvgVisual::DoSetOffScene( Actor& actor ) +void SvgVisual::DoSetOffScene(Actor& actor) { - mFactoryCache.GetSVGRasterizationThread()->RemoveTask( this ); + mFactoryCache.GetSVGRasterizationThread()->RemoveTask(this); - actor.RemoveRenderer( mImpl->mRenderer ); + actor.RemoveRenderer(mImpl->mRenderer); mPlacementActor.Reset(); // Reset the visual size to zero so that when adding the actor back to stage the SVG rasterization is forced - mVisualSize = Vector2::ZERO; + mRasterizedSize = Vector2::ZERO; } -void SvgVisual::GetNaturalSize( Vector2& naturalSize ) +void SvgVisual::GetNaturalSize(Vector2& naturalSize) { - naturalSize.x = mDefaultWidth; - naturalSize.y = mDefaultHeight; + 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 + { + naturalSize.x = mDefaultWidth; + naturalSize.y = mDefaultHeight; + } } -void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const +void SvgVisual::DoCreatePropertyMap(Property::Map& map) const { map.Clear(); - map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::SVG ); - if( mImageUrl.IsValid() ) + map.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::SVG); + if(mImageUrl.IsValid()) { - map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl.GetUrl() ); - map.Insert( Toolkit::ImageVisual::Property::ATLASING, mAttemptAtlasing ); + map.Insert(Toolkit::ImageVisual::Property::URL, mImageUrl.GetUrl()); + map.Insert(Toolkit::ImageVisual::Property::ATLASING, mAttemptAtlasing); } - map.Insert( Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired() ); + map.Insert(Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING, IsSynchronousLoadingRequired()); } -void SvgVisual::DoCreateInstancePropertyMap( Property::Map& map ) const +void SvgVisual::DoCreateInstancePropertyMap(Property::Map& map) const { // Do nothing } -void SvgVisual::Load() +void SvgVisual::EnablePreMultipliedAlpha(bool preMultiplied) { - // load remote resource on svg rasterize thread. - if(mImageUrl.IsLocalResource()) + // Make always enable pre multiplied alpha whether preMultiplied value is false. + if(!preMultiplied) { - Dali::Vector buffer; - if(Dali::FileLoader::ReadFile(mImageUrl.GetUrl(), buffer)) - { - buffer.PushBack('\0'); - - Vector2 dpi = Stage::GetCurrent().GetDpi(); - float meanDpi = (dpi.height + dpi.width) * 0.5f; - if(!mVectorRenderer.Load(buffer, meanDpi)) - { - mLoadFailed = true; - DALI_LOG_ERROR("SvgVisual::Load: Failed to load file! [%s]\n", mImageUrl.GetUrl().c_str()); - return; - } - mVectorRenderer.GetDefaultSize(mDefaultWidth, mDefaultHeight); - } - else - { - mLoadFailed = true; - DALI_LOG_ERROR("SvgVisual::Load: Failed to read file! [%s]\n", mImageUrl.GetUrl().c_str()); - } + DALI_LOG_WARNING("Note : SvgVisual cannot disable PreMultipliedAlpha\n"); } } -void SvgVisual::AddRasterizationTask( const Vector2& size ) +void SvgVisual::AddRasterizationTask(const Vector2& size) { - if( mImpl->mRenderer ) + if(mImpl->mRenderer) { - unsigned int width = static_cast(size.width); - unsigned int height = static_cast( size.height ); + unsigned int width = static_cast(size.width); + unsigned int height = static_cast(size.height); - Vector2 dpi = Stage::GetCurrent().GetDpi(); - float meanDpi = ( dpi.height + dpi.width ) * 0.5f; + SvgTaskPtr newTask = new SvgRasterizingTask(this, mVectorRenderer, width, height); - RasterizingTaskPtr newTask = new RasterizingTask(this, mVectorRenderer, mImageUrl, meanDpi, width, height); if(IsSynchronousLoadingRequired() && mImageUrl.IsLocalResource()) { - newTask->Load(); - newTask->Rasterize(); - ApplyRasterizedImage(newTask->GetVectorRenderer(), newTask->GetPixelData(), newTask->IsLoaded()); + newTask->Process(); + ApplyRasterizedImage(newTask->GetPixelData(), newTask->HasSucceeded()); } else { - mFactoryCache.GetSVGRasterizationThread()->AddTask( newTask ); + mFactoryCache.GetSVGRasterizationThread()->AddTask(newTask); } } } -void SvgVisual::ApplyRasterizedImage( VectorImageRenderer vectorRenderer, PixelData rasterizedPixelData, bool isLoaded ) +void SvgVisual::ApplyRasterizedImage(PixelData rasterizedPixelData, bool success) { - if(isLoaded && rasterizedPixelData && IsOnScene()) + if(success) { - TextureSet currentTextureSet = mImpl->mRenderer.GetTextures(); - if( mImpl->mFlags & Impl::IS_ATLASING_APPLIED ) + if(mDefaultWidth == 0 || mDefaultHeight == 0) { - mFactoryCache.GetAtlasManager()->Remove( currentTextureSet, mAtlasRect ); + mVectorRenderer.GetDefaultSize(mDefaultWidth, mDefaultHeight); } - TextureSet textureSet; - - if( mAttemptAtlasing && !mImpl->mCustomShader ) + // Rasterization success + if(rasterizedPixelData && IsOnScene()) { - Vector4 atlasRect; - textureSet = mFactoryCache.GetAtlasManager()->Add(atlasRect, rasterizedPixelData ); - if( textureSet ) // atlasing + mRasterizedSize.x = static_cast(rasterizedPixelData.GetWidth()); + mRasterizedSize.y = static_cast(rasterizedPixelData.GetHeight()); + + TextureSet currentTextureSet = mImpl->mRenderer.GetTextures(); + if(mImpl->mFlags & Impl::IS_ATLASING_APPLIED) { - if( textureSet != currentTextureSet ) - { - mImpl->mRenderer.SetTextures( textureSet ); - } - mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect ); - mAtlasRect = atlasRect; - mImpl->mFlags |= Impl::IS_ATLASING_APPLIED; + mFactoryCache.GetAtlasManager()->Remove(currentTextureSet, mAtlasRect); } - } - if( !textureSet ) // no atlasing - mAttemptAtlasing is false or adding to atlas is failed - { - Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, - rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight() ); - texture.Upload( rasterizedPixelData ); - mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED; + TextureSet textureSet; - if( mAtlasRect == FULL_TEXTURE_RECT ) + if(mAttemptAtlasing && !mImpl->mCustomShader) { - textureSet = currentTextureSet; + Vector4 atlasRect; + textureSet = mFactoryCache.GetAtlasManager()->Add(atlasRect, rasterizedPixelData); + if(textureSet) // atlasing + { + if(textureSet != currentTextureSet) + { + mImpl->mRenderer.SetTextures(textureSet); + } + mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, atlasRect); + mAtlasRect = atlasRect; + mImpl->mFlags |= Impl::IS_ATLASING_APPLIED; + } } - else + + if(!textureSet) // no atlasing - mAttemptAtlasing is false or adding to atlas is failed { - textureSet = TextureSet::New(); - mImpl->mRenderer.SetTextures( textureSet ); + Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight()); + texture.Upload(rasterizedPixelData); + mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED; - mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT ); - mAtlasRect = FULL_TEXTURE_RECT; + if(mAtlasRect == FULL_TEXTURE_RECT) + { + textureSet = currentTextureSet; + } + else + { + textureSet = TextureSet::New(); + mImpl->mRenderer.SetTextures(textureSet); + + mImpl->mRenderer.RegisterProperty(ATLAS_RECT_UNIFORM_NAME, FULL_TEXTURE_RECT); + mAtlasRect = FULL_TEXTURE_RECT; + } + + if(textureSet) + { + textureSet.SetTexture(0, texture); + } } - if( textureSet ) + // Rasterized pixels are uploaded to texture. If weak handle is holding a placement actor, it is the time to add the renderer to actor. + Actor actor = mPlacementActor.GetHandle(); + if(actor) { - textureSet.SetTexture( 0, texture ); + actor.AddRenderer(mImpl->mRenderer); + // reset the weak handle so that the renderer only get added to actor once + mPlacementActor.Reset(); } - } - // Rasterized pixels are uploaded to texture. If weak handle is holding a placement actor, it is the time to add the renderer to actor. - Actor actor = mPlacementActor.GetHandle(); - if( actor ) - { - actor.AddRenderer( mImpl->mRenderer ); - // reset the weak handle so that the renderer only get added to actor once - mPlacementActor.Reset(); + // Svg loaded and ready to display + ResourceReady(Toolkit::Visual::ResourceStatus::READY); } - - // Svg loaded and ready to display - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); } - else if(!isLoaded || !rasterizedPixelData) + else if(!success && !mLoadFailed) { + mLoadFailed = true; + Actor actor = mPlacementActor.GetHandle(); if(actor) { - TextureSet textureSet = mImpl->mRenderer.GetTextures(); - - Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); - textureSet.SetTexture(0u, brokenImage); - + Vector2 imageSize = Vector2::ZERO; + imageSize = actor.GetProperty(Actor::Property::SIZE).Get(); + mFactoryCache.UpdateBrokenImageRenderer(mImpl->mRenderer, imageSize); actor.AddRenderer(mImpl->mRenderer); } - ResourceReady( Toolkit::Visual::ResourceStatus::FAILED ); + ResourceReady(Toolkit::Visual::ResourceStatus::FAILED); } } void SvgVisual::OnSetTransform() { - Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize ); + Vector2 visualSize = mImpl->mTransform.GetVisualSize(mImpl->mControlSize); if(IsOnScene() && !mLoadFailed) { - if( visualSize != mVisualSize ) + if(visualSize != mRasterizedSize || mDefaultWidth == 0 || mDefaultHeight == 0) { - AddRasterizationTask( visualSize ); - mVisualSize = visualSize; + mRasterizedSize = visualSize; + AddRasterizationTask(visualSize); } } if(mImpl->mRenderer) { - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + } +} + +void SvgVisual::UpdateShader() +{ + if(mImpl->mRenderer) + { + Shader shader = GenerateShader(); + mImpl->mRenderer.SetShader(shader); } } -bool SvgVisual::IsResourceReady() const +Shader SvgVisual::GenerateShader() const { - return ( mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY || - mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED ); + Shader shader; + if(!mImpl->mCustomShader) + { + shader = mImageVisualShaderFactory.GetShader( + mFactoryCache, + ImageVisualShaderFeature::FeatureBuilder() + .EnableTextureAtlas(mAttemptAtlasing) + .EnableRoundedCorner(IsRoundedCornerRequired()) + .EnableBorderline(IsBorderlineRequired())); + } + else + { + shader = Shader::New(mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource().data() : mImpl->mCustomShader->mVertexShader, + mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource().data() : mImpl->mCustomShader->mFragmentShader, + mImpl->mCustomShader->mHints); + + shader.RegisterProperty(PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT); + } + return shader; } } // namespace Internal