X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Falpha-discard-effect.h;h=ec2fe7825c0836a9016102dae3cb155ebb74b4f3;hp=0b557a03b21906aa81cba800003f8d873ebed628;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=18644a10e91e667563734dfa9fa8be6b85ffdc51 diff --git a/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h index 0b557a0..ec2fe78 100644 --- a/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h +++ b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__ -#define __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__ +#ifndef DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H +#define DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -19,7 +19,10 @@ */ // EXTERNAL INCLUDES -#include +#include + +// INTERNAL INCLUDES +#include namespace Dali { @@ -39,7 +42,7 @@ namespace Toolkit * Property::Map alphaDiscardEffect = CreateAlphaDiscardEffect(); * actor.SetProperty( ImageView::Property::IMAGE, alphaDiscardEffect ); * - * @return A handle to a newly allocated ShaderEffect. + * @return A property map of the required shaders. */ inline Property::Map CreateAlphaDiscardEffect() { @@ -61,13 +64,14 @@ inline Property::Map CreateAlphaDiscardEffect() Property::Map map; Property::Map customShader; - customShader[ "fragmentShader" ] = ALPHA_DISCARD_FRAGMENT_SHADER_SOURCE; + customShader[ Visual::Shader::Property::FRAGMENT_SHADER ] = ALPHA_DISCARD_FRAGMENT_SHADER_SOURCE; - map[ "shader" ] = customShader; - return map;} + map[ Toolkit::Visual::Property::SHADER ] = customShader; + return map; +} } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__ +#endif // DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H