Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-10 17:23:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug that caused tablet to be constantly hooked and unhooked from avatar at SpatiallyNestable level

Browse source
This commit is contained in:
Seth Alves 2019-01-16 13:23:27 -08:00
parent fd09180776
commit 1104e56bc3
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/avatars/src/AvatarData.h
View file

@ -465,8 +465,6 @@ public:
static const QUrl& defaultFullAvatarModelUrl();
virtual bool isMyAvatar() const { return false; }
const QUuid getSessionUUID() const { return getID(); }
glm::vec3 getHandPosition() const;

3
libraries/shared/src/SpatiallyNestable.cpp
View file

@ -108,7 +108,8 @@ SpatiallyNestablePointer SpatiallyNestable::getParentPointer(bool& success) cons
return nullptr;
}
if (parent && parent->getID() == parentID) {
if (parent && (parent->getID() == parentID ||
(parentID == AVATAR_SELF_ID && parent->isMyAvatar()))) {
// parent pointer is up-to-date
if (!_parentKnowsMe) {
SpatialParentTree* parentTree = parent->getParentTree();

2
libraries/shared/src/SpatiallyNestable.h
View file

@ -47,6 +47,8 @@ public:
virtual const QUuid getParentID() const;
virtual void setParentID(const QUuid& parentID);
virtual bool isMyAvatar() const { return false; }
virtual quint16 getParentJointIndex() const { return _parentJointIndex; }
virtual void setParentJointIndex(quint16 parentJointIndex);