device: move deadzone computation to InputManager

src/device/input_device.cpp

@@ -75,35 +75,7 @@ Vector3 InputDevice::axis(u8 id) const
 	if (id >= _num_axes)
 		return VECTOR3_ZERO;
 
-	Vector3 axis = _axis[id];
-	switch (_deadzone_mode[id]) {
-	case DeadzoneMode::RAW:
-		// No deadzone
-		break;
-
-	case DeadzoneMode::INDEPENDENT:
-		axis.x = fabs(axis.x) < _deadzone_size[id] ? 0.0f : axis.x;
-		axis.y = fabs(axis.y) < _deadzone_size[id] ? 0.0f : axis.y;
-		axis.z = fabs(axis.z) < _deadzone_size[id] ? 0.0f : axis.z;
-		break;
-
-	case DeadzoneMode::CIRCULAR:
-		if (length(axis) < _deadzone_size[id]) {
-			axis = VECTOR3_ZERO;
-		} else {
-			const f32 size = 1.0f - _deadzone_size[id];
-			const f32 size_inv = 1.0f / size;
-			const f32 axis_len = length(axis);
-			axis = normalize(axis) * (axis_len - _deadzone_size[id]) * size_inv;
-		}
-		break;
-
-	default:
-		CE_FATAL("Unknown deadzone mode");
-		break;
-	}
-
-	return axis;
+	return _axis[id];
 }
 
 const char *InputDevice::button_name(u8 id) const

src/device/input_manager.cpp

@@ -4,6 +4,7 @@
  */
 
 #include "core/error/error.inl"
+#include "core/math/constants.h"
 #include "core/math/vector3.inl"
 #include "device/input_device.h"
 #include "device/input_manager.h"
@@ -276,6 +277,43 @@ InputDevice *InputManager::joypad(u8 i)
 	return _joypad[i];
 }
 
+/// Applies the deadzone settings for the axis @a id to @a axis and returns its value.
+static Vector3 deadzone(const InputDevice *dev, u8 id, const Vector3& axis)
+{
+	Vector3 out;
+
+	switch (dev->_deadzone_mode[id]) {
+	case DeadzoneMode::RAW:
+		out = axis;
+		break;
+
+	case DeadzoneMode::INDEPENDENT:
+		out.x = fabs(axis.x) < dev->_deadzone_size[id] ? 0.0f : axis.x;
+		out.y = fabs(axis.y) < dev->_deadzone_size[id] ? 0.0f : axis.y;
+		out.z = fabs(axis.z) < dev->_deadzone_size[id] ? 0.0f : axis.z;
+		break;
+
+	case DeadzoneMode::CIRCULAR:
+		if (length(axis) < dev->_deadzone_size[id]) {
+			out = VECTOR3_ZERO;
+		} else {
+			const f32 size = 1.0f - dev->_deadzone_size[id];
+			const f32 size_inv = 1.0f / size;
+			const f32 axis_len = length(axis);
+			out = axis;
+			out = normalize(out) * (axis_len - dev->_deadzone_size[id]) * size_inv;
+		}
+		break;
+
+	default:
+		CE_FATAL("Unknown deadzone mode");
+		out = axis;
+		break;
+	}
+
+	return out;
+}
+
 void InputManager::read(const OsEvent &event)
 {
 	InputDevice *dev;
@@ -322,6 +360,8 @@ void InputManager::read(const OsEvent &event)
 			axis.x = (f32)ev.axis_x / (f32)INT16_MAX;
 			axis.y = (f32)ev.axis_y / (f32)INT16_MAX;
 			axis.z = (f32)ev.axis_z / (f32)INT16_MAX;
+
+			axis = deadzone(dev, ev.axis_num, axis);
 		} else {
 			axis.x = ev.axis_x;
 			axis.y = ev.axis_y;