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

Merge pull request #16513 from DouglasWilcox/Fix_seated_rotation_edge_case_bounce

Browse source 
Edge case fix for seated rotation - it would bounce forward if you let go of Q/E at exact right time.
This commit is contained in:
Shannon Romano 2019-11-20 09:27:36 -08:00 committed by GitHub
commit 37a46d91fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3620,15 +3620,18 @@ void MyAvatar::updateOrientation(float deltaTime) {
ajustedYawVector = (leftRightDot < 0.0f ? -avatarVectorRight : avatarVectorRight); ajustedYawVector = (leftRightDot < 0.0f ? -avatarVectorRight : avatarVectorRight);
} }
if (frontBackDot < limitAngle) { if (frontBackDot < limitAngle) {
if (!isRotatingWhileSeated) { if (!isRotatingWhileSeated) {
if (frontBackDot < triggerAngle) { if (frontBackDot < triggerAngle && _seatedBodyYawDelta == 0.0f) {
_shouldTurnToFaceCamera = true; _shouldTurnToFaceCamera = true;
_firstPersonSteadyHeadTimer = 0.0f; _firstPersonSteadyHeadTimer = 0.0f;
}
} else { } else {
setWorldOrientation(previousOrientation); setWorldOrientation(previousOrientation);
_seatedBodyYawDelta = 0.0f; _seatedBodyYawDelta = 0.0f;
} }
} else {
setWorldOrientation(previousOrientation);
}
} else if (frontBackDot > glm::sin(glm::radians(reorientAngle))) { } else if (frontBackDot > glm::sin(glm::radians(reorientAngle))) {
_shouldTurnToFaceCamera = false; _shouldTurnToFaceCamera = false;
} }