X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fvisuals%2Fvisual-properties.h;h=ee24889e48766ad0ec77ac28e8d417b4667143b9;hb=a7893bad4c7f36c4250dc665a90d60849d179a66;hp=e5f7431b331f2b915f98a2352371aa1059013da0;hpb=c86b1a5547181a10af9a50be8706ae69baaa2cc9;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 e5f7431..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. @@ -32,6 +32,10 @@ namespace Toolkit * @{ */ +/** + * @brief All the visual types + * @SINCE_1_1.45 + */ namespace Visual { @@ -50,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 { /** @@ -77,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. @@ -96,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.