Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-29 09:35:39 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Added support for controller analog sticks click.

Browse source
This commit is contained in:
Leon Styhre 2021-03-24 19:35:51 +01:00
parent cf2b9534e8
commit 1338e4467b
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-core/src/InputManager.cpp
View file

@ -413,6 +413,9 @@ void InputManager::loadDefaultKBConfig()
cfg->mapInput("rightshoulder", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_PAGEDOWN, 1, true)); cfg->mapInput("rightshoulder", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_PAGEDOWN, 1, true));
cfg->mapInput("lefttrigger", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_HOME, 1, true)); cfg->mapInput("lefttrigger", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_HOME, 1, true));
cfg->mapInput("righttrigger", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_END, 1, true)); cfg->mapInput("righttrigger", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_END, 1, true));
cfg->mapInput("leftanalogclick", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F2, 1, true));
cfg->mapInput("rightanalogclick", Input(DEVICE_KEYBOARD, TYPE_KEY, SDLK_F3, 1, true));
} }
void InputManager::writeDeviceConfig(InputConfig* config) void InputManager::writeDeviceConfig(InputConfig* config)

1
es-core/src/components/HelpComponent.cpp
View file

@ -26,6 +26,7 @@ static const std::map<std::string, std::string> ICON_PATH_MAP {
{ "up/down", ":/help/dpad_updown.svg" }, { "up/down", ":/help/dpad_updown.svg" },
{ "left/right", ":/help/dpad_leftright.svg" }, { "left/right", ":/help/dpad_leftright.svg" },
{ "up/down/left/right", ":/help/dpad_all.svg" }, { "up/down/left/right", ":/help/dpad_all.svg" },
{ "analogclick", ":/help/analog_click.svg" },
{ "a", ":/help/button_a.svg" }, { "a", ":/help/button_a.svg" },
{ "b", ":/help/button_b.svg" }, { "b", ":/help/button_b.svg" },
{ "x", ":/help/button_x.svg" }, { "x", ":/help/button_x.svg" },

6
es-core/src/guis/GuiInputConfig.cpp
View file

@ -22,7 +22,7 @@ struct InputConfigStructure {
std::string icon; std::string icon;
}; };
static const int inputCount = 22; static const int inputCount = 24;
static const InputConfigStructure GUI_INPUT_CONFIG_LIST[inputCount] = static const InputConfigStructure GUI_INPUT_CONFIG_LIST[inputCount] =
{ {
@ -40,16 +40,16 @@ static const InputConfigStructure GUI_INPUT_CONFIG_LIST[inputCount] =
{ "RightShoulder", true, "RIGHT SHOULDER", ":/help/button_r.svg" }, { "RightShoulder", true, "RIGHT SHOULDER", ":/help/button_r.svg" },
{ "LeftTrigger", true, "LEFT TRIGGER", ":/help/button_lt.svg" }, { "LeftTrigger", true, "LEFT TRIGGER", ":/help/button_lt.svg" },
{ "RightTrigger", true, "RIGHT TRIGGER", ":/help/button_rt.svg" }, { "RightTrigger", true, "RIGHT TRIGGER", ":/help/button_rt.svg" },
// { "LeftThumb", true, "LEFT THUMB", ":/help/analog_thumb.svg" },
// { "RightThumb", true, "RIGHT THUMB", ":/help/analog_thumb.svg" },
{ "LeftAnalogUp", true, "LEFT ANALOG UP", ":/help/analog_up.svg" }, { "LeftAnalogUp", true, "LEFT ANALOG UP", ":/help/analog_up.svg" },
{ "LeftAnalogDown", true, "LEFT ANALOG DOWN", ":/help/analog_down.svg" }, { "LeftAnalogDown", true, "LEFT ANALOG DOWN", ":/help/analog_down.svg" },
{ "LeftAnalogLeft", true, "LEFT ANALOG LEFT", ":/help/analog_left.svg" }, { "LeftAnalogLeft", true, "LEFT ANALOG LEFT", ":/help/analog_left.svg" },
{ "LeftAnalogRight", true, "LEFT ANALOG RIGHT", ":/help/analog_right.svg" }, { "LeftAnalogRight", true, "LEFT ANALOG RIGHT", ":/help/analog_right.svg" },
{ "LeftAnalogClick", true, "LEFT ANALOG CLICK", ":/help/analog_click.svg" },
{ "RightAnalogUp", true, "RIGHT ANALOG UP", ":/help/analog_up.svg" }, { "RightAnalogUp", true, "RIGHT ANALOG UP", ":/help/analog_up.svg" },
{ "RightAnalogDown", true, "RIGHT ANALOG DOWN", ":/help/analog_down.svg" }, { "RightAnalogDown", true, "RIGHT ANALOG DOWN", ":/help/analog_down.svg" },
{ "RightAnalogLeft", true, "RIGHT ANALOG LEFT", ":/help/analog_left.svg" }, { "RightAnalogLeft", true, "RIGHT ANALOG LEFT", ":/help/analog_left.svg" },
{ "RightAnalogRight", true, "RIGHT ANALOG RIGHT", ":/help/analog_right.svg" }, { "RightAnalogRight", true, "RIGHT ANALOG RIGHT", ":/help/analog_right.svg" },
{ "RightAnalogClick", true, "RIGHT ANALOG CLICK", ":/help/analog_click.svg" },
// { "HotKeyEnable", true, "HOTKEY ENABLE", ":/help/button_hotkey.svg" } // { "HotKeyEnable", true, "HOTKEY ENABLE", ":/help/button_hotkey.svg" }
}; };

0
resources/help/analog_thumb.svg → resources/help/analog_click.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 848 B

After

Width:  |  Height:  |  Size: 848 B