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

CR changes

Browse source
This commit is contained in:
David Back 2018-02-23 15:01:29 -08:00
parent a418129bea
commit da391564a8
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1638,8 +1638,7 @@ void MyAvatar::updateMotors() {
_characterController.computeCollisionGroup() == BULLET_COLLISION_GROUP_COLLISIONLESS) { _characterController.computeCollisionGroup() == BULLET_COLLISION_GROUP_COLLISIONLESS) {
horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE; horizontalMotorTimescale = FLYING_MOTOR_TIMESCALE;
verticalMotorTimescale = FLYING_MOTOR_TIMESCALE; verticalMotorTimescale = FLYING_MOTOR_TIMESCALE;
} } else {
else {
horizontalMotorTimescale = WALKING_MOTOR_TIMESCALE; horizontalMotorTimescale = WALKING_MOTOR_TIMESCALE;
verticalMotorTimescale = INVALID_MOTOR_TIMESCALE; verticalMotorTimescale = INVALID_MOTOR_TIMESCALE;
} }
@ -1671,11 +1670,9 @@ void MyAvatar::updateMotors() {
if (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) { if (_motionBehaviors & AVATAR_MOTION_SCRIPTED_MOTOR_ENABLED) {
if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) { if (_scriptedMotorFrame == SCRIPTED_MOTOR_CAMERA_FRAME) {
motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y); motorRotation = getMyHead()->getHeadOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
} } else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
else if (_scriptedMotorFrame == SCRIPTED_MOTOR_AVATAR_FRAME) {
motorRotation = getWorldOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y); motorRotation = getWorldOrientation() * glm::angleAxis(PI, Vectors::UNIT_Y);
} } else {
else {
// world-frame // world-frame
motorRotation = glm::quat(); motorRotation = glm::quat();
} }