X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fmodel3d-view%2Fmodel3d-view.h;h=dfa6830548e49acfad431950eb118533ac8f4184;hp=ac7c1b009a9ed8e81543e9b878a1e901b6a9a727;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=c1481543c3334342110f9a4635292d0eff1d15b7 diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h old mode 100644 new mode 100755 index ac7c1b0..dfa6830 --- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h +++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_MODEL3D_VIEW_H__ -#define __DALI_TOOLKIT_MODEL3D_VIEW_H__ +#ifndef DALI_TOOLKIT_MODEL3D_VIEW_H +#define DALI_TOOLKIT_MODEL3D_VIEW_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -31,6 +31,12 @@ namespace Internal DALI_INTERNAL { class Model3dView; } + +/** + * @addtogroup dali_toolkit_controls_model3d_view + * @{ + */ + /** * @brief Model3dView is a control for displaying 3d geometry. * @@ -39,7 +45,7 @@ class Model3dView; * * @SINCE_1_1.4 */ -class DALI_IMPORT_API Model3dView : public Control +class DALI_TOOLKIT_API Model3dView : public Control { public: @@ -80,11 +86,15 @@ public: }; }; + /** + * @brief Enumeration for the type of illumination. + * @SINCE_1_1.4 + */ enum IlluminationType { - DIFFUSE, - DIFFUSE_WITH_TEXTURE, - DIFFUSE_WITH_NORMAL_MAP + DIFFUSE, ///< diffuse @SINCE_1_1.4 + DIFFUSE_WITH_TEXTURE, ///< diffuse with texture @SINCE_1_1.4 + DIFFUSE_WITH_NORMAL_MAP ///< diffuse with normal map @SINCE_1_1.4 }; /** @@ -173,8 +183,11 @@ public: // Not intended for application developers }; +/** + * @} + */ } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_MODEL3D_VIEW_H__ +#endif // DALI_TOOLKIT_MODEL3D_VIEW_H