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 code for stylable transitions
[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
404f2ec
..
248270b
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.cpp
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,10
+19,17
@@
// EXTERNAL HEADER
#include <dali/devel-api/common/hash.h>
// EXTERNAL HEADER
#include <dali/devel-api/common/hash.h>
+#include <dali/public-api/images/resource-image.h>
// INTERNAL HEADER
#include <dali-toolkit/internal/visuals/color/color-visual.h>
#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
// INTERNAL HEADER
#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>
+
+namespace
+{
+const char * const BROKEN_VISUAL_IMAGE_URL( DALI_IMAGE_DIR "broken.png");
+}
namespace Dali
{
namespace Dali
{
@@
-143,14
+150,14
@@
bool VisualFactoryCache::CleanRendererCache( const std::string& key )
return false;
}
return false;
}
-void VisualFactoryCache::Cache
Debug
Renderer( Renderer& renderer )
+void VisualFactoryCache::Cache
Wireframe
Renderer( Renderer& renderer )
{
{
- m
Debug
Renderer = renderer;
+ m
Wireframe
Renderer = renderer;
}
}
-Renderer VisualFactoryCache::Get
Debug
Renderer()
+Renderer VisualFactoryCache::Get
Wireframe
Renderer()
{
{
- return m
Debug
Renderer;
+ return m
Wireframe
Renderer;
}
Geometry VisualFactoryCache::CreateQuadGeometry()
}
Geometry VisualFactoryCache::CreateQuadGeometry()
@@
-179,6
+186,17
@@
Geometry VisualFactoryCache::CreateQuadGeometry()
return geometry;
}
return geometry;
}
+ImageAtlasManagerPtr VisualFactoryCache::GetAtlasManager()
+{
+ if( !mAtlasManager )
+ {
+ mAtlasManager = new ImageAtlasManager();
+ mAtlasManager->SetBrokenImage( BROKEN_VISUAL_IMAGE_URL );
+ }
+
+ return mAtlasManager;
+}
+
SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
{
if( !mSvgRasterizeThread )
SvgRasterizeThread* VisualFactoryCache::GetSVGRasterizationThread()
{
if( !mSvgRasterizeThread )
@@
-309,6
+327,11
@@
Geometry VisualFactoryCache::CreateBatchQuadGeometry( Vector4 texCoords )
return geometry;
}
return geometry;
}
+Image VisualFactoryCache::GetBrokenVisualImage()
+{
+ return ResourceImage::New( BROKEN_VISUAL_IMAGE_URL );
+}
+
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit