X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage%2Fbatch-image-visual.cpp;h=1ce668b18c8e6cb169bf083431586be34012bfb1;hp=12bfdad4f10fe69064b3bfe17261f99417660ed2;hb=c3f9162ab11786380e2ec9c55f217c2daf7722e8;hpb=afe38927f068846eaa02c374430da05f6209a6f9 diff --git a/dali-toolkit/internal/visuals/image/batch-image-visual.cpp b/dali-toolkit/internal/visuals/image/batch-image-visual.cpp index 12bfdad..1ce668b 100644 --- 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 -BatchImageVisual::BatchImageVisual( VisualFactoryCache& factoryCache, ImageAtlasManager& atlasManager ) +BatchImageVisual::BatchImageVisual( VisualFactoryCache& factoryCache ) : Visual::Base( factoryCache ), - mAtlasManager( atlasManager ), mDesiredSize() { } @@ -169,11 +168,6 @@ void BatchImageVisual::GetNaturalSize( Vector2& naturalSize ) const naturalSize = Vector2::ZERO; } -void BatchImageVisual::SetClipRect( const Rect& clipRect ) -{ - Visual::Base::SetClipRect( clipRect ); -} - void BatchImageVisual::InitializeRenderer( const std::string& imageUrl ) { if( imageUrl.empty() ) @@ -191,7 +185,7 @@ void BatchImageVisual::InitializeRenderer( const std::string& imageUrl ) { if( !mImpl->mRenderer ) { - TextureSet textureSet = mAtlasManager.Add( + TextureSet textureSet = mFactoryCache.GetAtlasManager()->Add( mAtlasRect, imageUrl, mDesiredSize ); @@ -233,6 +227,8 @@ void BatchImageVisual::DoSetOnStage( Actor& actor ) } // Turn batching on, to send message it must be on stage mImpl->mRenderer.SetProperty( Dali::Renderer::Property::BATCHING_ENABLED, true ); + + actor.AddRenderer( mImpl->mRenderer ); } void BatchImageVisual::DoSetOffStage( Actor& actor ) @@ -281,7 +277,7 @@ void BatchImageVisual::CleanCache(const std::string& url) mImpl->mRenderer.Reset(); if( mFactoryCache.CleanRendererCache( url ) ) { - mAtlasManager.Remove( textureSet, mAtlasRect ); + mFactoryCache.GetAtlasManager()->Remove( textureSet, mAtlasRect ); } }