Browse Source

Fix warnings in controller_motion.cpp

pull/2411/head
obligaron 5 years ago committed by Anders Jenbo
parent
commit
1ca1dab410
  1. 8
      Source/controls/controller_motion.cpp

8
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);

Loading…
Cancel
Save