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
Cache NPatch textures
[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
..
0b77e53
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.
*/
@@
-171,24
+173,30
@@
public:
bool CleanRendererCache( const std::string& key );
/**
bool CleanRendererCache( const std::string& key );
/**
- * @brief Cache the
debug
renderer
+ * @brief Cache the
wireframe
renderer
*/
*/
- void Cache
Debug
Renderer( Renderer& renderer );
+ void Cache
Wireframe
Renderer( Renderer& renderer );
/**
/**
- * @brief Request the
debug
renderer;
+ * @brief Request the
wireframe
renderer;
*/
*/
- Renderer Get
Debug
Renderer();
+ Renderer Get
Wireframe
Renderer();
/**
* Get the image atlas manager.
/**
* Get the image atlas manager.
- * @return A pointer
pointing
to the atlas manager
+ * @return A pointer to the atlas manager
*/
ImageAtlasManagerPtr GetAtlasManager();
/**
*/
ImageAtlasManagerPtr GetAtlasManager();
/**
+ * Get the N-Patch texture cache.
+ * @return A reference to the N patch loader
+ */
+ NPatchLoader& GetNPatchLoader();
+
+ /**
* 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
+253,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;
};