X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-cache.h;h=8037857d2f3af18b5a19a707afe2fff9ce1ba691;hp=bb4744cb36e8623a47b8ae34a2853b02dfa9208c;hb=8c45458b64211285df3df591dfcb628126a1bc0e;hpb=01db027faaf245de80dfee0928fbd6f72360f7bd

diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h
index bb4744c..8037857 100644
--- a/dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -31,6 +31,7 @@
 
 namespace Dali
 {
+class Texture;
 
 namespace Toolkit
 {
@@ -40,6 +41,7 @@ namespace Internal
 class ImageAtlasManager;
 class NPatchLoader;
 class TextureManager;
+class VectorAnimationManager;
 
 typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
 
@@ -57,18 +59,24 @@ public:
   enum ShaderType
   {
     COLOR_SHADER,
+    COLOR_SHADER_ROUNDED_CORNER,
+    COLOR_SHADER_BLUR_EDGE,
     BORDER_SHADER,
     BORDER_SHADER_ANTI_ALIASING,
     GRADIENT_SHADER_LINEAR_USER_SPACE,
     GRADIENT_SHADER_LINEAR_BOUNDING_BOX,
     GRADIENT_SHADER_RADIAL_USER_SPACE,
     GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
+    GRADIENT_SHADER_LINEAR_USER_SPACE_ROUNDED_CORNER,
+    GRADIENT_SHADER_LINEAR_BOUNDING_BOX_ROUNDED_CORNER,
+    GRADIENT_SHADER_RADIAL_USER_SPACE_ROUNDED_CORNER,
+    GRADIENT_SHADER_RADIAL_BOUNDING_BOX_ROUNDED_CORNER,
     IMAGE_SHADER,
     IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
     IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
+    IMAGE_SHADER_ROUNDED_CORNER,
     NINE_PATCH_SHADER,
     NINE_PATCH_MASK_SHADER,
-    SVG_SHADER,
     TEXT_SHADER_MULTI_COLOR_TEXT,
     TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
     TEXT_SHADER_SINGLE_COLOR_TEXT,
@@ -88,7 +96,9 @@ public:
     ANIMATED_GRADIENT_SHADER_RADIAL_USER_REPEAT,
     ANIMATED_GRADIENT_SHADER_RADIAL_USER_CLAMP,
     WIREFRAME_SHADER,
-    SHADER_TYPE_MAX = WIREFRAME_SHADER
+    ARC_BUTT_CAP_SHADER,
+    ARC_ROUND_CAP_SHADER,
+    SHADER_TYPE_MAX = ARC_ROUND_CAP_SHADER
   };
 
   /**
@@ -158,10 +168,10 @@ public:
   static Geometry CreateGridGeometry( Uint16Pair gridSize );
 
   /**
-   * @brief Returns an image to be used when a visual has failed to correctly render
-   * @return The broken image handle.
+   * @brief Returns a new Texture to use when a visual has failed to correctly render
+   * @return The broken image texture.
    */
-  static Image GetBrokenVisualImage();
+  Texture GetBrokenVisualImage();
 
   /**
    * @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
@@ -173,6 +183,12 @@ public:
    */
   bool GetPreMultiplyOnLoad();
 
+  /**
+   * @brief Set an image to be used when a visual has failed to correctly render
+   * @param[in] brokenImageUrl The broken image url.
+   */
+  void SetBrokenImageUrl(const std::string& brokenImageUrl);
+
 public:
   /**
    * Get the image atlas manager.
@@ -198,12 +214,11 @@ public:
    */
   SvgRasterizeThread* GetSVGRasterizationThread();
 
-private: // for svg rasterization thread
-
   /**
-   * Applies the rasterized image to material
+   * Get the vector animation manager.
+   * @return A reference to the vector animation manager.
    */
-  void ApplyRasterizedSVGToSampler();
+  VectorAnimationManager& GetVectorAnimationManager();
 
 protected:
 
@@ -221,11 +236,14 @@ private:
   Geometry mGeometry[GEOMETRY_TYPE_MAX+1];
   Shader mShader[SHADER_TYPE_MAX+1];
 
-  ImageAtlasManagerPtr mAtlasManager;
-  TextureManager       mTextureManager;
-  NPatchLoader         mNPatchLoader;
-  SvgRasterizeThread*  mSvgRasterizeThread;
-  bool                 mPreMultiplyOnLoad;
+  ImageAtlasManagerPtr                      mAtlasManager;
+  TextureManager                            mTextureManager;
+  NPatchLoader                              mNPatchLoader;
+  Texture                                   mBrokenImageTexture;
+  SvgRasterizeThread*                       mSvgRasterizeThread;
+  std::unique_ptr< VectorAnimationManager > mVectorAnimationManager;
+  std::string                               mBrokenImageUrl;
+  bool                                      mPreMultiplyOnLoad;
 };
 
 } // namespace Internal