projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Changed text controls to re-apply style after system font size change" into...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-cache.h
diff --git
a/dali-toolkit/internal/visuals/visual-factory-cache.h
b/dali-toolkit/internal/visuals/visual-factory-cache.h
index
2c2210a
..
6f67a66
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.h
@@
-39,6
+39,9
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class ImageAtlasManager;
+typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
+
/**
* Caches shaders and geometries. Owned by VisualFactory.
*/
/**
* Caches shaders and geometries. Owned by VisualFactory.
*/
@@
-60,6
+63,8
@@
public:
GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
IMAGE_SHADER,
BATCH_IMAGE_SHADER,
GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
IMAGE_SHADER,
BATCH_IMAGE_SHADER,
+ IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
+ IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
SVG_SHADER,
SHADER_TYPE_MAX = SVG_SHADER
NINE_PATCH_SHADER,
SVG_SHADER,
SHADER_TYPE_MAX = SVG_SHADER
@@
-130,6
+135,12
@@
public:
*/
static Geometry CreateBatchQuadGeometry( Vector4 texCoords );
*/
static Geometry CreateBatchQuadGeometry( Vector4 texCoords );
+ /**
+ * @brief Returns an image to be used when a visual has failed to correctly render
+ * @return The broken image handle.
+ */
+ static Image GetBrokenVisualImage();
+
public:
/**
public:
/**
@@
-170,6
+181,12
@@
public:
Renderer GetDebugRenderer();
/**
Renderer GetDebugRenderer();
/**
+ * Get the image atlas manager.
+ * @return A pointer pointing to the atlas manager
+ */
+ ImageAtlasManagerPtr GetAtlasManager();
+
+ /**
* Get the SVG rasterization thread.
* @return A pointer pointing to the SVG rasterization thread.
*/
* Get the SVG rasterization thread.
* @return A pointer pointing to the SVG rasterization thread.
*/
@@
-230,6
+247,7
@@
private:
Renderer mDebugRenderer;
Renderer mDebugRenderer;
+ ImageAtlasManagerPtr mAtlasManager;
SvgRasterizeThread* mSvgRasterizeThread;
};
SvgRasterizeThread* mSvgRasterizeThread;
};