Skip to content

fixes keyboard control for dpad: add mapping for additional number keys #989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
naussika wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixes keyboard control for dpad: add mapping for additional number keys #989

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...s/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,16 @@ namespace NintendoSwitch{

std::vector<std::unique_ptr<EditableTableRow>> ProControllerFromKeyboardTable::make_defaults(){
std::vector<std::unique_ptr<EditableTableRow>> ret;

#if defined(__APPLE__)
ret.emplace_back(make_mapping("Dpad Up", KeyboardKey::KEY_8, ProControllerDeltas{.dpad_x = 0, .dpad_y = -1}));
ret.emplace_back(make_mapping("Dpad Up+Right", KeyboardKey::KEY_9, ProControllerDeltas{.dpad_x = +1, .dpad_y = -1}));
ret.emplace_back(make_mapping("Dpad Right", KeyboardKey::KEY_6, ProControllerDeltas{.dpad_x = +1, .dpad_y = 0}));
ret.emplace_back(make_mapping("Dpad Down+Right", KeyboardKey::KEY_3, ProControllerDeltas{.dpad_x = +1, .dpad_y = +1}));
ret.emplace_back(make_mapping("Dpad Down", KeyboardKey::KEY_2, ProControllerDeltas{.dpad_x = 0, .dpad_y = +1}));
ret.emplace_back(make_mapping("Dpad Down+Left", KeyboardKey::KEY_1, ProControllerDeltas{.dpad_x = -1, .dpad_y = +1}));
ret.emplace_back(make_mapping("Dpad Left", KeyboardKey::KEY_4, ProControllerDeltas{.dpad_x = -1, .dpad_y = 0}));
ret.emplace_back(make_mapping("Dpad Up+Left", KeyboardKey::KEY_7, ProControllerDeltas{.dpad_x = -1, .dpad_y = -1}));
#else
ret.emplace_back(make_mapping("Dpad Up", KeyboardKey::KEY_KP_8, ProControllerDeltas{.dpad_x = 0, .dpad_y = -1}));
ret.emplace_back(make_mapping("Dpad Up+Right", KeyboardKey::KEY_KP_9, ProControllerDeltas{.dpad_x = +1, .dpad_y = -1}));
ret.emplace_back(make_mapping("Dpad Right", KeyboardKey::KEY_KP_6, ProControllerDeltas{.dpad_x = +1, .dpad_y = 0}));
Expand All @@ -24,7 +33,7 @@ std::vector<std::unique_ptr<EditableTableRow>> ProControllerFromKeyboardTable::m
ret.emplace_back(make_mapping("Dpad Down+Left", KeyboardKey::KEY_KP_1, ProControllerDeltas{.dpad_x = -1, .dpad_y = +1}));
ret.emplace_back(make_mapping("Dpad Left", KeyboardKey::KEY_KP_4, ProControllerDeltas{.dpad_x = -1, .dpad_y = 0}));
ret.emplace_back(make_mapping("Dpad Up+Left", KeyboardKey::KEY_KP_7, ProControllerDeltas{.dpad_x = -1, .dpad_y = -1}));

#endif
ret.emplace_back(make_mapping("Left-Stick Up", KeyboardKey::KEY_W, ProControllerDeltas{.left_x = 0, .left_y = -1}));
ret.emplace_back(make_mapping("Left-Stick Left", KeyboardKey::KEY_A, ProControllerDeltas{.left_x = -1, .left_y = 0}));
ret.emplace_back(make_mapping("Left-Stick Down", KeyboardKey::KEY_S, ProControllerDeltas{.left_x = 0, .left_y = +1}));
Expand Down