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=66de43ce3b88057509c8f24a720786c6ea85c688;hp=0d5dcf8125c4ce9077516c2f222bbeb5d29879a9;hb=f15cbe6c00c4bcb9baffe8d6f95747e3c2e051d1;hpb=8cfc7965881ba756bca7bdde98b548200a649bd4 diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index 0d5dcf8..66de43c 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) 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. @@ -20,25 +20,21 @@ // EXTERNAL INCLUDES #include -#include +#include // INTERNAL INCLUDES #include #include -struct NSVGimage; - namespace Dali { - namespace Toolkit { - namespace Internal { - +class ImageVisualShaderFactory; class SvgVisual; -typedef IntrusivePtr< SvgVisual > SvgVisualPtr; +typedef IntrusivePtr SvgVisualPtr; /** * The visual which renders a svg image @@ -50,10 +46,9 @@ typedef IntrusivePtr< SvgVisual > SvgVisualPtr; * | url | STRING | * */ -class SvgVisual: public Visual::Base +class SvgVisual : public Visual::Base { public: - /** * @brief Create the SVG Visual using the image URL. * @@ -61,11 +56,12 @@ 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] properties A Property::Map containing settings for this visual * @return A smart-pointer to the newly allocated visual. */ - static SvgVisualPtr New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl, const Property::Map& properties ); + static SvgVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl, const Property::Map& properties); /** * @brief Create the SVG Visual using the image URL. @@ -74,36 +70,37 @@ 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 * @return A smart-pointer to the newly allocated visual. */ - static SvgVisualPtr New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl ); - -public: // from Visual + static SvgVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl); +public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize(Vector2& naturalSize) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap(Property::Map& map) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap(Property::Map& map) const override; 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(). @@ -111,63 +108,92 @@ protected: virtual ~SvgVisual(); /** + * @copydoc Visual::Base::OnInitialize + */ + void OnInitialize() override; + + /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties(const Property::Map& propertyMap) override; /** - * @copydoc Visual::Base::DoSetOnStage + * @copydoc Visual::Base::DoSetOnScene */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnScene(Actor& actor) override; /** - * @copydoc Visual::Base::DoSetOffStage + * @copydoc Visual::Base::DoSetOffScene */ - virtual void DoSetOffStage( Actor& actor ); + void DoSetOffScene(Actor& actor) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; -public: + /** + * @copydoc Visual::Base::IsResourceReady + */ + bool IsResourceReady() const override; + + /** + * @copydoc Visual::Base::UpdateShader + */ + void UpdateShader() override; + + /** + * @copydoc Visual::Base::GenerateShader + */ + Shader GenerateShader() const override; +public: /** * @bried Apply the rasterized image to the visual. * + * @param[in] vectorImage The data of vector image. * @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels + * @param[in] bool Whether the resource is loaded */ - void ApplyRasterizedImage( PixelData rasterizedPixelData ); + void ApplyRasterizedImage(VectorImageRenderer vectorImage, PixelData rasterizedPixelData, bool isLoaded); private: - /** - * @brief Parses the SVG Image from the set URL. - * - * @param[in] imageUrl The URL of the image to parse the SVG from. + * @brief Load the SVG Image from the set URL. */ - void ParseFromUrl( const VisualUrl& imageUrl ); + void Load(); /** * @bried Rasterize the svg with the given size, and add it to the visual. * * @param[in] size The target size of the SVG rasterization. */ - void AddRasterizationTask( const Vector2& size ); + 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 ); + SvgVisual(const SvgVisual& svgRenderer); // Undefined - SvgVisual& operator=( const SvgVisual& svgRenderer ); + SvgVisual& operator=(const SvgVisual& svgRenderer); private: - Vector4 mAtlasRect; - VisualUrl mImageUrl; - NSVGimage* mParsedImage; - WeakHandle mPlacementActor; - Vector2 mVisualSize; + ImageVisualShaderFactory& mImageVisualShaderFactory; + Vector4 mAtlasRect; + VisualUrl mImageUrl; + VectorImageRenderer mVectorRenderer; + uint32_t mDefaultWidth; + uint32_t mDefaultHeight; + WeakHandle mPlacementActor; + Vector2 mVisualSize; + bool mLoadFailed; + bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture }; } // namespace Internal