X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fmodel3d-view%2Fmodel3d-view.h;h=160ca9646e1aa590e1b25e657c9f15f41e7f6d7e;hb=969855f52a7c30ea6309d41b416100b47161bc66;hp=536df51f7260fc81aa97cd0e5d23cb5949edcd17;hpb=502a6996c58f8b8de2dd530235852d53d01d2ac0;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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..160ca96 100644 --- 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 { + /** + * @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 @@ -83,7 +87,6 @@ public: DIFFUSE_WITH_NORMAL_MAP }; - /** * @brief Create a new instance of a Model3dView control. * @@ -96,6 +99,9 @@ public: * @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 ); @@ -121,12 +127,15 @@ public: /** * @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 + * @param[in] model3dView Handle to an object + * @return reference to this */ Model3dView& operator=( const Model3dView& model3dView ); @@ -144,6 +153,7 @@ public: public: // Not intended for application developers + /// @cond internal /** * @brief Creates a handle using the Toolkit::Internal implementation. * @@ -159,6 +169,7 @@ public: // Not intended for application developers * @param[in] internal A pointer to the internal CustomActor. */ DALI_INTERNAL Model3dView( Dali::Internal::CustomActor* internal ); + /// @endcond };