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
Remove batching.
[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
488be15
..
c674aac
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.h
@@
-17,9
+17,6
@@
* limitations under the License.
*/
* limitations under the License.
*/
-// INTERNAL INCLUDES
-#include "svg/svg-rasterize-thread.h"
-
// EXTERNAL INCLUDES
#include <dali/public-api/math/uint-16-pair.h>
#include <dali/public-api/object/ref-object.h>
// EXTERNAL INCLUDES
#include <dali/public-api/math/uint-16-pair.h>
#include <dali/public-api/object/ref-object.h>
@@
-29,6
+26,9
@@
#include <dali/devel-api/common/owner-container.h>
#include <dali/devel-api/object/weak-handle.h>
#include <dali/devel-api/common/owner-container.h>
#include <dali/devel-api/object/weak-handle.h>
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/visuals/npatch-loader.h>
+#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
namespace Dali
{
namespace Dali
{
@@
-39,6
+39,11
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class ImageAtlasManager;
+typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
+
+class NPatchLoader;
+
/**
* Caches shaders and geometries. Owned by VisualFactory.
*/
/**
* Caches shaders and geometries. Owned by VisualFactory.
*/
@@
-59,9
+64,13
@@
public:
GRADIENT_SHADER_RADIAL_USER_SPACE,
GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
IMAGE_SHADER,
GRADIENT_SHADER_RADIAL_USER_SPACE,
GRADIENT_SHADER_RADIAL_BOUNDING_BOX,
IMAGE_SHADER,
+ IMAGE_SHADER_ATLAS_DEFAULT_WRAP,
+ IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
SVG_SHADER,
NINE_PATCH_SHADER,
SVG_SHADER,
- SHADER_TYPE_MAX = SVG_SHADER
+ TEXT_SHADER,
+ WIREFRAME_SHADER,
+ SHADER_TYPE_MAX = WIREFRAME_SHADER
};
/**
};
/**
@@
-73,7
+82,8
@@
public:
BORDER_GEOMETRY,
NINE_PATCH_GEOMETRY,
NINE_PATCH_BORDER_GEOMETRY,
BORDER_GEOMETRY,
NINE_PATCH_GEOMETRY,
NINE_PATCH_BORDER_GEOMETRY,
- GEOMETRY_TYPE_MAX = NINE_PATCH_BORDER_GEOMETRY
+ WIREFRAME_GEOMETRY,
+ GEOMETRY_TYPE_MAX = WIREFRAME_GEOMETRY
};
public:
};
public:
@@
-122,6
+132,12
@@
public:
*/
static Geometry CreateGridGeometry( Uint16Pair gridSize );
*/
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.
+ */
+ static Image GetBrokenVisualImage();
+
public:
/**
public:
/**
@@
-152,18
+168,20
@@
public:
bool CleanRendererCache( const std::string& key );
/**
bool CleanRendererCache( const std::string& key );
/**
- * @brief Cache the debug renderer
+ * Get the image atlas manager.
+ * @return A pointer to the atlas manager
*/
*/
-
void CacheDebugRenderer( Renderer& renderer
);
+
ImageAtlasManagerPtr GetAtlasManager(
);
/**
/**
- * @brief Request the debug renderer;
+ * Get the N-Patch texture cache.
+ * @return A reference to the N patch loader
*/
*/
-
Renderer GetDebugRender
er();
+
NPatchLoader& GetNPatchLoad
er();
/**
* Get the SVG rasterization thread.
/**
* Get the SVG rasterization thread.
- * @return A pointer pointing to the SVG rasterization thread.
+ * @return A
raw
pointer pointing to the SVG rasterization thread.
*/
SvgRasterizeThread* GetSVGRasterizationThread();
*/
SvgRasterizeThread* GetSVGRasterizationThread();
@@
-220,7
+238,10
@@
private:
HashVector mRendererHashes;
CachedRenderers mRenderers;
HashVector mRendererHashes;
CachedRenderers mRenderers;
- Renderer mDebugRenderer;
+ Renderer mWireframeRenderer;
+
+ ImageAtlasManagerPtr mAtlasManager;
+ NPatchLoader mNPatchLoader;
SvgRasterizeThread* mSvgRasterizeThread;
};
SvgRasterizeThread* mSvgRasterizeThread;
};