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
Merge "Implement Placeholder additional property" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
visuals
/
visual-properties.h
diff --git
a/dali-toolkit/public-api/visuals/visual-properties.h
b/dali-toolkit/public-api/visuals/visual-properties.h
index
c4f5cb2
..
ee24889
100644
(file)
--- 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
/*
#define DALI_TOOLKIT_VISUAL_PROPERTIES_H
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* 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
{
namespace Toolkit
{
+/**
+ * @addtogroup dali_toolkit_visuals
+ * @{
+ */
+
+/**
+ * @brief All the visual types
+ * @SINCE_1_1.45
+ */
namespace Visual
{
namespace Visual
{
@@
-45,9
+54,17
@@
enum Type
WIREFRAME ///< Renders a simple wire-frame outlining a quad. @SINCE_1_2_2
};
WIREFRAME ///< Renders a simple wire-frame outlining a quad. @SINCE_1_2_2
};
+/**
+ * @brief Visual Property
+ * @SINCE_1_1.45
+ */
namespace Property
{
namespace Property
{
+/**
+ * @brief Visual Property
+ * @SINCE_1_1.45
+ */
enum
{
/**
enum
{
/**
@@
-72,17
+89,30
@@
enum
} // namespace Property
} // namespace Property
+/**
+ * @brief Shader for Visuals
+ * @SINCE_1_1.45
+ */
namespace Shader
{
namespace Shader
{
+/**
+ * @brief Shader Property
+ * @SINCE_1_1.45
+ */
namespace Property
{
namespace Property
{
+/**
+ * @brief The type of Shader
+ * @SINCE_1_1.45
+ */
enum
{
/**
* @brief The vertex shader.
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.
* @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.
/**
* @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.
* @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 Visual
+/**
+ * @}
+ */
+
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali