diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-04-25 15:27:11 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2019-04-26 07:14:12 +0200 |
commit | 06f41f15abaacc9f6f7acb8e51d2cfb68705a924 (patch) | |
tree | 210403f4bb9872940f8db4ab656238e9f14e1b98 /src/render/backend/entity_p.h | |
parent | 9b140ccba930f159443a70a81eb1d2585b6070f9 (diff) | |
parent | fed848f7dcff99cf5adb3b7b45190826b3dcf898 (diff) |
Merge remote-tracking branch 5.12 into 5.13
Change-Id: I42affdd02bddb5205b9f2455f0c5e5efbd414dd8
Diffstat (limited to 'src/render/backend/entity_p.h')
-rw-r--r-- | src/render/backend/entity_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index 149ac1143..c170fd42d 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -97,6 +97,10 @@ public: HEntity handle() const { return m_handle; } Entity *parent() const; HEntity parentHandle() const { return m_parentHandle; } + Qt3DCore::QNodeId parentEntityId() const { return m_parentEntityId; } + + void clearEntityHierarchy(); + void rebuildEntityHierarchy(); void appendChildHandle(HEntity childHandle); void removeChildHandle(HEntity childHandle) { m_childrenHandles.removeOne(childHandle); } @@ -181,6 +185,8 @@ private: HEntity m_parentHandle; QVector<HEntity > m_childrenHandles; + Qt3DCore::QNodeId m_parentEntityId; + HMatrix m_worldTransform; QSharedPointer<Sphere> m_localBoundingVolume; QSharedPointer<Sphere> m_worldBoundingVolume; |