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=18d4abce6165d0c2ad16c3e207f1ea6585bd4cc1;hp=f01260fb94f2a85708393ca5c943a7ddaf7e431e;hb=6261b85db16d8e9f842c9dc152046747eec67eaa;hpb=0e6daac62ce7e42b15c22642a6c4b4f7f6e120d6 diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h index f01260f..18d4abc 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. @@ -32,6 +32,7 @@ namespace Dali { +class Texture; namespace Toolkit { @@ -59,12 +60,17 @@ public: { 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, @@ -90,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 }; /** @@ -160,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. */ - Image GetBrokenVisualImage(); + Texture GetBrokenVisualImage(); /** * @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad() @@ -238,6 +246,7 @@ private: ImageAtlasManagerPtr mAtlasManager; TextureManager mTextureManager; NPatchLoader mNPatchLoader; + Texture mBrokenImageTexture; SvgRasterizeThread* mSvgRasterizeThread; std::unique_ptr< VectorAnimationThread > mVectorAnimationThread; std::string mBrokenImageUrl;