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
[dali_1.2.23] Merge branch 'devel/master'
[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
6f67a66
..
641c013
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
{
@@
-42,6
+42,8
@@
namespace Internal
class ImageAtlasManager;
typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
class ImageAtlasManager;
typedef IntrusivePtr<ImageAtlasManager> ImageAtlasManagerPtr;
+class NPatchLoader;
+
/**
* Caches shaders and geometries. Owned by VisualFactory.
*/
/**
* Caches shaders and geometries. Owned by VisualFactory.
*/
@@
-67,7
+69,9
@@
public:
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
SVG_SHADER,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
SVG_SHADER,
- SHADER_TYPE_MAX = SVG_SHADER
+ TEXT_SHADER,
+ WIREFRAME_SHADER,
+ SHADER_TYPE_MAX = WIREFRAME_SHADER
};
/**
};
/**
@@
-79,7
+83,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:
@@
-171,24
+176,20
@@
public:
bool CleanRendererCache( const std::string& key );
/**
bool CleanRendererCache( const std::string& key );
/**
- * @brief Cache the debug renderer
- */
- void CacheDebugRenderer( Renderer& renderer );
-
- /**
- * @brief Request the debug renderer;
+ * Get the image atlas manager.
+ * @return A pointer to the atlas manager
*/
*/
-
Renderer GetDebugRender
er();
+
ImageAtlasManagerPtr GetAtlasManag
er();
/**
/**
- * Get the
image atlas manager
.
- * @return A
pointer pointing to the atlas manag
er
+ * Get the
N-Patch texture cache
.
+ * @return A
reference to the N patch load
er
*/
*/
-
ImageAtlasManagerPtr GetAtlasManag
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();
@@
-245,9
+246,11
@@
private:
HashVector mRendererHashes;
CachedRenderers mRenderers;
HashVector mRendererHashes;
CachedRenderers mRenderers;
- Renderer m
Debug
Renderer;
+ Renderer m
Wireframe
Renderer;
ImageAtlasManagerPtr mAtlasManager;
ImageAtlasManagerPtr mAtlasManager;
+ NPatchLoader mNPatchLoader;
+
SvgRasterizeThread* mSvgRasterizeThread;
};
SvgRasterizeThread* mSvgRasterizeThread;
};