Merge pull request #7174 from hyperlogic/tony/avatar-leaning-fix

MyAvatar: bug fix for avatar leaning
This commit is contained in:
Andrew Meadows 2016-02-23 15:46:20 -08:00
commit 2f02e7ff20

View file

@ -1873,7 +1873,7 @@ bool MyAvatar::FollowHelper::shouldActivate(const MyAvatar& myAvatar, const glm:
const float CYLINDER_RADIUS = 0.15f;
glm::vec3 offset = extractTranslation(desiredBodyMatrix) - extractTranslation(currentBodyMatrix);
glm::vec3 radialOffset(offset.x, 0.0f, offset.y);
glm::vec3 radialOffset(offset.x, 0.0f, offset.z);
float radialDistance = glm::length(radialOffset);
return (offset.y > CYLINDER_TOP) || (offset.y < CYLINDER_BOTTOM) || (radialDistance > CYLINDER_RADIUS);