Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 22:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'walk-follows-camera' of https://github.com/AndrewMeadows/hifi into AndrewMeadows-walk-follows-camera

Browse source
This commit is contained in:
howard-stearns 2016-06-07 10:36:16 -07:00
commit 8894c731da
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1214,7 +1214,10 @@ void MyAvatar::updateMotors() {
if (_characterController.getState() == CharacterController::State::Hover) { if (_characterController.getState() == CharacterController::State::Hover) {
motorRotation = getHead()->getCameraOrientation(); motorRotation = getHead()->getCameraOrientation();
} else { } else {
motorRotation = getOrientation(); // non-hovering = walking: follow camera twist about vertical but not lift
// so we decompose camera's rotation and store the twist part in motorRotation
glm::quat liftRotation;
swingTwistDecomposition(getHead()->getCameraOrientation(), _worldUpDirection, liftRotation, motorRotation);
} }
const float DEFAULT_MOTOR_TIMESCALE = 0.2f; const float DEFAULT_MOTOR_TIMESCALE = 0.2f;
const float INVALID_MOTOR_TIMESCALE = 1.0e6f; const float INVALID_MOTOR_TIMESCALE = 1.0e6f;