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.h;h=87e9d434af3215f4a2209daa775bb83b0b020e4f;hp=0456bb587950f17569cf9754632e3263289d9925;hb=96e0b7fdbe4cfe733a38cbcc2b493a7aeff66d6d;hpb=f05c437df1fc28be1354e47af9dbf336828956f1 diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index 0456bb5..87e9d43 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) 2019 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. @@ -20,10 +20,11 @@ // EXTERNAL INCLUDES #include -#include +#include // INTERNAL INCLUDES #include +#include struct NSVGimage; @@ -36,6 +37,7 @@ namespace Toolkit namespace Internal { +class ImageVisualShaderFactory; class SvgVisual; typedef IntrusivePtr< SvgVisual > SvgVisualPtr; @@ -54,12 +56,18 @@ class SvgVisual: public Visual::Base public: /** - * @brief Create a new SVG visual. + * @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] shaderFactory The ImageVisualShaderFactory 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. */ - static SvgVisualPtr New( VisualFactoryCache& factoryCache ); + static SvgVisualPtr New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties ); /** * @brief Create the SVG Visual using the image URL. @@ -68,37 +76,28 @@ public: * 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] shaderFactory The ImageVisualShaderFactory object * @param[in] imageUrl The URL to svg resource to use - * @param[in] size The required size for the SVG + * @return A smart-pointer to the newly allocated visual. */ - static SvgVisualPtr New( VisualFactoryCache& factoryCache, const std::string& imageUrl, ImageDimensions size = ImageDimensions() ); + static SvgVisualPtr New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl ); public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ) const; - - /** - * @copydoc Visual::Base::SetSize - */ - virtual void SetSize( const Vector2& size ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; - - /** - * @copydoc Visual::Base::DoSetProperty - */ - virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ); + void DoCreatePropertyMap( Property::Map& map ) const override; /** - * @copydoc Visual::Base::DoGetProperty + * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index ); + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -106,8 +105,10 @@ protected: * @brief Constructor. * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * @param[in] shaderFactory The ImageVisualShaderFactory object + * @param[in] imageUrl The URL to svg resource to use */ - SvgVisual( VisualFactoryCache& factoryCache ); + SvgVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl ); /** * @brief A reference counted object may only be deleted by calling Unreference(). @@ -117,36 +118,40 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ); + void DoSetOffStage( Actor& actor ) override; + + /** + * @copydoc Visual::Base::OnSetTransform + */ + void OnSetTransform() override; public: /** * @bried Apply the rasterized image to the visual. * + * @param[in] parsedSvg The data of parsed image. * @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels */ - void ApplyRasterizedImage( PixelData rasterizedPixelData ); + void ApplyRasterizedImage( NSVGimage* parsedSvg, 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. - * @param[in] size The required size of the SVG - */ - void ParseFromUrl( const std::string& imageUrl, ImageDimensions size = ImageDimensions() ); + * @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. @@ -155,6 +160,12 @@ 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 ); @@ -163,11 +174,13 @@ private: SvgVisual& operator=( const SvgVisual& svgRenderer ); private: - Vector4 mAtlasRect; - std::string mImageUrl; - NSVGimage* mParsedImage; - WeakHandle mPlacementActor; - + ImageVisualShaderFactory& mImageVisualShaderFactory; + Vector4 mAtlasRect; + VisualUrl mImageUrl; + NSVGimage* mParsedImage; + WeakHandle mPlacementActor; + Vector2 mVisualSize; + bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture }; } // namespace Internal