X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-visual.h;h=7852bfcd10baa9a0bf9c0e9f436d86274e1224df;hb=5982fcf12fc0f3a21063f02ee432118faa5ca86a;hp=d841621064c121de4fb2a22e469de931709db29e;hpb=80f435f8608fa1604f597a5620c9e6ea137f8e0a;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index d841621..7852bfc 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.h +++ b/dali-toolkit/internal/visuals/svg/svg-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -18,8 +18,13 @@ * */ +// EXTERNAL INCLUDES +#include +#include + // INTERNAL INCLUDES #include +#include struct NSVGimage; @@ -32,6 +37,9 @@ namespace Toolkit namespace Internal { +class SvgVisual; +typedef IntrusivePtr< SvgVisual > SvgVisualPtr; + /** * The visual which renders a svg image * @@ -47,69 +55,82 @@ class SvgVisual: public Visual::Base public: /** - * @brief Constructor. + * @brief Create the SVG Visual using the image URL. + * + * The visual will parse the SVG image once it is set. + * And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * @param[in] imageUrl The URL to svg resource to use + * @param[in] properties A Property::Map containing settings for this visual + * @return A smart-pointer to the newly allocated visual. */ - SvgVisual( VisualFactoryCache& factoryCache ); + static SvgVisualPtr New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl, const Property::Map& properties ); /** - * @brief A reference counted object may only be deleted by calling Unreference(). + * @brief Create the SVG Visual using the image URL. + * + * The visual will parse the SVG image once it is set. + * And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage + * + * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * @param[in] imageUrl The URL to svg resource to use + * @return A smart-pointer to the newly allocated visual. */ - ~SvgVisual(); + static SvgVisualPtr New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl ); public: // from Visual /** - * @copydoc Visual::GetNaturalSize + * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ) const; + virtual void GetNaturalSize( Vector2& naturalSize ); /** - * @copydoc Visual::SetSize + * @copydoc Visual::Base::CreatePropertyMap */ - virtual void SetSize( const Vector2& size ); + virtual void DoCreatePropertyMap( Property::Map& map ) const; /** - * @copydoc Visual::CreatePropertyMap + * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; protected: /** - * @copydoc Visual::DoInitialize + * @brief Constructor. + * + * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object */ - virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); + SvgVisual( VisualFactoryCache& factoryCache ); /** - * @copydoc Visual::DoSetOnStage + * @brief A reference counted object may only be deleted by calling Unreference(). */ - virtual void DoSetOnStage( Actor& actor ); + virtual ~SvgVisual(); /** - * @copydoc Visual::DoSetOffStage + * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetOffStage( Actor& actor ); + virtual void DoSetProperties( const Property::Map& propertyMap ); -public: + /** + * @copydoc Visual::Base::DoSetOnStage + */ + virtual void DoSetOnStage( Actor& actor ); /** - * @brief Helper method to determine whether the url indicate that it is a svg image. - * - * @param [in] url The URL of the image file. - * @return true if it is a svg image + * @copydoc Visual::Base::DoSetOffStage */ - static bool IsSvgUrl( const std::string& url ); + virtual void DoSetOffStage( Actor& actor ); /** - * @brief Sets the svg image of this visual to the resource at imageUrl - * The visual will parse the svg image once it is set. - * And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage - * - * @param[in] imageUrl The URL to svg resource to use + * @copydoc Visual::Base::OnSetTransform */ - void SetImage( const std::string& imageUrl, ImageDimensions size = ImageDimensions() ); + virtual void OnSetTransform(); + +public: /** * @bried Apply the rasterized image to the visual. @@ -119,6 +140,14 @@ public: void ApplyRasterizedImage( PixelData rasterizedPixelData ); private: + + /** + * @brief Parses the SVG Image from the set URL. + * + * @param[in] imageUrl The URL of the image to parse the SVG from. + */ + void ParseFromUrl( const VisualUrl& imageUrl ); + /** * @bried Rasterize the svg with the given size, and add it to the visual. * @@ -126,6 +155,13 @@ private: */ void AddRasterizationTask( const Vector2& size ); + /** + * Helper method to set individual values by index key. + * @param[in] index The index key of the value + * @param[in] value The value + */ + void DoSetProperty( Property::Index index, const Property::Value& value ); + // Undefined SvgVisual( const SvgVisual& svgRenderer ); @@ -135,9 +171,11 @@ private: private: Vector4 mAtlasRect; - std::string mImageUrl; + VisualUrl mImageUrl; NSVGimage* mParsedImage; - + WeakHandle mPlacementActor; + Vector2 mVisualSize; + bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture }; } // namespace Internal