X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage%2Fbatch-image-visual.cpp;h=18ca0c74c11fc557b056441ee29973732462fb12;hb=0fbb5f3eb569409cb1234b3e1d3538362d779cec;hp=b46048a81b5633a0efbd465c958e464c5a58850b;hpb=baeb5ad3a0b2b1535c48dfb25f3d7ace66cde857;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/image/batch-image-visual.cpp b/dali-toolkit/internal/visuals/image/batch-image-visual.cpp index b46048a..18ca0c7 100644 --- a/dali-toolkit/internal/visuals/image/batch-image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/batch-image-visual.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,7 @@ // INTERNAL HEADER #include -#include +#include #include #include #include @@ -191,7 +192,7 @@ void BatchImageVisual::InitializeRenderer( const std::string& imageUrl ) mImpl->mRenderer.SetTextures( textureSet ); // Turn batching on, to send message it must be on stage. - mImpl->mRenderer.SetProperty( Dali::Renderer::Property::BATCHING_ENABLED, true ); + mImpl->mRenderer.SetProperty( Dali::DevelRenderer::Property::BATCHING_ENABLED, true ); } mImpl->mFlags |= Impl::IS_FROM_CACHE; } @@ -204,7 +205,7 @@ void BatchImageVisual::DoSetOnStage( Actor& actor ) InitializeRenderer( mImageUrl ); } // Turn batching on, to send message it must be on stage - mImpl->mRenderer.SetProperty( Dali::Renderer::Property::BATCHING_ENABLED, true ); + mImpl->mRenderer.SetProperty( Dali::DevelRenderer::Property::BATCHING_ENABLED, true ); actor.AddRenderer( mImpl->mRenderer ); } @@ -227,7 +228,7 @@ void BatchImageVisual::DoSetOffStage( Actor& actor ) void BatchImageVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( Toolkit::VisualProperty::TYPE, Toolkit::Visual::IMAGE ); + map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::IMAGE ); if( !mImageUrl.empty() ) { @@ -238,17 +239,6 @@ void BatchImageVisual::DoCreatePropertyMap( Property::Map& map ) const } } -void BatchImageVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) -{ - // TODO -} - -Dali::Property::Value BatchImageVisual::DoGetProperty( Dali::Property::Index index ) -{ - // TODO - return Dali::Property::Value(); -} - Shader BatchImageVisual::GetBatchShader( VisualFactoryCache& factoryCache ) { Shader shader = factoryCache.GetShader( VisualFactoryCache::BATCH_IMAGE_SHADER );