diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index dc29f34bd8..c47cfdb383 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -149,8 +149,8 @@ MyAvatar::MyAvatar(QThread* thread) : }); connect(_skeletonModel.get(), &Model::rigReady, this, &Avatar::rigReady); connect(_skeletonModel.get(), &Model::rigReset, this, &Avatar::rigReset); - connect(&_skeletonModel->getRig(), &Rig::onLoadComplete, this, &MyAvatar::updateCollisionCapsule); - connect(this, &MyAvatar::sensorToWorldScaleChanged, this, &MyAvatar::updateCollisionCapsule); + connect(&_skeletonModel->getRig(), &Rig::onLoadComplete, this, &MyAvatar::updateCollisionCapsuleCache); + connect(this, &MyAvatar::sensorToWorldScaleChanged, this, &MyAvatar::updateCollisionCapsuleCache); using namespace recording; _skeletonModel->flagAsCauterized(); @@ -3309,7 +3309,7 @@ bool MyAvatar::getCollisionsEnabled() { return _characterController.computeCollisionGroup() != BULLET_COLLISION_GROUP_COLLISIONLESS; } -void MyAvatar::updateCollisionCapsule() { +void MyAvatar::updateCollisionCapsuleCache() { glm::vec3 start, end; float radius; getCapsule(start, end, radius); @@ -3317,12 +3317,12 @@ void MyAvatar::updateCollisionCapsule() { capsule["start"] = vec3toVariant(start); capsule["end"] = vec3toVariant(end); capsule["radius"] = QVariant(radius); - _capsuleShape.set(capsule); + _collisionCapsuleCache.set(capsule); } // thread safe QVariantMap MyAvatar::getCollisionCapsule() const { - return _capsuleShape.get(); + return _collisionCapsuleCache.get(); } void MyAvatar::setCharacterControllerEnabled(bool enabled) { diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index ebc1dab704..139f1f6ea2 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -1505,7 +1505,7 @@ signals: private slots: void leaveDomain(); - void updateCollisionCapsule(); + void updateCollisionCapsuleCache(); protected: virtual void beParentOfChild(SpatiallyNestablePointer newChild) const override; diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 8ebaa695fa..b10fdf01cd 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -1444,7 +1444,7 @@ protected: ThreadSafeValueCache _farGrabLeftMatrixCache { glm::mat4() }; ThreadSafeValueCache _farGrabMouseMatrixCache { glm::mat4() }; - ThreadSafeValueCache _capsuleShape { QVariantMap() }; + ThreadSafeValueCache _collisionCapsuleCache{ QVariantMap() }; int getFauxJointIndex(const QString& name) const;