From e3a77ef139135d70e7de4e20b24925a4d7709695 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Thu, 26 Dec 2013 20:20:57 -0800 Subject: [PATCH] tuning --- interface/src/avatar/MyAvatar.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 42337f304e..0efa8b09cf 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -267,11 +267,12 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) { } _velocity += _hand.getAndResetGrabDeltaVelocity(); glm::quat deltaRotation = _hand.getAndResetGrabRotation(); - glm::vec3 euler = safeEulerAngles(deltaRotation); + const float GRAB_CONTROLLER_TURN_SCALING = 0.5f; + glm::vec3 euler = safeEulerAngles(deltaRotation) * GRAB_CONTROLLER_TURN_SCALING; // Adjust body yaw by yaw from controller - setOrientation(glm::angleAxis(euler.y, glm::vec3(0, 1, 0)) * getOrientation()); + setOrientation(glm::angleAxis(-euler.y, glm::vec3(0, 1, 0)) * getOrientation()); // Adjust head pitch from controller - getHead().setMousePitch(getHead().getMousePitch() + euler.x); + getHead().setMousePitch(getHead().getMousePitch() - euler.x); _position += _velocity * deltaTime;