Merge pull request #498 from cortex-command-community/digital-axis-fix

Fix digital axis simulation triggering on all analog events

Author: MaximDude

Managers/UInputMan.cpp

@@ -191,11 +191,14 @@ namespace RTE {
 				case InputDevice::DEVICE_KEYB_ONLY:
 					if (ElementHeld(player, InputElements::INPUT_L_UP)) {
 						allInput.m_Y += -1.0F;
-					} else if (ElementHeld(player, InputElements::INPUT_L_DOWN)) {
+					}
+					if (ElementHeld(player, InputElements::INPUT_L_DOWN)) {
 						allInput.m_Y += 1.0F;
-					} else if (ElementHeld(player, InputElements::INPUT_L_LEFT)) {
+					}
+					if (ElementHeld(player, InputElements::INPUT_L_LEFT)) {
 						allInput.m_X += -1.0F;
-					} else if (ElementHeld(player, InputElements::INPUT_L_RIGHT)) {
+					}
+					if (ElementHeld(player, InputElements::INPUT_L_RIGHT)) {
 						allInput.m_X += 1.0F;
 					}
 					break;
@@ -800,6 +803,7 @@ namespace RTE {
 			m_NetworkAccumulatedRawMouseMovement[Players::PlayerOne] += m_RawMouseMovement;
 		}
 		UpdateMouseInput();
+		UpdateJoystickDigitalAxis();
 		HandleSpecialInput();
 		StoreInputEventsForNextUpdate();
 
@@ -996,19 +1000,9 @@ namespace RTE {
 			int joystickIndex = device - s_PrevJoystickStates.begin();
 
 			int prevAxisValue = device->m_Axis[axis];
-			int prevDigitalValue = device->m_DigitalAxis[axis];
-
-			int newDigitalState = 0;
-			if (value > c_AxisDigitalThreshold) {
-				newDigitalState = 1;
-			} else if (value < -c_AxisDigitalThreshold) {
-				newDigitalState = -1;
-			}
 
 			s_ChangedJoystickStates[joystickIndex].m_Axis[axis] = Sign(value - device->m_Axis[axis]);
-			s_ChangedJoystickStates[joystickIndex].m_DigitalAxis[axis] = Sign(newDigitalState - prevDigitalValue);
 			device->m_Axis[axis] = value;
-			device->m_DigitalAxis[axis] = newDigitalState;
 
 			Players joystickPlayer = Players::NoPlayer;
 			float deadZone = 0.0F;
@@ -1051,30 +1045,45 @@ namespace RTE {
 						if (aimValues.MagnitudeIsLessThan(deadZone)) {
 							if (axisLeft != SDL_CONTROLLER_AXIS_INVALID) {
 								s_ChangedJoystickStates[joystickIndex].m_Axis[axisLeft] = Sign(axisLeft == axis ? -prevAxisValue : -device->m_Axis[axisLeft]);
-								s_ChangedJoystickStates[joystickIndex].m_DigitalAxis[axisLeft] = Sign(axisLeft == axis ? -prevDigitalValue : -device->m_DigitalAxis[axisLeft]);
 								device->m_Axis[axisLeft] = 0;
-								device->m_DigitalAxis[axisLeft] = 0;
 							}
 							if (axisUp != SDL_CONTROLLER_AXIS_INVALID) {
 								s_ChangedJoystickStates[joystickIndex].m_Axis[axisUp] = Sign(axisUp == axis ? -prevAxisValue : -device->m_Axis[axisUp]);
-								s_ChangedJoystickStates[joystickIndex].m_DigitalAxis[axisUp] = Sign(axisLeft == axis ? -prevDigitalValue : -device->m_DigitalAxis[axisUp]);
 								device->m_Axis[axisUp] = 0;
-								device->m_DigitalAxis[axisUp] = 0;
 							}
 						}
 					} else if (deadZoneType == DeadZoneType::SQUARE && deadZone > 0.0F) {
 						if (std::abs(static_cast<double>(value) / c_GamepadAxisLimit) < deadZone) {
 							s_ChangedJoystickStates[joystickIndex].m_Axis[axis] = Sign(-prevAxisValue);
-							s_ChangedJoystickStates[joystickIndex].m_Axis[axis] = Sign(-prevDigitalValue);
 							device->m_Axis[axis] = 0;
-							device->m_DigitalAxis[axis] = 0;
 						}
 					}
 				}
 			}
 		}
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void UInputMan::UpdateJoystickDigitalAxis() {
+		for (size_t i = 0; i < s_PrevJoystickStates.size(); ++i) {
+			for (size_t axis = 0; axis < s_PrevJoystickStates[i].m_DigitalAxis.size(); ++axis) {
+				int prevDigitalValue = s_PrevJoystickStates[i].m_DigitalAxis[axis];
+				int newDigitalValue = 0;
+				if (prevDigitalValue != 0 && std::abs(s_PrevJoystickStates[i].m_Axis[axis]) > c_AxisDigitalReleasedThreshold) {
+					newDigitalValue = prevDigitalValue;
+				}
+				if (s_PrevJoystickStates[i].m_Axis[axis] > c_AxisDigitalPressedThreshold) {
+					newDigitalValue = 1;
+				} else if (s_PrevJoystickStates[i].m_Axis[axis] < -c_AxisDigitalPressedThreshold) {
+					newDigitalValue = -1;
+				}
+				s_ChangedJoystickStates[i].m_DigitalAxis[axis] = Sign(newDigitalValue - prevDigitalValue);
+				s_PrevJoystickStates[i].m_DigitalAxis[axis] = newDigitalValue;
+			}
+		}
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void UInputMan::HandleGamepadHotPlug(int deviceIndex) {

Managers/UInputMan.h

@@ -712,7 +712,8 @@ namespace RTE {
 		bool m_TrapMousePosPerPlayer[Players::MaxPlayerCount]; //!< Whether to trap the mouse position to the middle of the screen for each player during network multiplayer.
 
 		static constexpr double c_GamepadAxisLimit = 32767.0; //!< Maximum axis value as defined by SDL (int16 max).
-		static constexpr int c_AxisDigitalThreshold = 8192; //!< Digital Axis threshold value as defined by allegro.
+		static constexpr int c_AxisDigitalPressedThreshold = 8192; //!< Digital Axis threshold value as defined by allegro.
+		static constexpr int c_AxisDigitalReleasedThreshold = c_AxisDigitalPressedThreshold - 100; //!< Digital Axis release threshold, to debounce values.
 
 #pragma region Input State Handling
 		/// <summary>
@@ -826,6 +827,11 @@ namespace RTE {
 		/// </summary>
 		void UpdateJoystickAxis(std::vector<Gamepad>::iterator device, int axis, int newValue);
 
+		/// <summary>
+		/// Updates simulated digital joystick axis. This is called from Update().
+		/// </summary>
+		void UpdateJoystickDigitalAxis();
+
 		/// <summary>
 		/// Connect a joystick or gamepad device and add it to the joystick list if a slot is available (up to max player count).
 		/// </summary>