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=73d29e042e2d6706a1be38848a24083c038c2ff8;hp=b375932cf0a9dc440f0c6aca7503cd702ace82cf;hb=190a30974e11c5792335e3b0493bf1c212beec6a;hpb=5f58a4de80835daf8db03a9e6b9c04cf5f556831 diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp index b375932..73d29e0 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.cpp +++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -54,10 +53,20 @@ namespace Toolkit namespace Internal { +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 ) { - SvgVisual* svgVisual = new SvgVisual( factoryCache ); + SvgVisualPtr svgVisual( new SvgVisual( factoryCache ) ); svgVisual->ParseFromUrl( imageUrl ); + return svgVisual; } @@ -90,11 +99,6 @@ void SvgVisual::DoSetOnStage( Actor& actor ) { 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 ); @@ -140,6 +144,11 @@ void SvgVisual::DoCreatePropertyMap( Property::Map& map ) const } } +void SvgVisual::DoCreateInstancePropertyMap( Property::Map& map ) const +{ + // Do nothing +} + void SvgVisual::ParseFromUrl( const std::string& imageUrl ) { mImageUrl = imageUrl;