projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.2.60] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
visuals
/
primitive-visual-properties.h
diff --git
a/dali-toolkit/public-api/visuals/primitive-visual-properties.h
b/dali-toolkit/public-api/visuals/primitive-visual-properties.h
index
a5aac2d
..
12f56e5
100644
(file)
--- a/
dali-toolkit/public-api/visuals/primitive-visual-properties.h
+++ b/
dali-toolkit/public-api/visuals/primitive-visual-properties.h
@@
-19,7
+19,7
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/
visuals/visual-properti
es.h>
+#include <dali-toolkit/public-api/
toolkit-property-index-rang
es.h>
namespace Dali
{
namespace Dali
{
@@
-27,12
+27,29
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
+/**
+ * @addtogroup dali_toolkit_visuals
+ * @{
+ */
+
+/**
+ * @brief PrimitiveVisual is to render a simple 3D shape, such as a cube or sphere.
+ * @SINCE_1_1.45
+ */
namespace PrimitiveVisual
{
namespace PrimitiveVisual
{
+/**
+ * @brief PrimitiveVisual Property
+ * @SINCE_1_1.45
+ */
namespace Property
{
namespace Property
{
+/**
+ * @brief PrimitiveVisual Property
+ * @SINCE_1_1.45
+ */
enum
{
/**
enum
{
/**
@@
-46,12
+63,12
@@
enum
/**
* @brief The color of the shape.
/**
* @brief The color of the shape.
- * @details Name "
shape
Color", type Property::VECTOR4.
- * @SINCE_1_
1.45
+ * @details Name "
mix
Color", type Property::VECTOR4.
+ * @SINCE_1_
2_4
* @note Optional. If not specified, the default is Vector4(0.5, 0.5, 0.5, 1.0).
* @note Applies to ALL shapes.
*/
* @note Optional. If not specified, the default is Vector4(0.5, 0.5, 0.5, 1.0).
* @note Applies to ALL shapes.
*/
- COLOR,
+
MIX_
COLOR,
/**
* @brief The number of slices as you go around the shape.
/**
* @brief The number of slices as you go around the shape.
@@
-177,11
+194,16
@@
enum
} // namespace Property
} // namespace Property
+/**
+ * @brief The primitive shape to render as a PrimitiveVisual.
+ * @SINCE_1_1.45
+ */
namespace Shape
{
/**
namespace Shape
{
/**
- * @brief The primitive shape to render.
+ * @brief The primitive shape to render as a PrimitiveVisual.
+ * @SINCE_1_1.45
*/
enum Type
{
*/
enum Type
{
@@
-197,6
+219,10
@@
enum Type
} // namespace PrimitiveVisual
} // namespace PrimitiveVisual
+/**
+ * @}
+ */
+
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali