X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fvisuals%2Fvisual-properties.h;h=65d452af05bf0660bc669737124bc61a6854c3e1;hb=e2d3bdc173f657ddf0a0c58062a61bbbaaf6f9da;hp=c4f5cb2bdaa376a20235a8a0ed3d104edb845bfe;hpb=09ae840a22681a4bbdc770f00674498ab75aec69;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/visuals/visual-properties.h b/dali-toolkit/public-api/visuals/visual-properties.h index c4f5cb2..65d452a 100644 --- a/dali-toolkit/public-api/visuals/visual-properties.h +++ b/dali-toolkit/public-api/visuals/visual-properties.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_VISUAL_PROPERTIES_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -27,6 +27,11 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_visuals + * @{ + */ + namespace Visual { @@ -82,7 +87,8 @@ enum { /** * @brief The vertex shader. - * @details Name "vertexShader", type Property::STRING. + * @details Name "vertexShader", type Property::STRING or Property::ARRAY of Property::STRING. + * A Property::ARRAY of Property::STRING values can be used to split the shader string over multiple lines. * @SINCE_1_1.45 * @note Optional * @note If not supplied, the visual's already set vertex shader is used. @@ -91,7 +97,8 @@ enum /** * @brief The fragment shader. - * @details Name "fragmentShader", type Property::STRING. + * @details Name "fragmentShader", type Property::STRING or Property::ARRAY of Property::STRING. + * A Property::ARRAY of Property::STRING values can be used to split the shader string over multiple lines. * @SINCE_1_1.45 * @note Optional * @note If not supplied, the visual's already set fragment shader is used. @@ -134,6 +141,10 @@ enum } // namespace Visual +/** + * @} + */ + } // namespace Toolkit } // namespace Dali