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 "Add deprecated tag and missed doxygen" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
model3d-view
/
model3d-view.h
diff --git
a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
index
97932f9
..
160ca96
100644
(file)
--- a/
dali-toolkit/public-api/controls/model3d-view/model3d-view.h
+++ b/
dali-toolkit/public-api/controls/model3d-view/model3d-view.h
@@
-62,6
+62,10
@@
public:
*/
struct Property
{
*/
struct Property
{
+ /**
+ * @brief An enumeration of properties belonging to the TextLabel class.
+ * @SINCE_1_1.4
+ */
enum
{
GEOMETRY_URL = PROPERTY_START_INDEX, ///< name "geometryUrl", The path to the geometry file, type STRING @SINCE_1_1.4
enum
{
GEOMETRY_URL = PROPERTY_START_INDEX, ///< name "geometryUrl", The path to the geometry file, type STRING @SINCE_1_1.4
@@
-95,6
+99,9
@@
public:
* @brief Create a new instance of a Model3dView control.
*
* @SINCE_1_1.4
* @brief Create a new instance of a Model3dView control.
*
* @SINCE_1_1.4
+ * @param[in] objUrl The path to the geometry file
+ * @param[in] mtlUrl The path to the material file
+ * @param[in] imagesUrl The path to the images directory
* @return A handle to the new Model3dView control.
*/
static Model3dView New( const std::string& objUrl, const std::string& mtlUrl, const std::string& imagesUrl );
* @return A handle to the new Model3dView control.
*/
static Model3dView New( const std::string& objUrl, const std::string& mtlUrl, const std::string& imagesUrl );
@@
-120,12
+127,15
@@
public:
/**
* @brief Copy constructor.
* @SINCE_1_1.4
/**
* @brief Copy constructor.
* @SINCE_1_1.4
+ * @param[in] model3dView Handle to an object
*/
Model3dView( const Model3dView& model3dView );
/**
* @brief Assignment operator.
* @SINCE_1_1.4
*/
Model3dView( const Model3dView& model3dView );
/**
* @brief Assignment operator.
* @SINCE_1_1.4
+ * @param[in] model3dView Handle to an object
+ * @return reference to this
*/
Model3dView& operator=( const Model3dView& model3dView );
*/
Model3dView& operator=( const Model3dView& model3dView );