X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffilters%2Fspread-filter.cpp;h=e4f62245285849462b39a7989f22be232f96018f;hb=refs%2Fchanges%2F49%2F88249%2F1;hp=de205b6df5e1546a0b9379207c18204b9444b1b9;hpb=b154e74ada0754b5b47adcdffcf4a70df43ebbec;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/filters/spread-filter.cpp b/dali-toolkit/internal/filters/spread-filter.cpp index de205b6..e4f6224 100644 --- a/dali-toolkit/internal/filters/spread-filter.cpp +++ b/dali-toolkit/internal/filters/spread-filter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ #include // INTERNAL INCLUDES +#include namespace Dali { @@ -90,7 +91,7 @@ void SpreadFilter::Enable() mActorForInput.RegisterProperty( TEX_SCALE_UNIFORM_NAME, Vector2( 1.0f / mTargetSize.width, 0.0f ) ); // create internal offscreen for result of horizontal pass - mImageForHorz = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Image::UNUSED ); + mImageForHorz = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat ); // create an actor to render mImageForHorz for vertical blur pass mActorForHorz = Toolkit::ImageView::New( mImageForHorz ); mActorForHorz.SetParentOrigin( ParentOrigin::CENTER ); @@ -100,13 +101,13 @@ void SpreadFilter::Enable() mActorForHorz.RegisterProperty( TEX_SCALE_UNIFORM_NAME, Vector2( 0.0f, 1.0f / mTargetSize.height ) ); Property::Map customShader; - customShader[ "fragmentShader" ] = SPREAD_FRAGMENT_SOURCE; - Property::Map rendererMap; - rendererMap.Insert( "shader", customShader ); + customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = SPREAD_FRAGMENT_SOURCE; + Property::Map visualMap; + visualMap.Insert( Toolkit::Visual::Property::SHADER, customShader ); // set SPREAD custom shader - mActorForInput.SetProperty( Toolkit::ImageView::Property::IMAGE, rendererMap ); - mActorForHorz.SetProperty( Toolkit::ImageView::Property::IMAGE, rendererMap ); + mActorForInput.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap ); + mActorForHorz.SetProperty( Toolkit::ImageView::Property::IMAGE, visualMap ); mRootActor.Add( mActorForInput ); mRootActor.Add( mActorForHorz );