From 4c99848f292d97f364dbe0afb7c42ae3cd6d3a5b Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Tue, 20 Sep 2016 17:05:01 -0700 Subject: [PATCH] disable vertical re-centering behavior --- interface/src/avatar/MyAvatar.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 659223b893..99e84d5348 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -2236,6 +2236,9 @@ void MyAvatar::FollowHelper::updateHorizontalActivation(const MyAvatar& myAvatar } void MyAvatar::FollowHelper::updateVerticalActivation(const MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) { + + // OUTOFBODY_HACK: disable vertical follow behavior + /* const float CYLINDER_TOP = 0.1f; const float CYLINDER_BOTTOM = -1.5f; const float MIN_VERTICAL_OFFSET = 0.02f; @@ -2248,6 +2251,7 @@ void MyAvatar::FollowHelper::updateVerticalActivation(const MyAvatar& myAvatar, } else if (offset.y > CYLINDER_TOP || offset.y < CYLINDER_BOTTOM) { activate(Vertical); } + */ } void MyAvatar::FollowHelper::prePhysicsUpdate(MyAvatar& myAvatar, const glm::mat4& desiredBodyMatrix, const glm::mat4& currentBodyMatrix) {