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=ec19635ff53dadbb73fa834920a30776db42847c;hp=a9989c0c3a2831c711365303beb4522c72900ae1;hb=f3e45e41c5f16ccc2538b283897ed6efb07e4ea9;hpb=6de1ee72f32ce241e32d653b427348cf553cf006 diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index a9989c0..ec19635 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) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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,8 +19,6 @@ #include "svg-visual.h" // INTERNAL INCLUDES -#include -#include #include #include #include @@ -45,8 +43,6 @@ namespace Internal namespace { // property name -const char * const UNITS("px"); - const Dali::Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f); } @@ -54,29 +50,32 @@ 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 ) ); - svgVisual->ParseFromUrl( imageUrl ); - svgVisual->SetProperties( properties ); - + svgVisual->Load(); + svgVisual->SetProperties(properties); + svgVisual->Initialize(); return svgVisual; } SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl ) { SvgVisualPtr svgVisual( new SvgVisual( factoryCache, shaderFactory, imageUrl ) ); - svgVisual->ParseFromUrl( imageUrl ); - + svgVisual->Load(); + svgVisual->Initialize(); return svgVisual; } -SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl ) -: Visual::Base( factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::SVG ), - mImageVisualShaderFactory( shaderFactory ), - mAtlasRect( FULL_TEXTURE_RECT ), - mImageUrl( imageUrl ), - mParsedImage( NULL ), +SvgVisual::SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl) +: Visual::Base(factoryCache, Visual::FittingMode::FILL, Toolkit::Visual::SVG), + mImageVisualShaderFactory(shaderFactory), + mAtlasRect(FULL_TEXTURE_RECT), + mImageUrl(imageUrl), + mVectorRenderer(VectorImageRenderer::New()), + mDefaultWidth(0), + mDefaultHeight(0), mPlacementActor(), mVisualSize(Vector2::ZERO), - mAttemptAtlasing( false ) + mLoadFailed(false), + mAttemptAtlasing(false) { // the rasterized image is with pre-multiplied alpha format mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; @@ -84,10 +83,26 @@ SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory SvgVisual::~SvgVisual() { - if( mParsedImage ) +} + +void SvgVisual::OnInitialize() +{ + Shader shader; + if(!mImpl->mCustomShader) { - nsvgDelete( mParsedImage ); + shader = mImageVisualShaderFactory.GetShader(mFactoryCache, mAttemptAtlasing, true, IsRoundedCornerRequired()); } + 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); + } + + Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::QUAD_GEOMETRY); + mImpl->mRenderer = Renderer::New(geometry, shader); } void SvgVisual::DoSetProperties( const Property::Map& propertyMap ) @@ -145,23 +160,7 @@ void SvgVisual::DoSetProperty( Property::Index index, const Property::Value& val void SvgVisual::DoSetOnScene( Actor& actor ) { - Shader shader; - if( !mImpl->mCustomShader ) - { - shader = mImageVisualShaderFactory.GetShader( mFactoryCache, mAttemptAtlasing, true, false ); - } - else - { - shader = Shader::New( mImpl->mCustomShader->mVertexShader.empty() ? mImageVisualShaderFactory.GetVertexShaderSource() : mImpl->mCustomShader->mVertexShader, - mImpl->mCustomShader->mFragmentShader.empty() ? mImageVisualShaderFactory.GetFragmentShaderSource() : mImpl->mCustomShader->mFragmentShader, - mImpl->mCustomShader->mHints ); - - shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT ); - } - - Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); TextureSet textureSet = TextureSet::New(); - mImpl->mRenderer = Renderer::New( geometry, shader ); mImpl->mRenderer.SetTextures( textureSet ); // Register transform properties @@ -172,8 +171,20 @@ void SvgVisual::DoSetOnScene( Actor& actor ) // Hold the weak handle of the placement actor and delay the adding of renderer until the svg rasterization is finished. mPlacementActor = actor; - // SVG visual needs it's size set before it can be rasterized hence set ResourceReady once on stage - ResourceReady( Toolkit::Visual::ResourceStatus::READY ); + if(mLoadFailed) + { + Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); + textureSet.SetTexture(0u, brokenImage); + + 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); + } } void SvgVisual::DoSetOffScene( Actor& actor ) @@ -181,7 +192,6 @@ void SvgVisual::DoSetOffScene( Actor& actor ) mFactoryCache.GetSVGRasterizationThread()->RemoveTask( this ); actor.RemoveRenderer( mImpl->mRenderer ); - mImpl->mRenderer.Reset(); mPlacementActor.Reset(); // Reset the visual size to zero so that when adding the actor back to stage the SVG rasterization is forced @@ -190,15 +200,8 @@ void SvgVisual::DoSetOffScene( Actor& actor ) void SvgVisual::GetNaturalSize( Vector2& naturalSize ) { - if( mParsedImage ) - { - naturalSize.x = mParsedImage->width; - naturalSize.y = mParsedImage->height; - } - else - { - naturalSize = Vector2::ZERO; - } + naturalSize.x = mDefaultWidth; + naturalSize.y = mDefaultHeight; } void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const @@ -218,18 +221,30 @@ void SvgVisual::DoCreateInstancePropertyMap( Property::Map& map ) const // Do nothing } -void SvgVisual::ParseFromUrl( const VisualUrl& imageUrl ) +void SvgVisual::Load() { - mImageUrl = imageUrl; - if( mImageUrl.IsLocalResource() ) + // load remote resource on svg rasterize thread. + if(mImageUrl.IsLocalResource()) { - Vector2 dpi = Stage::GetCurrent().GetDpi(); - float meanDpi = ( dpi.height + dpi.width ) * 0.5f; - Dali::Vector buffer; - if ( Dali::FileLoader::ReadFile( mImageUrl.GetUrl(), buffer ) ) + 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 { - buffer.PushBack( '\0' ); - mParsedImage = nsvgParse( buffer.Begin(), UNITS, meanDpi ); + mLoadFailed = true; + DALI_LOG_ERROR("SvgVisual::Load: Failed to read file! [%s]\n", mImageUrl.GetUrl().c_str()); } } } @@ -244,11 +259,12 @@ void SvgVisual::AddRasterizationTask( const Vector2& size ) Vector2 dpi = Stage::GetCurrent().GetDpi(); float meanDpi = ( dpi.height + dpi.width ) * 0.5f; - RasterizingTaskPtr newTask = new RasterizingTask( this, mParsedImage, mImageUrl, meanDpi, width, height ); - if ( IsSynchronousLoadingRequired() ) + RasterizingTaskPtr newTask = new RasterizingTask(this, mVectorRenderer, mImageUrl, meanDpi, width, height); + if(IsSynchronousLoadingRequired() && mImageUrl.IsLocalResource()) { + newTask->Load(); newTask->Rasterize(); - ApplyRasterizedImage( newTask->GetParsedImage(), newTask->GetPixelData() ); + ApplyRasterizedImage(newTask->GetVectorRenderer(), newTask->GetPixelData(), newTask->IsLoaded()); } else { @@ -257,14 +273,9 @@ void SvgVisual::AddRasterizationTask( const Vector2& size ) } } -void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterizedPixelData ) +void SvgVisual::ApplyRasterizedImage( VectorImageRenderer vectorRenderer, PixelData rasterizedPixelData, bool isLoaded ) { - if( mParsedImage == NULL) - { - mParsedImage = parsedSvg; - } - - if( mParsedImage && IsOnScene() ) + if(isLoaded && rasterizedPixelData && IsOnScene()) { TextureSet currentTextureSet = mImpl->mRenderer.GetTextures(); if( mImpl->mFlags & Impl::IS_ATLASING_APPLIED ) @@ -325,11 +336,22 @@ void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterized 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( !mParsedImage ) + else if(!isLoaded || !rasterizedPixelData) { + Actor actor = mPlacementActor.GetHandle(); + if(actor) + { + TextureSet textureSet = mImpl->mRenderer.GetTextures(); + + Texture brokenImage = mFactoryCache.GetBrokenVisualImage(); + textureSet.SetTexture(0u, brokenImage); + + actor.AddRenderer(mImpl->mRenderer); + } + ResourceReady( Toolkit::Visual::ResourceStatus::FAILED ); } } @@ -338,7 +360,7 @@ void SvgVisual::OnSetTransform() { Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize ); - if( IsOnScene() ) + if(IsOnScene() && !mLoadFailed) { if( visualSize != mVisualSize ) {