X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fvisuals%2Fprimitive-visual-properties.h;h=9c62d79006dec117c449e152acccba911bcdcf9b;hb=02557f62f8d171115d885c87c138faec2a3cb923;hp=ccd4a8ba5c8d9142565c4fb537f5eaca9e648783;hpb=3afd5e4f64ae0a8ee21ce025f6665fec6584ae5b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/visuals/primitive-visual-properties.h b/dali-toolkit/public-api/visuals/primitive-visual-properties.h index ccd4a8b..9c62d79 100644 --- a/dali-toolkit/public-api/visuals/primitive-visual-properties.h +++ b/dali-toolkit/public-api/visuals/primitive-visual-properties.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_PRIMITIVE_VISUAL_PROPERTIES_H /* - * Copyright (c) 2016 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. @@ -23,10 +23,8 @@ namespace Dali { - namespace Toolkit { - /** * @addtogroup dali_toolkit_visuals * @{ @@ -38,14 +36,12 @@ namespace Toolkit */ namespace PrimitiveVisual { - /** * @brief PrimitiveVisual Property. * @SINCE_1_1.45 */ namespace Property { - /** * @brief Enumeration for the instance of properties belonging to the PrimitiveVisual. * @SINCE_1_1.45 @@ -78,7 +74,7 @@ enum * @note Optional. If not specified, the default is 128. * @note Applies to: * - Shape::SPHERE - * - Shape::CONICAL_FRUSTRUM + * - Shape::CONICAL_FRUSTUM * - Shape::CONE * - Shape::CYLINDER * @note The range is from 1 to 255. @@ -103,7 +99,7 @@ enum * @SINCE_1_1.45 * @note Optional. If not specified, the default is 1.0f. * @note Applies to: - * - Shape::CONICAL_FRUSTRUM + * - Shape::CONICAL_FRUSTUM * @note Only values greater than or equal to 0.0f are accepted. */ SCALE_TOP_RADIUS, @@ -114,7 +110,7 @@ enum * @SINCE_1_1.45 * @note Optional. If not specified, the default is 1.5f. * @note Applies to: - * - Shape::CONICAL_FRUSTRUM + * - Shape::CONICAL_FRUSTUM * - Shape::CONE * @note Only values greater than or equal to 0.0f are accepted. */ @@ -126,7 +122,7 @@ enum * @SINCE_1_1.45 * @note Optional. If not specified, the default is 3.0f. * @note Applies to: - * - Shape::CONICAL_FRUSTRUM + * - Shape::CONICAL_FRUSTUM * - Shape::CONE * - Shape::CYLINDER * @note Only values greater than or equal to 0.0f are accepted. @@ -200,22 +196,21 @@ enum */ namespace Shape { - /** * @brief The primitive shape to render as a PrimitiveVisual. * @SINCE_1_1.45 */ enum Type { - SPHERE, ///< A perfectly round geometrical object in three-dimensional space. @SINCE_1_1.45 - CONICAL_FRUSTRUM, ///< The area bound between two circles, i.e. a cone with the tip removed. @SINCE_1_1.45 - CONE, ///< Equivalent to a conical frustum with top radius of zero. @SINCE_1_1.45 - CYLINDER, ///< Equivalent to a conical frustum with equal radii for the top and bottom circles. @SINCE_1_1.45 - CUBE, ///< Equivalent to a bevelled cube with a bevel percentage of zero. @SINCE_1_1.45 - OCTAHEDRON, ///< Equivalent to a bevelled cube with a bevel percentage of one. @SINCE_1_1.45 - BEVELLED_CUBE, ///< A cube/cuboid with all edges flattened to some degree. @SINCE_1_1.45 + SPHERE, ///< A perfectly round geometrical object in three-dimensional space. @SINCE_1_1.45 + CONICAL_FRUSTUM, ///< The area bound between two circles, i.e. a cone with the tip removed. @SINCE_1_3.15 + CONE, ///< Equivalent to a conical frustum with top radius of zero. @SINCE_1_1.45 + CYLINDER, ///< Equivalent to a conical frustum with equal radii for the top and bottom circles. @SINCE_1_1.45 + CUBE, ///< Equivalent to a bevelled cube with a bevel percentage of zero. @SINCE_1_1.45 + OCTAHEDRON, ///< Equivalent to a bevelled cube with a bevel percentage of one. @SINCE_1_1.45 + BEVELLED_CUBE ///< A cube/cuboid with all edges flattened to some degree. @SINCE_1_1.45 }; -} +} // namespace Shape } // namespace PrimitiveVisual