X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-cache.h;h=18d4abce6165d0c2ad16c3e207f1ea6585bd4cc1;hb=e25442b0c940c46d7ae4ae2e7fb48688665d69e8;hp=44b61f53f59e8d535d5f3efb10a44a5d46d9945a;hpb=df5ffd24e0610a77e53c5e6206ca5c9a761b8f65;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h index 44b61f5..18d4abc 100644 --- a/dali-toolkit/internal/visuals/visual-factory-cache.h +++ b/dali-toolkit/internal/visuals/visual-factory-cache.h @@ -32,6 +32,7 @@ namespace Dali { +class Texture; namespace Toolkit { @@ -66,6 +67,10 @@ public: 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, @@ -91,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 }; /** @@ -161,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() @@ -239,6 +246,7 @@ private: ImageAtlasManagerPtr mAtlasManager; TextureManager mTextureManager; NPatchLoader mNPatchLoader; + Texture mBrokenImageTexture; SvgRasterizeThread* mSvgRasterizeThread; std::unique_ptr< VectorAnimationThread > mVectorAnimationThread; std::string mBrokenImageUrl;