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
Added ability to have strings over multiple lines in JSON using a Property Array
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-cache.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-factory-cache.cpp
b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
index
248270b
..
05e32ff
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.cpp
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.cpp
@@
-17,11
+17,11
@@
// CLASS HEADER
#include "visual-factory-cache.h"
// CLASS HEADER
#include "visual-factory-cache.h"
-// EXTERNAL
HEADER
+// EXTERNAL
INCLUDES
#include <dali/devel-api/common/hash.h>
#include <dali/public-api/images/resource-image.h>
#include <dali/devel-api/common/hash.h>
#include <dali/public-api/images/resource-image.h>
-// INTERNAL
HEADER
+// INTERNAL
INCLUDES
#include <dali-toolkit/internal/visuals/color/color-visual.h>
#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
#include <dali-toolkit/internal/visuals/color/color-visual.h>
#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
@@
-52,6
+52,11
@@
VisualFactoryCache::~VisualFactoryCache()
Geometry VisualFactoryCache::GetGeometry( GeometryType type )
{
Geometry VisualFactoryCache::GetGeometry( GeometryType type )
{
+ if( !mGeometry[type] && type == QUAD_GEOMETRY )
+ {
+ mGeometry[type] = CreateQuadGeometry();
+ }
+
return mGeometry[type];
}
return mGeometry[type];
}
@@
-150,16
+155,6
@@
bool VisualFactoryCache::CleanRendererCache( const std::string& key )
return false;
}
return false;
}
-void VisualFactoryCache::CacheWireframeRenderer( Renderer& renderer )
-{
- mWireframeRenderer = renderer;
-}
-
-Renderer VisualFactoryCache::GetWireframeRenderer()
-{
- return mWireframeRenderer;
-}
-
Geometry VisualFactoryCache::CreateQuadGeometry()
{
const float halfWidth = 0.5f;
Geometry VisualFactoryCache::CreateQuadGeometry()
{
const float halfWidth = 0.5f;
@@
-197,6
+192,11
@@
ImageAtlasManagerPtr VisualFactoryCache::GetAtlasManager()
return mAtlasManager;
}
return mAtlasManager;
}
+NPatchLoader& VisualFactoryCache::GetNPatchLoader()
+{
+ return mNPatchLoader;
+}
+
SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
{
if( !mSvgRasterizeThread )
SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
{
if( !mSvgRasterizeThread )