From 32165dff406b20bf474dd5d518971abfdc858de7 Mon Sep 17 00:00:00 2001 From: r3tk0n Date: Tue, 7 Aug 2018 14:31:48 -0700 Subject: [PATCH] Fixed rotations in MyAvatar::goToFeetLocation() --- interface/src/avatar/MyAvatar.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 5a5d99d6f0..0d7b00da78 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -2636,12 +2636,7 @@ void MyAvatar::goToFeetLocation(const glm::vec3& newPosition, glm::vec3 localFeetPos = shapeInfo.getOffset() - glm::vec3(0.0f, halfExtents.y + halfExtents.x, 0.0f); glm::mat4 localFeet = createMatFromQuatAndPos(Quaternions::IDENTITY, localFeetPos); - glm::mat4 worldFeet; - if (hasOrientation) { - worldFeet = createMatFromQuatAndPos(newOrientation, newPosition); - } else { - worldFeet = createMatFromQuatAndPos(Quaternions::IDENTITY, newPosition); - } + glm::mat4 worldFeet = createMatFromQuatAndPos(Quaternions::IDENTITY, newPosition); glm::mat4 avatarMat = worldFeet * glm::inverse(localFeet);