X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffilters%2Femboss-filter.cpp;h=b1bd177f72bd98221b3b196e1757c061742519b3;hb=dea624eb348a4926d8761c8a1364f03f9f71acf5;hp=ed87213c36d3478c4b7ffe7783588f7043093a04;hpb=c01f2590ed7bb00d9b3600511d08dc420261ed46;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp index ed87213..b1bd177 100644 --- a/dali-toolkit/internal/filters/emboss-filter.cpp +++ b/dali-toolkit/internal/filters/emboss-filter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -21,7 +21,7 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include #include #include @@ -98,7 +98,7 @@ void EmbossFilter::Enable() // create actor to render input with applied emboss effect mActorForInput1 = Actor::New(); mActorForInput1.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - mActorForInput1.SetSize(mTargetSize); + mActorForInput1.SetProperty( Actor::Property::SIZE, mTargetSize); Vector2 textureScale( 1.5f/mTargetSize.width, 1.5f/mTargetSize.height); mActorForInput1.RegisterProperty( TEX_SCALE_UNIFORM_NAME, textureScale ); mActorForInput1.RegisterProperty( COEFFICIENT_UNIFORM_NAME, Vector3( 2.f, -1.f, -1.f ) ); @@ -110,7 +110,7 @@ void EmbossFilter::Enable() mActorForInput2 = Actor::New(); mActorForInput2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - mActorForInput2.SetSize(mTargetSize); + mActorForInput2.SetProperty( Actor::Property::SIZE, mTargetSize); mActorForInput2.RegisterProperty( TEX_SCALE_UNIFORM_NAME, textureScale ); mActorForInput2.RegisterProperty( COEFFICIENT_UNIFORM_NAME, Vector3( -1.f, -1.f, 2.f ) ); // set EMBOSS custom shader @@ -121,7 +121,7 @@ void EmbossFilter::Enable() mActorForComposite = Actor::New(); mActorForComposite.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - mActorForComposite.SetSize(mTargetSize); + mActorForComposite.SetProperty( Actor::Property::SIZE, mTargetSize); mActorForComposite.SetProperty( Actor::Property::COLOR, Color::BLACK ); mRootActor.Add( mActorForComposite ); @@ -211,15 +211,15 @@ void EmbossFilter::SetSize( const Vector2& size ) mTargetSize = size; if( mActorForInput1 ) { - mActorForInput1.SetSize(mTargetSize); + mActorForInput1.SetProperty( Actor::Property::SIZE, mTargetSize); } if( mActorForInput2 ) { - mActorForInput2.SetSize(mTargetSize); + mActorForInput2.SetProperty( Actor::Property::SIZE, mTargetSize); } if( mActorForComposite ) { - mActorForComposite.SetSize(mTargetSize); + mActorForComposite.SetProperty( Actor::Property::SIZE, mTargetSize); } }