From ec4ad021922b3d71b3cc2daa991601645dca6f38 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Thu, 4 Apr 2019 13:26:34 -0700 Subject: [PATCH] more code feedback --- interface/src/avatar/MyAvatar.cpp | 17 +++-------------- interface/src/avatar/MyAvatar.h | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index fd855c172d..49064435c8 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -3377,14 +3377,6 @@ glm::vec3 MyAvatar::scaleMotorSpeed(const glm::vec3 forward, const glm::vec3 rig return Vectors::ZERO; } case LocomotionControlsMode::CONTROLS_ANALOG: - if (zSpeed || xSpeed) { - glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; - glm::vec3 scaledRight = getSensorToWorldScale() * calculateGearedSpeed(xSpeed) * _walkSpeedScalar * ((xSpeed > stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * right; - direction = scaledForward + scaledRight; - return direction; - } else { - return Vectors::ZERO; - } case LocomotionControlsMode::CONTROLS_ANALOG_PLUS: if (zSpeed || xSpeed) { glm::vec3 scaledForward = getSensorToWorldScale() * calculateGearedSpeed(zSpeed) * _walkSpeedScalar * ((zSpeed >= stickFullOn) ? getSprintSpeed() : getWalkSpeed()) * forward; @@ -3429,12 +3421,9 @@ glm::vec3 MyAvatar::calculateScaledDirection(){ case LocomotionRelativeMovementMode::MOVEMENT_HAND_RELATIVE_LEVELED: forward = (handRotation * controllerForward); if (glm::length(forward) > EPSILON) { - auto transform = forward - (glm::dot(forward, Vectors::UNIT_Y) * Vectors::UNIT_Y); - if (glm::length(transform) > 0.0f) { - forward = glm::normalize(transform); - } else { - forward = Vectors::ZERO; - } + auto transform = forward - (glm::dot(forward, Vectors::UNIT_Y) * Vectors::UNIT_Y); + if (glm::length(transform) > EPSILON) { + forward = glm::normalize(transform); } else { forward = Vectors::ZERO; } diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index 004c34032a..804e2687e7 100755 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -49,7 +49,7 @@ enum LocomotionRelativeMovementMode { MOVEMENT_HMD_RELATIVE = 0, MOVEMENT_HAND_RELATIVE, MOVEMENT_HAND_RELATIVE_LEVELED -} +}; enum eyeContactTarget { LEFT_EYE,