X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-visual.cpp;h=955b84ccc2af4de366091588b6fd2f51d54b5d06;hb=d13e8792c0e8dd0a3f5fb167ca9ee7c0155b7afc;hp=d13e1e106660fa98f108d37ab716f2ec09a59143;hpb=99e2ea03e6d6059f5803d700932df1ff1c848cd3;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 d13e1e1..955b84c 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -27,9 +27,12 @@ #include // INTERNAL INCLUDES +#include +#include #include #include #include +#include #include #include #include @@ -51,11 +54,30 @@ namespace Toolkit namespace Internal { -SvgVisual::SvgVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager ) +SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, const std::string& imageUrl, const Property::Map& properties ) +{ + SvgVisualPtr svgVisual( new SvgVisual( factoryCache ) ); + svgVisual->ParseFromUrl( imageUrl ); + svgVisual->SetProperties( properties ); + + return svgVisual; +} + +SvgVisualPtr SvgVisual::New( VisualFactoryCache& factoryCache, const std::string& imageUrl ) +{ + SvgVisualPtr svgVisual( new SvgVisual( factoryCache ) ); + svgVisual->ParseFromUrl( imageUrl ); + + return svgVisual; +} + +SvgVisual::SvgVisual( VisualFactoryCache& factoryCache ) : Visual::Base( factoryCache ), mAtlasRect( FULL_TEXTURE_RECT ), - mAtlasManager( atlasManager ), - mParsedImage( NULL ) + mImageUrl(), + mParsedImage( NULL ), + mPlacementActor(), + mVisualSize(Vector2::ZERO) { // the rasterized image is with pre-multiplied alpha format mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; @@ -69,45 +91,26 @@ SvgVisual::~SvgVisual() } } -bool SvgVisual::IsSvgUrl( const std::string& url ) -{ - return url.substr( url.find_last_of(".") + 1 ) == "svg"; -} - -void SvgVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap ) +void SvgVisual::DoSetProperties( const Property::Map& propertyMap ) { - Property::Value* imageURLValue = propertyMap.Find( IMAGE_URL_NAME ); - if( imageURLValue ) - { - std::string imageUrl; - if( imageURLValue->Get( imageUrl ) ) - { - SetImage( imageUrl ); - } - else - { - DALI_LOG_ERROR( "The property '%s' is not a string\n", IMAGE_URL_NAME ); - } - } + // url already passed in from constructor } void SvgVisual::DoSetOnStage( Actor& actor ) { - Shader shader = ImageVisual::GetImageShader( mFactoryCache ); + Shader shader = ImageVisual::GetImageShader( mFactoryCache, true, true ); Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); - if( !geometry ) - { - geometry = mFactoryCache.CreateQuadGeometry(); - mFactoryCache.SaveGeometry( VisualFactoryCache::QUAD_GEOMETRY, geometry ); - } TextureSet textureSet = TextureSet::New(); mImpl->mRenderer = Renderer::New( geometry, shader ); mImpl->mRenderer.SetTextures( textureSet ); - if( mImpl->mSize != Vector2::ZERO && mParsedImage ) - { - AddRasterizationTask( mImpl->mSize ); - } + // Register transform properties + mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); + + // Defer the rasterisation task until we get given a size (by Size Negotiation algorithm) + + // Hold the weak handle of the placement actor and delay the adding of renderer until the svg rasterization is finished. + mPlacementActor = actor; } void SvgVisual::DoSetOffStage( Actor& actor ) @@ -116,9 +119,10 @@ void SvgVisual::DoSetOffStage( Actor& actor ) actor.RemoveRenderer( mImpl->mRenderer ); mImpl->mRenderer.Reset(); + mPlacementActor.Reset(); } -void SvgVisual::GetNaturalSize( Vector2& naturalSize ) const +void SvgVisual::GetNaturalSize( Vector2& naturalSize ) { if( mParsedImage ) { @@ -131,50 +135,23 @@ void SvgVisual::GetNaturalSize( Vector2& naturalSize ) const } } -void SvgVisual::SetSize( const Vector2& size ) -{ - if(mImpl->mSize != size && mParsedImage && GetIsOnStage() ) - { - AddRasterizationTask( size ); - } - mImpl->mSize = size; -} - void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( RENDERER_TYPE, IMAGE_RENDERER ); + map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::IMAGE ); if( !mImageUrl.empty() ) { - map.Insert( IMAGE_URL_NAME, mImageUrl ); + map.Insert( Toolkit::ImageVisual::Property::URL, mImageUrl ); } } -void SvgVisual::SetImage( const std::string& imageUrl, ImageDimensions size ) +void SvgVisual::ParseFromUrl( const std::string& imageUrl ) { - if( mImageUrl != imageUrl ) - { - mImageUrl = imageUrl; - - NSVGimage* parsedImageOld = mParsedImage; + mImageUrl = imageUrl; - Vector2 dpi = Stage::GetCurrent().GetDpi(); - float meanDpi = (dpi.height + dpi.width) * 0.5f; - mParsedImage = nsvgParseFromFile(mImageUrl.c_str(), UNITS, meanDpi); - - if( size.GetWidth() != 0u && size.GetHeight() != 0u) - { - mImpl->mSize.x = size.GetWidth(); - mImpl->mSize.y = size.GetHeight(); - } - - if( mImpl->mSize != Vector2::ZERO && GetIsOnStage() ) - { - AddRasterizationTask( mImpl->mSize ); - } - - mFactoryCache.GetSVGRasterizationThread()->DeleteImage( parsedImageOld ); - } + Vector2 dpi = Stage::GetCurrent().GetDpi(); + float meanDpi = (dpi.height + dpi.width) * 0.5f; + mParsedImage = nsvgParseFromFile( imageUrl.c_str(), UNITS, meanDpi ); } void SvgVisual::AddRasterizationTask( const Vector2& size ) @@ -183,7 +160,6 @@ void SvgVisual::AddRasterizationTask( const Vector2& size ) { unsigned int width = static_cast(size.width); unsigned int height = static_cast( size.height ); - BufferImage image = BufferImage::New( width, height, Pixel::RGBA8888); RasterizingTaskPtr newTask = new RasterizingTask( this, mParsedImage, width, height ); mFactoryCache.GetSVGRasterizationThread()->AddTask( newTask ); @@ -192,16 +168,16 @@ void SvgVisual::AddRasterizationTask( const Vector2& size ) void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData ) { - if( GetIsOnStage() ) + if( IsOnStage() ) { TextureSet currentTextureSet = mImpl->mRenderer.GetTextures(); if( mAtlasRect != FULL_TEXTURE_RECT ) { - mAtlasManager.Remove( currentTextureSet, mAtlasRect ); + mFactoryCache.GetAtlasManager()->Remove( currentTextureSet, mAtlasRect ); } Vector4 atlasRect; - TextureSet textureSet = mAtlasManager.Add(atlasRect, rasterizedPixelData ); + TextureSet textureSet = mFactoryCache.GetAtlasManager()->Add(atlasRect, rasterizedPixelData ); if( textureSet ) // atlasing { if( textureSet != currentTextureSet ) @@ -210,11 +186,14 @@ void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData ) } mImpl->mRenderer.RegisterProperty( ATLAS_RECT_UNIFORM_NAME, atlasRect ); mAtlasRect = atlasRect; + mImpl->mFlags |= Impl::IS_ATLASING_APPLIED; } else // no atlasing { - Atlas texture = Atlas::New( rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight() ); - texture.Upload( rasterizedPixelData, 0, 0 ); + Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGBA8888, + rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight() ); + texture.Upload( rasterizedPixelData ); + mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED; if( mAtlasRect == FULL_TEXTURE_RECT ) { @@ -231,13 +210,34 @@ void SvgVisual::ApplyRasterizedImage( PixelData rasterizedPixelData ) if( textureSet ) { - TextureSetImage( textureSet, 0u, texture ); + textureSet.SetTexture( 0, texture ); } } + + // 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(); + } } } +void SvgVisual::OnSetTransform() +{ + Vector2 visualSize = mImpl->mTransform.GetVisualSize( mImpl->mControlSize ); + if( mParsedImage && IsOnStage() ) + { + if( visualSize != mVisualSize ) + { + AddRasterizationTask( visualSize ); + mVisualSize = visualSize; + } + } +} } // namespace Internal