X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Feffects-view%2Feffects-view-impl.cpp;h=e55eda62368a5c3a8acd82d56495162c3bce4359;hp=85058a1b665d4fdeeb11ac527ea58a4bb07d8328;hb=99e2ea03e6d6059f5803d700932df1ff1c848cd3;hpb=4cd15baa1eaa620c0ef5e94e56d82fad17b888d5 diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp index 85058a1..e55eda6 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp @@ -188,7 +188,7 @@ void EffectsView::SetType( Toolkit::EffectsView::EffectType type ) customShader[ "vertexShader" ] = EFFECTS_VIEW_VERTEX_SOURCE; customShader[ "fragmentShader" ] = EFFECTS_VIEW_FRAGMENT_SOURCE; rendererMap[ "shader" ] = customShader; - InitializeVisual( self, mRendererPostFilter, rendererMap ); + InitializeVisual( self, mVisualPostFilter, rendererMap ); mEffectType = type; } @@ -302,13 +302,13 @@ void EffectsView::OnStageConnection( int depth ) Enable(); Actor self = Self(); - if( mRendererPostFilter ) + if( mVisualPostFilter ) { - mRendererPostFilter.SetOnStage( self ); + mVisualPostFilter.SetOnStage( self ); } - if( mRendererForChildren ) + if( mVisualForChildren ) { - mRendererForChildren.SetOnStage( self ); + mVisualForChildren.SetOnStage( self ); } } @@ -323,13 +323,13 @@ void EffectsView::OnStageDisconnection() } Actor self = Self(); - if( mRendererPostFilter ) + if( mVisualPostFilter ) { - mRendererPostFilter.SetOffStage( self ); + mVisualPostFilter.SetOffStage( self ); } - if( mRendererForChildren ) + if( mVisualForChildren ) { - mRendererForChildren.SetOffStage( self ); + mVisualForChildren.SetOffStage( self ); } Control::OnStageDisconnection(); @@ -435,14 +435,14 @@ void EffectsView::AllocateResources() Actor self( Self() ); mImageForChildren = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); - InitializeVisual( self, mRendererForChildren, mImageForChildren ); - mRendererForChildren.SetDepthIndex( DepthIndex::CONTENT+1 ); + InitializeVisual( self, mVisualForChildren, mImageForChildren ); + mVisualForChildren.SetDepthIndex( DepthIndex::CONTENT+1 ); mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); TextureSet textureSet = TextureSet::New(); TextureSetImage( textureSet, 0u, mImagePostFilter ); self.GetRendererAt( 0 ).SetTextures( textureSet ); - mRendererPostFilter.SetDepthIndex( DepthIndex::CONTENT ); + mVisualPostFilter.SetDepthIndex( DepthIndex::CONTENT ); SetupFilters(); }