Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:01:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #14724 from sethalves/fix-excessive-cauterization-update

Browse source 
case 15942: fix bug that caused avatar cauterization code to run constantly
This commit is contained in:
John Conklin II 2019-01-17 12:59:57 -08:00 committed by GitHub
commit d64858b1c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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(); static const QUrl& defaultFullAvatarModelUrl();
virtual bool isMyAvatar() const { return false; }
const QUuid getSessionUUID() const { return getID(); } const QUuid getSessionUUID() const { return getID(); }
glm::vec3 getHandPosition() const; glm::vec3 getHandPosition() const;

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

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

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

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