X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fvisuals%2Fvisual-properties.h;h=ee24889e48766ad0ec77ac28e8d417b4667143b9;hb=b5967a328022a3d60e341feea6dfd27e42530690;hp=c4f5cb2bdaa376a20235a8a0ed3d104edb845bfe;hpb=a68dbe03813fd3db34c81f4e6960572e8882930b;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..ee24889 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,15 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_visuals + * @{ + */ + +/** + * @brief All the visual types + * @SINCE_1_1.45 + */ namespace Visual { @@ -45,9 +54,17 @@ enum Type WIREFRAME ///< Renders a simple wire-frame outlining a quad. @SINCE_1_2_2 }; +/** + * @brief Visual Property + * @SINCE_1_1.45 + */ namespace Property { +/** + * @brief Visual Property + * @SINCE_1_1.45 + */ enum { /** @@ -72,17 +89,30 @@ enum } // namespace Property +/** + * @brief Shader for Visuals + * @SINCE_1_1.45 + */ namespace Shader { +/** + * @brief Shader Property + * @SINCE_1_1.45 + */ namespace Property { +/** + * @brief The type of Shader + * @SINCE_1_1.45 + */ 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 +121,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 +165,10 @@ enum } // namespace Visual +/** + * @} + */ + } // namespace Toolkit } // namespace Dali