mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
10616 Commits
44 Branches
22 Tags
292 MiB
Tree: 8c1a847f41
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '8c1a847f41'
${ noResults }
devilutionX/Source/controls/controller_buttons.h

183 lines
7.3 KiB
Raw Normal View History Unescape

Game controller support Initial game controller support. Actions are based on the Switch branch but the controller code itself is implemented differently, allowing for easy remapping and minimizing changes to the Source/ directory. Many subtle and not so subtle controller bugs have been fixed in this implementation, including: 1. Smoother & more responsive movement with the joysticks. 2. Consistent controls for all the menus in the game (stores, quest log, etc). 3. Cursor appearance / disappearance at appropriate times. Low-level controls are abstracted and 3 SDL interfaces are supported: game controller, joystick, and keyboard. See SourceX/controls/ for more details on this. Wishlist for the future: 1. Primary button and use button should attack continously. This is hard as it requires checking the cooldowns / attack speed. 2. Quick spell menu navigation is very buggy. It is also buggy in the switch branch. I haven't had a change to investigate.
6 years ago
#pragma once
// Unifies joystick, gamepad, and keyboard controller APIs.
Modernize deprecated headers
5 years ago
#include <cstdint>
Add padmapper for gamepad customization
3 years ago
#include <functional>
Remove utils/stdcompat/string_view.hpp
3 years ago
#include <string_view>
:truck: Move all enums to there respective headers
5 years ago
:art: Change namespace to devilution
5 years ago
namespace devilution {
Game controller support Initial game controller support. Actions are based on the Switch branch but the controller code itself is implemented differently, allowing for easy remapping and minimizing changes to the Source/ directory. Many subtle and not so subtle controller bugs have been fixed in this implementation, including: 1. Smoother & more responsive movement with the joysticks. 2. Consistent controls for all the menus in the game (stores, quest log, etc). 3. Cursor appearance / disappearance at appropriate times. Low-level controls are abstracted and 3 SDL interfaces are supported: game controller, joystick, and keyboard. See SourceX/controls/ for more details on this. Wishlist for the future: 1. Primary button and use button should attack continously. This is hard as it requires checking the cooldowns / attack speed. 2. Quick spell menu navigation is very buggy. It is also buggy in the switch branch. I haven't had a change to investigate.
6 years ago
// NOTE: A, B, X, Y refer to physical positions on an XBox 360 controller.
// A<->B and X<->Y are reversed on a Nintendo controller.
:truck: Move all enums to there respective headers
5 years ago
enum ControllerButton : uint8_t {
:art: Consistent enum value style (#1458)
5 years ago
ControllerButton_NONE,
Make controller enums C++03 compatible
6 years ago
ControllerButton_IGNORE,
ControllerButton_AXIS_TRIGGERLEFT, // ZL (aka L2)
ControllerButton_AXIS_TRIGGERRIGHT, // ZR (aka R2)
ControllerButton_BUTTON_A, // Bottom button
ControllerButton_BUTTON_B, // Right button
ControllerButton_BUTTON_X, // Left button
ControllerButton_BUTTON_Y, // TOP button
ControllerButton_BUTTON_LEFTSTICK,
ControllerButton_BUTTON_RIGHTSTICK,
ControllerButton_BUTTON_LEFTSHOULDER,
ControllerButton_BUTTON_RIGHTSHOULDER,
ControllerButton_BUTTON_START,
ControllerButton_BUTTON_BACK,
ControllerButton_BUTTON_DPAD_UP,
ControllerButton_BUTTON_DPAD_DOWN,
ControllerButton_BUTTON_DPAD_LEFT,
Padmapper: Simplify `buttonTo*` data structures Use an `std::array` instead of `std::unordered_map`.
3 years ago
ControllerButton_BUTTON_DPAD_RIGHT,
FIRST = ControllerButton_NONE,
LAST = ControllerButton_BUTTON_DPAD_RIGHT
Game controller support Initial game controller support. Actions are based on the Switch branch but the controller code itself is implemented differently, allowing for easy remapping and minimizing changes to the Source/ directory. Many subtle and not so subtle controller bugs have been fixed in this implementation, including: 1. Smoother & more responsive movement with the joysticks. 2. Consistent controls for all the menus in the game (stores, quest log, etc). 3. Cursor appearance / disappearance at appropriate times. Low-level controls are abstracted and 3 SDL interfaces are supported: game controller, joystick, and keyboard. See SourceX/controls/ for more details on this. Wishlist for the future: 1. Primary button and use button should attack continously. This is hard as it requires checking the cooldowns / attack speed. 2. Quick spell menu navigation is very buggy. It is also buggy in the switch branch. I haven't had a change to investigate.
6 years ago
};
Add padmapper for gamepad customization
3 years ago
struct ControllerButtonCombo {
constexpr ControllerButtonCombo()
: modifier(ControllerButton_NONE)
, button(ControllerButton_NONE)
{
}
constexpr ControllerButtonCombo(ControllerButton button)
: modifier(ControllerButton_NONE)
, button(button)
{
}
constexpr ControllerButtonCombo(ControllerButton modifier, ControllerButton button)
: modifier(modifier)
, button(button)
{
}
ControllerButton modifier;
ControllerButton button;
};
Controller improvements: START modifier and hints 1. Makes START a modifier key. 2. Main modifier actions are now displayed as hints while the modifier is pressed. 3. Mouse simulation now available on all controllers: SELECT + D-Pad to move mouse SELECT + Left/Right should button to click START + | Action ---------- | ------ SELECT | Menu UP | Menu DOWN | Map LEFT | Character info RIGHT | Inventory B (Bottom) | Spell book Y (Left) | Quest log This makes all actions available on controllers without sticks and ZL/ZR.
6 years ago
inline bool IsDPadButton(ControllerButton button)
{
Make controller enums C++03 compatible
6 years ago
return button == ControllerButton_BUTTON_DPAD_UP
|| button == ControllerButton_BUTTON_DPAD_DOWN
|| button == ControllerButton_BUTTON_DPAD_LEFT
|| button == ControllerButton_BUTTON_DPAD_RIGHT;
Controller improvements: START modifier and hints 1. Makes START a modifier key. 2. Main modifier actions are now displayed as hints while the modifier is pressed. 3. Mouse simulation now available on all controllers: SELECT + D-Pad to move mouse SELECT + Left/Right should button to click START + | Action ---------- | ------ SELECT | Menu UP | Menu DOWN | Map LEFT | Character info RIGHT | Inventory B (Bottom) | Spell book Y (Left) | Quest log This makes all actions available on controllers without sticks and ZL/ZR.
6 years ago
}
Clean up gamepad icons code 1. Correctly defined button strings. 2. Clean up the printing code. 3. Use translatable strings for the generic gamepad type.
3 years ago
namespace controller_button_icon {
Remove utils/stdcompat/string_view.hpp
3 years ago
extern const std::string_view Playstation_Triangle;
extern const std::string_view Playstation_Square;
extern const std::string_view Playstation_X;
extern const std::string_view Playstation_Circle;
extern const std::string_view Playstation_Options;
extern const std::string_view Playstation_Share;
extern const std::string_view Playstation_L2;
extern const std::string_view Playstation_R2;
extern const std::string_view Playstation_L1;
extern const std::string_view Playstation_R1;
extern const std::string_view Playstation_DPad_Up;
extern const std::string_view Playstation_DPad_Right;
extern const std::string_view Playstation_DPad_Down;
extern const std::string_view Playstation_DPad_Left;
extern const std::string_view Playstation_LStick_NW;
extern const std::string_view Playstation_LStick_W;
extern const std::string_view Playstation_LStick_SW;
extern const std::string_view Playstation_LStick_N;
extern const std::string_view Playstation_LStick;
extern const std::string_view Playstation_LStick_S;
extern const std::string_view Playstation_LStick_NE;
extern const std::string_view Playstation_LStick_E;
extern const std::string_view Playstation_LStick_SE;
extern const std::string_view Playstation_L3;
extern const std::string_view Playstation_RStick_NW;
extern const std::string_view Playstation_RStick_W;
extern const std::string_view Playstation_RStick_SW;
extern const std::string_view Playstation_RStick_N;
extern const std::string_view Playstation_RStick;
extern const std::string_view Playstation_RStick_S;
extern const std::string_view Playstation_RStick_NE;
extern const std::string_view Playstation_RStick_E;
extern const std::string_view Playstation_RStick_SE;
extern const std::string_view Playstation_R3;
extern const std::string_view Playstation_Touchpad;
extern const std::string_view Nintendo_X;
extern const std::string_view Nintendo_Y;
extern const std::string_view Nintendo_B;
extern const std::string_view Nintendo_A;
extern const std::string_view Nintendo_Plus;
extern const std::string_view Nintendo_Minus;
extern const std::string_view Nintendo_ZL;
extern const std::string_view Nintendo_ZR;
extern const std::string_view Nintendo_L;
extern const std::string_view Nintendo_R;
extern const std::string_view Nintendo_DPad_Up;
extern const std::string_view Nintendo_DPad_Right;
extern const std::string_view Nintendo_DPad_Down;
extern const std::string_view Nintendo_DPad_Left;
extern const std::string_view Nintendo_LStick_NW;
extern const std::string_view Nintendo_LStick_W;
extern const std::string_view Nintendo_LStick_SW;
extern const std::string_view Nintendo_LStick_N;
extern const std::string_view Nintendo_LStick;
extern const std::string_view Nintendo_LStick_S;
extern const std::string_view Nintendo_LStick_NE;
extern const std::string_view Nintendo_LStick_E;
extern const std::string_view Nintendo_LStick_SE;
extern const std::string_view Nintendo_LStick_Click;
extern const std::string_view Nintendo_RStick_NW;
extern const std::string_view Nintendo_RStick_W;
extern const std::string_view Nintendo_RStick_SW;
extern const std::string_view Nintendo_RStick_N;
extern const std::string_view Nintendo_RStick;
extern const std::string_view Nintendo_RStick_S;
extern const std::string_view Nintendo_RStick_NE;
extern const std::string_view Nintendo_RStick_E;
extern const std::string_view Nintendo_RStick_SE;
extern const std::string_view Nintendo_RStick_Click;
extern const std::string_view Nintendo_Home;
extern const std::string_view Nintendo_Screenshot;
extern const std::string_view Nintendo_SL;
extern const std::string_view Nintendo_SR;
extern const std::string_view Xbox_Y;
extern const std::string_view Xbox_X;
extern const std::string_view Xbox_A;
extern const std::string_view Xbox_B;
extern const std::string_view Xbox_Menu;
extern const std::string_view Xbox_View;
extern const std::string_view Xbox_LT;
extern const std::string_view Xbox_RT;
extern const std::string_view Xbox_LB;
extern const std::string_view Xbox_RB;
extern const std::string_view Xbox_DPad_Up;
extern const std::string_view Xbox_DPad_Right;
extern const std::string_view Xbox_DPad_Down;
extern const std::string_view Xbox_DPad_Left;
extern const std::string_view Xbox_LStick_NW;
extern const std::string_view Xbox_LStick_W;
extern const std::string_view Xbox_LStick_SW;
extern const std::string_view Xbox_LStick_N;
extern const std::string_view Xbox_LStick;
extern const std::string_view Xbox_LStick_NE;
extern const std::string_view Xbox_LStick_E;
extern const std::string_view Xbox_LStick_SE;
extern const std::string_view Xbox_LStick_Click;
extern const std::string_view Xbox_RStick_NW;
extern const std::string_view Xbox_RStick_W;
extern const std::string_view Xbox_RStick_SW;
extern const std::string_view Xbox_RStick_N;
extern const std::string_view Xbox_RStick;
extern const std::string_view Xbox_RStick_S;
extern const std::string_view Xbox_RStick_NE;
extern const std::string_view Xbox_RStick_E;
extern const std::string_view Xbox_RStick_SE;
extern const std::string_view Xbox_RStick_Click;
extern const std::string_view Xbox_Xbox;
Clean up gamepad icons code 1. Correctly defined button strings. 2. Clean up the printing code. 3. Use translatable strings for the generic gamepad type.
3 years ago
} // namespace controller_button_icon
Implement settings menu for gamepad customization
3 years ago
Remove utils/stdcompat/string_view.hpp
3 years ago
std::string_view ToPlayStationIcon(ControllerButton button);
std::string_view ToNintendoIcon(ControllerButton button);
std::string_view ToXboxIcon(ControllerButton button);
std::string_view ToGenericButtonText(ControllerButton button);
std::string_view ToString(ControllerButton button);
Implement settings menu for gamepad customization
3 years ago
:truck: Move all enums to there respective headers
5 years ago
} // namespace devilution