fix menu cursor control; fix gamepad axis not working correctly

Author: HeliumAnt

Source/Managers/UInputMan.cpp

@@ -32,14 +32,9 @@ UInputMan::~UInputMan() {
 void UInputMan::Clear() {
 	m_SkipHandlingSpecialInput = false;
 	m_TextInput.clear();
-	;
 	m_NumJoysticks = 0;
 	m_OverrideInput = false;
-	m_AbsoluteMousePos.Reset();
-	m_RawMouseMovement.Reset();
-	m_AnalogMouseData.Reset();
 	m_MouseSensitivity = 0.6F;
-	m_MouseWheelChange = 0;
 	m_TrapMousePos = false;
 	m_PlayerScreenMouseBounds = {0, 0, 0, 0};
 	m_MouseTrapRadius = 350;
@@ -163,7 +158,7 @@ Vector UInputMan::AnalogAimValues(int whichPlayer) {
 	Vector aimValues(0, 0);
 	if (device == InputDevice::DEVICE_MOUSE_KEYB) {
 		if (!m_EnableMultiMouseKeyboard) {
-			aimValues = (m_AnalogMouseData / m_MouseTrapRadius);
+			aimValues = (m_MouseStates.at(0).analogAim / m_MouseTrapRadius);
 		} else {
 			if (auto mouse = m_MouseStates.find(m_ControlScheme.at(whichPlayer).GetDeviceID().mouseKeyboard.mouse); mouse != m_MouseStates.end()) {
 				aimValues = mouse->second.analogAim / m_MouseTrapRadius;
@@ -367,7 +362,7 @@ Vector UInputMan::GetAbsoluteMousePosition(int whichPlayer) const {
 
 void UInputMan::SetAbsoluteMousePosition(const Vector& pos, int whichPlayer) {
 	if (whichPlayer == Players::NoPlayer || !m_EnableMultiMouseKeyboard) {
-		m_AbsoluteMousePos = pos;
+		m_MouseStates.at(0).position = pos;
 	} else if (m_ControlScheme.at(whichPlayer).GetDevice() == InputDevice::DEVICE_MOUSE_KEYB) {
 		if (auto mouse = m_MouseStates.find(m_ControlScheme.at(whichPlayer).GetDeviceID().mouseKeyboard.mouse); mouse != m_MouseStates.end()) {
 			mouse->second.position = pos;
@@ -453,6 +448,20 @@ void UInputMan::ClearMouseButtons() {
 	}
 }
 
+int UInputMan::MouseWheelMovedByPlayer(int player) const {
+	if (player == Players::NoPlayer || player < Players::PlayerOne || player >= Players::MaxPlayerCount || !m_EnableMultiMouseKeyboard) {
+		return m_MouseStates.at(0).wheelChange;
+	}
+	InputDevice playerInput = m_ControlScheme.at(player).GetDevice();
+	if (playerInput == InputDevice::DEVICE_MOUSE_KEYB) {
+		DeviceID playerDevice = m_ControlScheme.at(player).GetDeviceID();
+		if (auto mouse = m_MouseStates.find(playerDevice.mouseKeyboard.mouse); mouse != m_MouseStates.end()) {
+			return mouse->second.wheelChange;
+		}
+	}
+	return m_MouseStates.at(0).wheelChange;
+}
+
 bool UInputMan::AnyMouseButtonPress(SDL_MouseID mouseID) const {
 	for (int button = MouseButtons::MOUSE_LEFT; button < MouseButtons::MAX_MOUSE_BUTTONS; ++button) {
 		if (MouseButtonPressed(button, NoPlayer, mouseID)) {
@@ -490,9 +499,9 @@ void UInputMan::ForceMouseWithinBox(int x, int y, int width, int height, int whi
 			rightMostPos = std::clamp(leftPos + width, leftPos, rightMostPos - 1);
 			bottomMostPos = std::clamp(topPos + height, topPos, bottomMostPos - 1);
 
-			if (!WithinBox(m_AbsoluteMousePos, static_cast<float>(leftPos), static_cast<float>(topPos), static_cast<float>(rightMostPos), static_cast<float>(bottomMostPos))) {
-				int limitX = std::clamp(m_AbsoluteMousePos.GetFloorIntX(), leftPos, rightMostPos);
-				int limitY = std::clamp(m_AbsoluteMousePos.GetFloorIntY(), topPos, bottomMostPos);
+			if (!WithinBox(m_MouseStates[0].position, static_cast<float>(leftPos), static_cast<float>(topPos), static_cast<float>(rightMostPos), static_cast<float>(bottomMostPos))) {
+				int limitX = std::clamp(m_MouseStates[0].position.GetFloorIntX(), leftPos, rightMostPos);
+				int limitY = std::clamp(m_MouseStates[0].position.GetFloorIntY(), topPos, bottomMostPos);
 				SDL_WarpMouseInWindow(g_WindowMan.GetWindow(), limitX, limitY);
 			}
 		} else {
@@ -852,8 +861,6 @@ int UInputMan::Update() {
 	}
 
 	m_TextInput.clear();
-	m_MouseWheelChange = 0;
-	m_RawMouseMovement.Reset();
 	for (auto& [mouseID, mouse]: m_MouseStates) {
 		mouse.wheelChange = 0;
 		mouse.relativeMotion.Reset();
@@ -931,15 +938,13 @@ int UInputMan::Update() {
 				m_MouseStates[0].position = {inputEvent.motion.x, inputEvent.motion.y};
 				m_MouseStates[0].relativeMotion += {inputEvent.motion.xrel, inputEvent.motion.yrel};
 
-				m_RawMouseMovement += Vector(static_cast<float>(inputEvent.motion.xrel), static_cast<float>(inputEvent.motion.yrel));
-				m_AbsoluteMousePos.SetXY(static_cast<float>(inputEvent.motion.x), static_cast<float>(inputEvent.motion.y));
-
 				if (g_WindowMan.FullyCoversAllDisplays()) {
 					int windowPosX = 0;
 					int windowPosY = 0;
 					SDL_GetWindowPosition(SDL_GetWindowFromID(inputEvent.motion.windowID), &windowPosX, &windowPosY);
 					Vector windowCoord(static_cast<float>(g_WindowMan.GetDisplayArrangementAbsOffsetX() + windowPosX), static_cast<float>(g_WindowMan.GetDisplayArrangementAbsOffsetY() + windowPosY));
-					m_AbsoluteMousePos += windowCoord;
+					mouse.position += windowCoord;
+					m_MouseStates[0].position += windowCoord;
 				}
 				break;
 			}
@@ -959,7 +964,6 @@ int UInputMan::Update() {
 				break;
 			}
 			case SDL_EVENT_MOUSE_WHEEL: {
-				m_MouseWheelChange += inputEvent.wheel.direction == SDL_MOUSEWHEEL_NORMAL ? inputEvent.wheel.y : -inputEvent.wheel.y;
 				m_MouseStates[inputEvent.wheel.which].wheelChange += inputEvent.wheel.direction == SDL_MOUSEWHEEL_NORMAL ? inputEvent.wheel.y : -inputEvent.wheel.y;
 				m_MouseStates[0].wheelChange += inputEvent.wheel.direction == SDL_MOUSEWHEEL_NORMAL ? inputEvent.wheel.y : -inputEvent.wheel.y;
 				break;
@@ -988,9 +992,9 @@ int UInputMan::Update() {
 			case SDL_EVENT_GAMEPAD_AXIS_MOTION:
 			case SDL_EVENT_JOYSTICK_AXIS_MOTION:
 				if (std::vector<Gamepad>::iterator device = std::find(s_PrevJoystickStates.begin(), s_PrevJoystickStates.end(), inputEvent.type == SDL_EVENT_GAMEPAD_AXIS_MOTION ? inputEvent.gaxis.which : inputEvent.jaxis.which); device != s_PrevJoystickStates.end()) {
-					if (SDL_IsGamepad(device->m_DeviceIndex) && inputEvent.type == SDL_EVENT_GAMEPAD_AXIS_MOTION) {
+					if (SDL_IsGamepad(device->m_JoystickID) && inputEvent.type == SDL_EVENT_GAMEPAD_AXIS_MOTION) {
 						UpdateJoystickAxis(device, inputEvent.gaxis.axis, inputEvent.gaxis.value);
-					} else if (!SDL_IsGamepad(device->m_DeviceIndex)) {
+					} else if (!SDL_IsGamepad(device->m_JoystickID)) {
 						UpdateJoystickAxis(device, inputEvent.jaxis.axis, inputEvent.jaxis.value);
 					}
 				}
@@ -1003,7 +1007,7 @@ int UInputMan::Update() {
 				if (std::vector<Gamepad>::iterator device = std::find(s_PrevJoystickStates.begin(), s_PrevJoystickStates.end(), joystickEvent ? inputEvent.jbutton.which : inputEvent.gbutton.which); device != s_PrevJoystickStates.end()) {
 					int button = -1;
 					int down = false;
-					if (SDL_IsGamepad(device->m_DeviceIndex)) {
+					if (SDL_IsGamepad(device->m_JoystickID)) {
 						if (inputEvent.type == SDL_EVENT_GAMEPAD_BUTTON_UP || inputEvent.type == SDL_EVENT_GAMEPAD_BUTTON_DOWN) {
 							button = inputEvent.gbutton.button;
 							down = inputEvent.gbutton.down;
@@ -1028,7 +1032,7 @@ int UInputMan::Update() {
 			case SDL_EVENT_JOYSTICK_REMOVED:
 			case SDL_EVENT_GAMEPAD_REMOVED:
 				if (std::vector<Gamepad>::iterator prevDevice = std::find(s_PrevJoystickStates.begin(), s_PrevJoystickStates.end(), inputEvent.jdevice.which); prevDevice != s_PrevJoystickStates.end()) {
-					g_ConsoleMan.PrintString("INFO: Gamepad " + std::to_string(prevDevice->m_DeviceIndex + 1) + " disconnected!");
+					g_ConsoleMan.PrintString("INFO: Gamepad " + std::to_string(prevDevice - s_PrevJoystickStates.begin() + 1) + " disconnected!");
 					SDL_CloseGamepad(SDL_GetGamepadFromID(prevDevice->m_JoystickID));
 					prevDevice->m_JoystickID = -1;
 					std::fill(prevDevice->m_Axis.begin(), prevDevice->m_Axis.end(), 0);
@@ -1046,7 +1050,6 @@ int UInputMan::Update() {
 		}
 	}
 	m_EventQueue.clear();
-	m_RawMouseMovement *= m_MouseSensitivity;
 	for (auto& [mouseID, mouse]: m_MouseStates) {
 		mouse.relativeMotion *= m_MouseSensitivity;
 	}
@@ -1170,9 +1173,6 @@ void UInputMan::HandleSpecialInput() {
 void UInputMan::UpdateMouseInput() {
 	// Detect and store mouse movement input, translated to analog stick emulation
 	// TODO: Figure out a less shit solution to updating the mouse in GUIs when there are no mouse players configured, i.e. no player input scheme is using mouse+keyboard. For not just check if we're out of Activity.
-	m_AnalogMouseData.m_X += m_RawMouseMovement.m_X * 3;
-	m_AnalogMouseData.m_Y += m_RawMouseMovement.m_Y * 3;
-	m_AnalogMouseData.CapMagnitude(m_MouseTrapRadius);
 	for (auto& [mouseID, mouse]: m_MouseStates) {
 		mouse.analogAim += mouse.relativeMotion * 3;
 		mouse.analogAim.CapMagnitude(m_MouseTrapRadius);
@@ -1190,8 +1190,8 @@ void UInputMan::UpdateMouseInput() {
 
 	// Enable the mouse cursor positioning again after having been disabled. Only do this when the mouse is within the drawing area so it
 	// won't cause the whole window to move if the user clicks the title bar and unintentionally drags it due to programmatic positioning.
-	int mousePosX = m_AbsoluteMousePos.m_X / g_WindowMan.GetResMultiplier();
-	int mousePosY = m_AbsoluteMousePos.m_Y / g_WindowMan.GetResMultiplier();
+	int mousePosX = m_MouseStates.at(0).position.m_X / g_WindowMan.GetResMultiplier();
+	int mousePosY = m_MouseStates.at(0).position.m_Y / g_WindowMan.GetResMultiplier();
 	if (m_DisableMouseMoving && m_PrepareToEnableMouseMoving && (mousePosX >= 0 && mousePosX < g_WindowMan.GetResX() && mousePosY >= 0 && mousePosY < g_WindowMan.GetResY())) {
 		m_DisableMouseMoving = m_PrepareToEnableMouseMoving = false;
 	}