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
Purge underscored header file barriers
[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
old mode 100644
(file)
new mode 100755
(executable)
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) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-31,6
+31,12
@@
namespace Internal DALI_INTERNAL
{
class Model3dView;
}
{
class Model3dView;
}
+
+/**
+ * @addtogroup dali_toolkit_controls_model3d_view
+ * @{
+ */
+
/**
* @brief Model3dView is a control for displaying 3d geometry.
*
/**
* @brief Model3dView is a control for displaying 3d geometry.
*
@@
-39,7
+45,7
@@
class Model3dView;
*
* @SINCE_1_1.4
*/
*
* @SINCE_1_1.4
*/
-class DALI_
IMPOR
T_API Model3dView : public Control
+class DALI_
TOOLKI
T_API Model3dView : public Control
{
public:
{
public:
@@
-80,11
+86,15
@@
public:
};
};
};
};
+ /**
+ * @brief Enumeration for the type of illumination.
+ * @SINCE_1_1.4
+ */
enum IlluminationType
{
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
} // namespace Toolkit
} // namespace Dali
-#endif //
__DALI_TOOLKIT_MODEL3D_VIEW_H__
+#endif //
DALI_TOOLKIT_MODEL3D_VIEW_H