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
Allow duplicated name and use Actor ID as a unique key to define animation.
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
public-api
/
loader
/
node-definition.h
diff --git
a/dali-scene3d/public-api/loader/node-definition.h
b/dali-scene3d/public-api/loader/node-definition.h
index
fde74e2
..
d713ed5
100644
(file)
--- a/
dali-scene3d/public-api/loader/node-definition.h
+++ b/
dali-scene3d/public-api/loader/node-definition.h
@@
-218,7
+218,7
@@
public: // METHODS
* @brief Creates a DALi Actor from this definition only.
* @note Not recursive.
*/
* @brief Creates a DALi Actor from this definition only.
* @note Not recursive.
*/
- Actor CreateActor(CreateParams& params)
const
;
+ Actor CreateActor(CreateParams& params);
/**
* @brief Gets local space matrix of this node
/**
* @brief Gets local space matrix of this node
@@
-253,6
+253,7
@@
public: // DATA
static const std::string ORIGINAL_MATRIX_PROPERTY_NAME;
std::string mName;
static const std::string ORIGINAL_MATRIX_PROPERTY_NAME;
std::string mName;
+ uint32_t mNodeId = INVALID_INDEX;
Vector3 mPosition = Vector3::ZERO;
Quaternion mOrientation = Quaternion::IDENTITY;
Vector3 mPosition = Vector3::ZERO;
Quaternion mOrientation = Quaternion::IDENTITY;