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
TextVisual implementation.
[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
536df51
..
3aa186d
100644
(file)
--- a/
dali-toolkit/public-api/controls/model3d-view/model3d-view.h
+++ b/
dali-toolkit/public-api/controls/model3d-view/model3d-view.h
@@
-83,7
+83,6
@@
public:
DIFFUSE_WITH_NORMAL_MAP
};
DIFFUSE_WITH_NORMAL_MAP
};
-
/**
* @brief Create a new instance of a Model3dView control.
*
/**
* @brief Create a new instance of a Model3dView control.
*
@@
-96,6
+95,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 );
@@
-121,12
+123,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 );
@@
-144,6
+149,7
@@
public:
public: // Not intended for application developers
public: // Not intended for application developers
+ /// @cond internal
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
*
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
*
@@
-159,6
+165,7
@@
public: // Not intended for application developers
* @param[in] internal A pointer to the internal CustomActor.
*/
DALI_INTERNAL Model3dView( Dali::Internal::CustomActor* internal );
* @param[in] internal A pointer to the internal CustomActor.
*/
DALI_INTERNAL Model3dView( Dali::Internal::CustomActor* internal );
+ /// @endcond
};
};