godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

WinRT: Fix Gamepad input

Browse Source 
Fix #9216
This commit is contained in:
George Marques
2017-06-24 12:15:49 -03:00
parent 4b6e43f67e
commit fbb4107ec7
1 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/winrt/joystick_winrt.cpp
View File

@@ -103,9 +103,10 @@ void JoystickWinrt::OnGamepadAdded(Platform::Object ^ sender, Windows::Gaming::I
controllers[idx].connected = true; controllers[idx].connected = true;
controllers[idx].controller_reference = value; controllers[idx].controller_reference = value;
controllers[idx].id = idx;
controllers[idx].type = ControllerType::GAMEPAD_CONTROLLER; controllers[idx].type = ControllerType::GAMEPAD_CONTROLLER;
input->joy_connection_changed(idx, true, "Xbox Controller", "__WINRT_GAMEPAD__"); input->joy_connection_changed(controllers[idx].id, true, "Xbox Controller", "__WINRT_GAMEPAD__");
} }
void JoystickWinrt::OnGamepadRemoved(Platform::Object ^ sender, Windows::Gaming::Input::Gamepad ^ value) { void JoystickWinrt::OnGamepadRemoved(Platform::Object ^ sender, Windows::Gaming::Input::Gamepad ^ value) {
@@ -122,15 +123,8 @@ void JoystickWinrt::OnGamepadRemoved(Platform::Object ^ sender, Windows::Gaming:
ERR_FAIL_COND(idx == -1); ERR_FAIL_COND(idx == -1);
for (int i = idx + 1; i < MAX_CONTROLLERS - 1; i++) { controllers[idx].connected = false;
controllers[idx].controller_reference = nullptr;
if (!controllers[i].connected) {
break;
}
controllers[i - 1] = controllers[i];
}
controllers[MAX_CONTROLLERS - 1] = ControllerDevice();
input->joy_connection_changed(idx, false, "Xbox Controller"); input->joy_connection_changed(idx, false, "Xbox Controller");
} }