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
Merge "Add Text input style changed signal." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
batch-image-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/image/batch-image-visual.cpp
b/dali-toolkit/internal/visuals/image/batch-image-visual.cpp
index
12bfdad
..
30eeeda
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/batch-image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/image/batch-image-visual.cpp
@@
-88,9
+88,8
@@
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
} //unnamed namespace
} //unnamed namespace
-BatchImageVisual::BatchImageVisual( VisualFactoryCache& factoryCache
, ImageAtlasManager& atlasManager
)
+BatchImageVisual::BatchImageVisual( VisualFactoryCache& factoryCache )
: Visual::Base( factoryCache ),
: Visual::Base( factoryCache ),
- mAtlasManager( atlasManager ),
mDesiredSize()
{
}
mDesiredSize()
{
}
@@
-169,11
+168,6
@@
void BatchImageVisual::GetNaturalSize( Vector2& naturalSize ) const
naturalSize = Vector2::ZERO;
}
naturalSize = Vector2::ZERO;
}
-void BatchImageVisual::SetClipRect( const Rect<int>& clipRect )
-{
- Visual::Base::SetClipRect( clipRect );
-}
-
void BatchImageVisual::InitializeRenderer( const std::string& imageUrl )
{
if( imageUrl.empty() )
void BatchImageVisual::InitializeRenderer( const std::string& imageUrl )
{
if( imageUrl.empty() )
@@
-191,7
+185,7
@@
void BatchImageVisual::InitializeRenderer( const std::string& imageUrl )
{
if( !mImpl->mRenderer )
{
{
if( !mImpl->mRenderer )
{
- TextureSet textureSet = m
AtlasManager.
Add(
+ TextureSet textureSet = m
FactoryCache.GetAtlasManager()->
Add(
mAtlasRect,
imageUrl,
mDesiredSize );
mAtlasRect,
imageUrl,
mDesiredSize );
@@
-281,7
+275,7
@@
void BatchImageVisual::CleanCache(const std::string& url)
mImpl->mRenderer.Reset();
if( mFactoryCache.CleanRendererCache( url ) )
{
mImpl->mRenderer.Reset();
if( mFactoryCache.CleanRendererCache( url ) )
{
- m
AtlasManager.
Remove( textureSet, mAtlasRect );
+ m
FactoryCache.GetAtlasManager()->
Remove( textureSet, mAtlasRect );
}
}
}
}