X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffilters%2Femboss-filter.cpp;h=6350a1d8515367001c143eefc17f639fb972095f;hp=6fe082dadb707856a78dedff89d2ee8470a3e9ff;hb=b81849b1d366b03595dec285264ecbd8b6f1801e;hpb=f52e1560139d8b38f846be2125b0125a726ed979 diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp index 6fe082d..6350a1d 100644 --- a/dali-toolkit/internal/filters/emboss-filter.cpp +++ b/dali-toolkit/internal/filters/emboss-filter.cpp @@ -29,8 +29,9 @@ // INTERNAL INCLUDES #include -#include +#include #include +#include namespace Dali { @@ -96,7 +97,7 @@ void EmbossFilter::Enable() Property::Map customShader; customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = EMBOSS_FRAGMENT_SOURCE; Property::Map visualMap; - visualMap.Insert( Toolkit::VisualProperty::SHADER, customShader ); + visualMap.Insert( Toolkit::DevelVisual::Property::SHADER, customShader ); // create actor to render input with applied emboss effect mActorForInput1 = Toolkit::ImageView::New(mInputImage); @@ -127,10 +128,10 @@ void EmbossFilter::Enable() mRootActor.Add( mActorForComposite ); - InitializeVisual( mActorForComposite, mVisualForEmboss1, mImageForEmboss1 ); + Internal::InitializeVisual( mActorForComposite, mVisualForEmboss1, mImageForEmboss1 ); Toolkit::GetImplementation( mVisualForEmboss1 ).SetCustomShader( customShader ); mActorForComposite.GetRendererAt(0).RegisterProperty( COLOR_UNIFORM_NAME, Color::BLACK ); - InitializeVisual( mActorForComposite, mVisualForEmboss2, mImageForEmboss2 ); + Internal::InitializeVisual( mActorForComposite, mVisualForEmboss2, mImageForEmboss2 ); Toolkit::GetImplementation( mVisualForEmboss2 ).SetCustomShader( customShader ); mActorForComposite.GetRendererAt(1).RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE ); @@ -162,8 +163,8 @@ void EmbossFilter::Disable() if( mActorForComposite ) { - mVisualForEmboss1.SetOffStage( mActorForComposite ); - mVisualForEmboss2.SetOffStage( mActorForComposite ); + Toolkit::GetImplementation(mVisualForEmboss1).SetOffStage( mActorForComposite ); + Toolkit::GetImplementation(mVisualForEmboss2).SetOffStage( mActorForComposite ); mVisualForEmboss1.Reset(); mVisualForEmboss2.Reset(); mRootActor.Remove( mActorForComposite );