From 55e0082792605ee4713d7bc14ce96d77617466d7 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 15 Jun 2017 09:10:08 +1200 Subject: [PATCH] Code review --- interface/src/avatar/MyAvatar.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index bd217a98a2..b2c469f614 100755 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1971,19 +1971,19 @@ void MyAvatar::updateOrientation(float deltaTime) { float speedFactor; if (getDriveKey(TRANSLATE_Z) != 0.0f || _lastDrivenSpeed == 0.0f) { _lastDrivenSpeed = speed; - speedFactor = 1.0; + speedFactor = 1.0f; } else { speedFactor = glm::min(speed / _lastDrivenSpeed, 1.0f); } float direction = glm::dot(getVelocity(), getRotation() * Vectors::UNIT_NEG_Z) > 0.0f ? 1.0f : -1.0f; - float rollAngle = glm::degrees(asin(glm::dot(IDENTITY_UP, _hmdSensorOrientation * IDENTITY_RIGHT))); + float rollAngle = glm::degrees(asinf(glm::dot(IDENTITY_UP, _hmdSensorOrientation * IDENTITY_RIGHT))); float rollSign = rollAngle < 0.0f ? -1.0f : 1.0f; rollAngle = fabsf(rollAngle); + rollAngle = rollAngle > _hmdRollControlDeadZone ? rollSign * (rollAngle - _hmdRollControlDeadZone) : 0.0f; - float yawChange = rollAngle > _hmdRollControlDeadZone ? rollSign * (rollAngle - _hmdRollControlDeadZone) : 0.0f; - totalBodyYaw += speedFactor * direction * yawChange * deltaTime * _hmdRollControlSpeed; + totalBodyYaw += speedFactor * direction * rollAngle * deltaTime * _hmdRollControlSpeed; } }