From 1ca1dab410bbb728f50958077e28de3cc37bbff7 Mon Sep 17 00:00:00 2001 From: obligaron Date: Sat, 17 Jul 2021 09:07:06 +0200 Subject: [PATCH] Fix warnings in controller_motion.cpp --- Source/controls/controller_motion.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/controls/controller_motion.cpp b/Source/controls/controller_motion.cpp index f98eda242..d74f58423 100644 --- a/Source/controls/controller_motion.cpp +++ b/Source/controls/controller_motion.cpp @@ -36,19 +36,19 @@ void ScaleJoystickAxes(float *x, float *y, float deadzone) float magnitude = std::sqrt(analogX * analogX + analogY * analogY); if (magnitude >= deadZone) { // find scaled axis values with magnitudes between zero and maximum - float scalingFactor = 1.0 / magnitude * (magnitude - deadZone) / (maximum - deadZone); + float scalingFactor = 1.F / magnitude * (magnitude - deadZone) / (maximum - deadZone); analogX = (analogX * scalingFactor); analogY = (analogY * scalingFactor); // clamp to ensure results will never exceed the max_axis value - float clampingFactor = 1.0; + float clampingFactor = 1.F; float absAnalogX = std::fabs(analogX); float absAnalogY = std::fabs(analogY); if (absAnalogX > 1.0 || absAnalogY > 1.0) { if (absAnalogX > absAnalogY) { - clampingFactor = 1 / absAnalogX; + clampingFactor = 1.F / absAnalogX; } else { - clampingFactor = 1 / absAnalogY; + clampingFactor = 1.F / absAnalogY; } } *x = (clampingFactor * analogX);