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=5c606f1320efc5ab013efb495bd35bbe1ef072d9;hp=81bfb5d31d5daccaddc959016aa418727d48f487;hb=e8a53a0a591085c6b7470feac4f9cea85cc8ae6e;hpb=8e97be241012322eff10c2511e0eb6f80d75dcbb

diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h
index 81bfb5d..5c606f1 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) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -26,20 +26,15 @@
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 
-struct NSVGimage;
-
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 class ImageVisualShaderFactory;
 class SvgVisual;
-typedef IntrusivePtr< SvgVisual > SvgVisualPtr;
+typedef IntrusivePtr<SvgVisual> SvgVisualPtr;
 
 /**
  * The visual which renders a svg image
@@ -51,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.
    *
@@ -67,7 +61,7 @@ public:
    * @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, ImageVisualShaderFactory& shaderFactory, 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.
@@ -80,27 +74,30 @@ public:
    * @param[in] imageUrl The URL to svg resource to use
    * @return A smart-pointer to the newly allocated visual.
    */
-  static SvgVisualPtr New( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl );
-
-public:  // from Visual
+  static SvgVisualPtr New(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl);
 
+public: // from Visual
   /**
    * @copydoc Visual::Base::GetNaturalSize
    */
-  void GetNaturalSize( Vector2& naturalSize ) override;
+  void GetNaturalSize(Vector2& naturalSize) override;
 
   /**
    * @copydoc Visual::Base::CreatePropertyMap
    */
-  void DoCreatePropertyMap( Property::Map& map ) const override;
+  void DoCreatePropertyMap(Property::Map& map) const override;
 
   /**
    * @copydoc Visual::Base::CreateInstancePropertyMap
    */
-  void DoCreateInstancePropertyMap( Property::Map& map ) const override;
+  void DoCreateInstancePropertyMap(Property::Map& map) const override;
 
-protected:
+  /**
+   * @copydoc Visual::Base::EnablePreMultipliedAlpha
+   */
+  void EnablePreMultipliedAlpha(bool preMultiplied) override;
 
+protected:
   /**
    * @brief Constructor.
    *
@@ -108,7 +105,7 @@ protected:
    * @param[in] shaderFactory The ImageVisualShaderFactory object
    * @param[in] imageUrl The URL to svg resource to use
    */
-  SvgVisual( VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl );
+  SvgVisual(VisualFactoryCache& factoryCache, ImageVisualShaderFactory& shaderFactory, const VisualUrl& imageUrl);
 
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
@@ -116,19 +113,24 @@ protected:
   virtual ~SvgVisual();
 
   /**
+   * @copydoc Visual::Base::OnInitialize
+   */
+  void OnInitialize() override;
+
+  /**
    * @copydoc Visual::Base::DoSetProperties
    */
-  void DoSetProperties( const Property::Map& propertyMap ) override;
+  void DoSetProperties(const Property::Map& propertyMap) override;
 
   /**
-   * @copydoc Visual::Base::DoSetOnStage
+   * @copydoc Visual::Base::DoSetOnScene
    */
-  void DoSetOnStage( Actor& actor ) override;
+  void DoSetOnScene(Actor& actor) override;
 
   /**
-   * @copydoc Visual::Base::DoSetOffStage
+   * @copydoc Visual::Base::DoSetOffScene
    */
-  void DoSetOffStage( Actor& actor ) override;
+  void DoSetOffScene(Actor& actor) override;
 
   /**
    * @copydoc Visual::Base::OnSetTransform
@@ -136,56 +138,56 @@ protected:
   void OnSetTransform() override;
 
   /**
-   * @copydoc Visual::Base::IsResourceReady
+   * @copydoc Visual::Base::UpdateShader
    */
-  bool IsResourceReady() const override;
+  void UpdateShader() override;
 
-public:
+  /**
+   * @copydoc Visual::Base::GenerateShader
+   */
+  Shader GenerateShader() const 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
+   * @param[in] success Whether the task succeeds.
    */
-  void ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterizedPixelData );
+  void ApplyRasterizedImage(PixelData rasterizedPixelData, bool success);
 
 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.
    *
    * @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 );
+  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:
   ImageVisualShaderFactory& mImageVisualShaderFactory;
   Vector4                   mAtlasRect;
   VisualUrl                 mImageUrl;
-  NSVGimage*                mParsedImage;
+  VectorImageRenderer       mVectorRenderer;
+  uint32_t                  mDefaultWidth;
+  uint32_t                  mDefaultHeight;
   WeakHandle<Actor>         mPlacementActor;
-  Vector2                   mVisualSize;
-  bool                      mAttemptAtlasing;  ///< If true will attempt atlasing, otherwise create unique texture
+  Vector2                   mRasterizedSize;
+  bool                      mLoadFailed;
+  bool                      mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture
 };
 
 } // namespace Internal