Change macro to const float, use floats in control flow.

This commit is contained in:
dooglifeSF 2019-10-09 10:10:45 -07:00
parent 8a262a3d1a
commit 2a1258968a

View file

@ -2161,7 +2161,7 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
} }
//deadzone constant //deadzone constant
#define INPUT_DEADZONE_THRESHOLD 0.05f const float INPUT_DEADZONE_THRESHOLD = 0.05f;
if (abs(params.inputX) <= INPUT_DEADZONE_THRESHOLD && abs(params.inputZ) <= INPUT_DEADZONE_THRESHOLD) { if (abs(params.inputX) <= INPUT_DEADZONE_THRESHOLD && abs(params.inputZ) <= INPUT_DEADZONE_THRESHOLD) {
// no WASD input // no WASD input
@ -2171,7 +2171,7 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
_animVars.set("isInputLeft", false); _animVars.set("isInputLeft", false);
_animVars.set("isNotInput", true); _animVars.set("isNotInput", true);
} else if ( abs(params.inputZ) >= abs(params.inputX) ) { } else if ( abs(params.inputZ) >= abs(params.inputX) ) {
if (params.inputZ > 0) { if (params.inputZ > 0.0f) {
// forward // forward
_animVars.set("isInputForward", true); _animVars.set("isInputForward", true);
_animVars.set("isInputBackward", false); _animVars.set("isInputBackward", false);
@ -2187,7 +2187,7 @@ void Rig::updateFromControllerParameters(const ControllerParameters& params, flo
_animVars.set("isNotInput", false); _animVars.set("isNotInput", false);
} }
} else { } else {
if (params.inputX > 0) { if (params.inputX > 0.0f) {
// right // right
_animVars.set("isInputForward", false); _animVars.set("isInputForward", false);
_animVars.set("isInputBackward", false); _animVars.set("isInputBackward", false);