Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:09:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tuning

Browse source
This commit is contained in:
Philip Rosedale 2013-12-26 20:20:57 -08:00
parent 74380260b3
commit e3a77ef139
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/avatar/MyAvatar.cpp
View file

@ -267,11 +267,12 @@ void MyAvatar::simulate(float deltaTime, Transmitter* transmitter) {
} }
_velocity += _hand.getAndResetGrabDeltaVelocity(); _velocity += _hand.getAndResetGrabDeltaVelocity();
glm::quat deltaRotation = _hand.getAndResetGrabRotation(); 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 // 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 // Adjust head pitch from controller
getHead().setMousePitch(getHead().getMousePitch() + euler.x); getHead().setMousePitch(getHead().getMousePitch() - euler.x);
_position += _velocity * deltaTime; _position += _velocity * deltaTime;