X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-visual.h;h=5910ff24666b0e61fd153d0dfc670718d1a07bcb;hb=f3e45e41c5f16ccc2538b283897ed6efb07e4ea9;hp=87e9d434af3215f4a2209daa775bb83b0b020e4f;hpb=5a6809a40da6a50d2edce9202466aa289ad96162;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 87e9d43..5910ff2 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) 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.
@@ -26,8 +26,6 @@
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 
-struct NSVGimage;
-
 namespace Dali
 {
 
@@ -116,42 +114,51 @@ protected:
   virtual ~SvgVisual();
 
   /**
+   * @copydoc Visual::Base::OnInitialize
+   */
+  void OnInitialize() override;
+
+  /**
    * @copydoc Visual::Base::DoSetProperties
    */
   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
    */
   void OnSetTransform() override;
 
+  /**
+   * @copydoc Visual::Base::IsResourceReady
+   */
+  bool IsResourceReady() const override;
+
 public:
 
   /**
    * @bried Apply the rasterized image to the visual.
    *
-   * @param[in] parsedSvg The data of parsed image.
+   * @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( NSVGimage* parsedSvg, 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.
-    */
-   void ParseFromUrl( const VisualUrl& imageUrl );
+   * @brief Load the SVG Image from the set URL.
+   */
+  void Load();
 
   /**
    * @bried Rasterize the svg with the given size, and add it to the visual.
@@ -177,9 +184,12 @@ private:
   ImageVisualShaderFactory& mImageVisualShaderFactory;
   Vector4                   mAtlasRect;
   VisualUrl                 mImageUrl;
-  NSVGimage*                mParsedImage;
+  VectorImageRenderer       mVectorRenderer;
+  uint32_t                  mDefaultWidth;
+  uint32_t                  mDefaultHeight;
   WeakHandle<Actor>         mPlacementActor;
   Vector2                   mVisualSize;
+  bool                      mLoadFailed;
   bool                      mAttemptAtlasing;  ///< If true will attempt atlasing, otherwise create unique texture
 };