From bc5f563f5786c635b65aa005043c04f16c9fe818 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Sun, 12 Feb 2017 11:37:29 -0800 Subject: [PATCH] make _parentID and _parentJointIndex private to avoid accidental direct access --- interface/src/ui/overlays/Line3DOverlay.cpp | 8 ++++---- libraries/avatars/src/AvatarData.cpp | 2 +- libraries/entities/src/EntityItem.cpp | 2 +- libraries/shared/src/SpatiallyNestable.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/src/ui/overlays/Line3DOverlay.cpp b/interface/src/ui/overlays/Line3DOverlay.cpp index 97e7d825f2..23668bcc25 100644 --- a/interface/src/ui/overlays/Line3DOverlay.cpp +++ b/interface/src/ui/overlays/Line3DOverlay.cpp @@ -38,7 +38,7 @@ Line3DOverlay::~Line3DOverlay() { glm::vec3 Line3DOverlay::getStart() const { bool success; - glm::vec3 worldStart = localToWorld(_start, _parentID, _parentJointIndex, success); + glm::vec3 worldStart = localToWorld(_start, getParentID(), getParentJointIndex(), success); if (!success) { qDebug() << "Line3DOverlay::getStart failed"; } @@ -47,7 +47,7 @@ glm::vec3 Line3DOverlay::getStart() const { glm::vec3 Line3DOverlay::getEnd() const { bool success; - glm::vec3 worldEnd = localToWorld(_end, _parentID, _parentJointIndex, success); + glm::vec3 worldEnd = localToWorld(_end, getParentID(), getParentJointIndex(), success); if (!success) { qDebug() << "Line3DOverlay::getEnd failed"; } @@ -56,7 +56,7 @@ glm::vec3 Line3DOverlay::getEnd() const { void Line3DOverlay::setStart(const glm::vec3& start) { bool success; - _start = worldToLocal(start, _parentID, _parentJointIndex, success); + _start = worldToLocal(start, getParentID(), getParentJointIndex(), success); if (!success) { qDebug() << "Line3DOverlay::setStart failed"; } @@ -64,7 +64,7 @@ void Line3DOverlay::setStart(const glm::vec3& start) { void Line3DOverlay::setEnd(const glm::vec3& end) { bool success; - _end = worldToLocal(end, _parentID, _parentJointIndex, success); + _end = worldToLocal(end, getParentID(), getParentJointIndex(), success); if (!success) { qDebug() << "Line3DOverlay::setEnd failed"; } diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 6440432675..29cbd155fe 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -410,7 +410,7 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent auto parentInfo = reinterpret_cast(destinationBuffer); QByteArray referentialAsBytes = parentID.toRfc4122(); memcpy(parentInfo->parentUUID, referentialAsBytes.data(), referentialAsBytes.size()); - parentInfo->parentJointIndex = _parentJointIndex; + parentInfo->parentJointIndex = getParentJointIndex(); destinationBuffer += sizeof(AvatarDataPacket::ParentInfo); int numBytes = destinationBuffer - startSection; diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 6543af5355..3ef1648fae 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1595,7 +1595,7 @@ void EntityItem::updatePosition(const glm::vec3& value) { } void EntityItem::updateParentID(const QUuid& value) { - if (_parentID != value) { + if (getParentID() != value) { setParentID(value); _dirtyFlags |= Simulation::DIRTY_MOTION_TYPE; // children are forced to be kinematic _dirtyFlags |= Simulation::DIRTY_COLLISION_GROUP; // may need to not collide with own avatar diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h index cd59fb30a0..be285eff53 100644 --- a/libraries/shared/src/SpatiallyNestable.h +++ b/libraries/shared/src/SpatiallyNestable.h @@ -186,9 +186,6 @@ public: protected: const NestableType _nestableType; // EntityItem or an AvatarData QUuid _id; - QUuid _parentID; // what is this thing's transform relative to? - quint16 _parentJointIndex { INVALID_JOINT_INDEX }; // which joint of the parent is this relative to? - mutable SpatiallyNestableWeakPointer _parent; virtual void beParentOfChild(SpatiallyNestablePointer newChild) const; @@ -211,6 +208,9 @@ protected: quint64 _rotationChanged { 0 }; private: + QUuid _parentID; // what is this thing's transform relative to? + quint16 _parentJointIndex { INVALID_JOINT_INDEX }; // which joint of the parent is this relative to? + mutable ReadWriteLockable _transformLock; mutable ReadWriteLockable _idLock; mutable ReadWriteLockable _velocityLock;