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.
3533 Commits
43 Branches
22 Tags
292 MiB
Tree: 36d22334ee
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '36d22334ee'
${ noResults }
devilutionX/SourceX/controls/devices/joystick.cpp

294 lines
7.6 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
#include "controls/devices/joystick.h"
Controller: Support SDL1 joystick axes
6 years ago
#include "controls/controller_motion.h"
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
#include "stubs.h"
namespace dvl {
ControllerButton JoyButtonToControllerButton(const SDL_Event &event)
{
switch (event.type) {
case SDL_JOYBUTTONDOWN:
case SDL_JOYBUTTONUP:
switch (event.jbutton.button) {
#ifdef JOY_BUTTON_A
case JOY_BUTTON_A:
return ControllerButton::BUTTON_A;
#endif
#ifdef JOY_BUTTON_B
case JOY_BUTTON_B:
return ControllerButton::BUTTON_B;
#endif
#ifdef JOY_BUTTON_X
case JOY_BUTTON_X:
return ControllerButton::BUTTON_X;
#endif
#ifdef JOY_BUTTON_Y
case JOY_BUTTON_Y:
return ControllerButton::BUTTON_Y;
#endif
#ifdef JOY_BUTTON_LEFTSTICK
case JOY_BUTTON_LEFTSTICK:
return ControllerButton::BUTTON_LEFTSTICK;
#endif
#ifdef JOY_BUTTON_RIGHTSTICK
case JOY_BUTTON_RIGHTSTICK:
return ControllerButton::BUTTON_RIGHTSTICK;
#endif
#ifdef JOY_BUTTON_LEFTSHOULDER
case JOY_BUTTON_LEFTSHOULDER:
return ControllerButton::BUTTON_LEFTSHOULDER;
#endif
#ifdef JOY_BUTTON_RIGHTSHOULDER
case JOY_BUTTON_RIGHTSHOULDER:
return ControllerButton::BUTTON_RIGHTSHOULDER;
#endif
RG350 and RetroFW improvements 1. Use SDL1 for RG350 for performance 2. Document controls for both
6 years ago
#ifdef JOY_BUTTON_TRIGGERLEFT
case JOY_BUTTON_TRIGGERLEFT:
return ControllerButton::AXIS_TRIGGERLEFT;
#endif
#ifdef JOY_BUTTON_TRIGGERRIGHT
case JOY_BUTTON_TRIGGERRIGHT:
return ControllerButton::AXIS_TRIGGERRIGHT;
#endif
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
#ifdef JOY_BUTTON_START
case JOY_BUTTON_START:
return ControllerButton::BUTTON_START;
#endif
#ifdef JOY_BUTTON_BACK
case JOY_BUTTON_BACK:
return ControllerButton::BUTTON_BACK;
#endif
#ifdef JOY_BUTTON_DPAD_LEFT
case JOY_BUTTON_DPAD_LEFT:
return ControllerButton::BUTTON_DPAD_LEFT;
#endif
#ifdef JOY_BUTTON_DPAD_UP
case JOY_BUTTON_DPAD_UP:
return ControllerButton::BUTTON_DPAD_UP;
#endif
#ifdef JOY_BUTTON_DPAD_RIGHT
case JOY_BUTTON_DPAD_RIGHT:
return ControllerButton::BUTTON_DPAD_RIGHT;
#endif
#ifdef JOY_BUTTON_DPAD_DOWN
case JOY_BUTTON_DPAD_DOWN:
return ControllerButton::BUTTON_DPAD_DOWN;
#endif
default:
break;
}
break;
Controller: Support SDL1 joystick hat
6 years ago
case SDL_JOYHATMOTION:
#if defined(JOY_HAT_DPAD_UP_HAT) && defined(JOY_HAT_DPAD_UP)
if (event.jhat.hat == JOY_HAT_DPAD_UP_HAT && (event.jhat.value & JOY_HAT_DPAD_UP) != 0)
return ControllerButton::BUTTON_DPAD_UP;
#endif
#if defined(JOY_HAT_DPAD_DOWN_HAT) && defined(JOY_HAT_DPAD_DOWN)
if (event.jhat.hat == JOY_HAT_DPAD_DOWN_HAT && (event.jhat.value & JOY_HAT_DPAD_DOWN) != 0)
return ControllerButton::BUTTON_DPAD_DOWN;
#endif
#if defined(JOY_HAT_DPAD_LEFT_HAT) && defined(JOY_HAT_DPAD_LEFT)
if (event.jhat.hat == JOY_HAT_DPAD_LEFT_HAT && (event.jhat.value & JOY_HAT_DPAD_LEFT) != 0)
return ControllerButton::BUTTON_DPAD_LEFT;
#endif
#if defined(JOY_HAT_DPAD_RIGHT_HAT) && defined(JOY_HAT_DPAD_RIGHT)
if (event.jhat.hat == JOY_HAT_DPAD_RIGHT_HAT && (event.jhat.value & JOY_HAT_DPAD_RIGHT) != 0)
return ControllerButton::BUTTON_DPAD_RIGHT;
#endif
Fix devices/joystick d-pad handling
6 years ago
return ControllerButton::IGNORE;
Controller: Support SDL1 joystick hat
6 years ago
break;
default:
break;
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
}
return ControllerButton::NONE;
}
Controller: Support SDL1 joystick hat
6 years ago
namespace {
int JoyButtonToControllerButton(ControllerButton button)
{
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
if (button == ControllerButton::AXIS_TRIGGERLEFT || button == ControllerButton::AXIS_TRIGGERRIGHT)
UNIMPLEMENTED();
switch (button) {
#ifdef JOY_BUTTON_A
case ControllerButton::BUTTON_A:
return JOY_BUTTON_A;
#endif
#ifdef JOY_BUTTON_B
case ControllerButton::BUTTON_B:
return JOY_BUTTON_B;
#endif
#ifdef JOY_BUTTON_X
case ControllerButton::BUTTON_X:
return JOY_BUTTON_X;
#endif
#ifdef JOY_BUTTON_Y
case ControllerButton::BUTTON_Y:
return JOY_BUTTON_Y;
#endif
#ifdef JOY_BUTTON_BACK
case ControllerButton::BUTTON_BACK:
return JOY_BUTTON_BACK;
#endif
#ifdef JOY_BUTTON_START
case ControllerButton::BUTTON_START:
return JOY_BUTTON_START;
#endif
#ifdef JOY_BUTTON_LEFTSTICK
case ControllerButton::BUTTON_LEFTSTICK:
return JOY_BUTTON_LEFTSTICK;
#endif
#ifdef JOY_BUTTON_RIGHTSTICK
case ControllerButton::BUTTON_RIGHTSTICK:
return JOY_BUTTON_RIGHTSTICK;
#endif
#ifdef JOY_BUTTON_LEFTSHOULDER
case ControllerButton::BUTTON_LEFTSHOULDER:
return JOY_BUTTON_LEFTSHOULDER;
#endif
#ifdef JOY_BUTTON_RIGHTSHOULDER
case ControllerButton::BUTTON_RIGHTSHOULDER:
return JOY_BUTTON_RIGHTSHOULDER;
#endif
#ifdef JOY_BUTTON_DPAD_UP
case ControllerButton::BUTTON_DPAD_UP:
return JOY_BUTTON_DPAD_UP;
#endif
#ifdef JOY_BUTTON_DPAD_DOWN
case ControllerButton::BUTTON_DPAD_DOWN:
return JOY_BUTTON_DPAD_DOWN;
#endif
#ifdef JOY_BUTTON_DPAD_LEFT
case ControllerButton::BUTTON_DPAD_LEFT:
return JOY_BUTTON_DPAD_LEFT;
#endif
#ifdef JOY_BUTTON_DPAD_RIGHT
case ControllerButton::BUTTON_DPAD_RIGHT:
return JOY_BUTTON_DPAD_RIGHT;
#endif
default:
return -1;
}
}
Controller: Support SDL1 joystick hat
6 years ago
bool IsJoystickHatButtonPressed(ControllerButton button)
{
switch (button) {
#if defined(JOY_HAT_DPAD_UP_HAT) && defined(JOY_HAT_DPAD_UP)
case ControllerButton::BUTTON_DPAD_UP:
return (SDL_JoystickGetHat(CurrentJoystick(), JOY_HAT_DPAD_UP_HAT) & JOY_HAT_DPAD_UP) != 0;
#endif
#if defined(JOY_HAT_DPAD_DOWN_HAT) && defined(JOY_HAT_DPAD_DOWN)
case ControllerButton::BUTTON_DPAD_DOWN:
return (SDL_JoystickGetHat(CurrentJoystick(), JOY_HAT_DPAD_DOWN_HAT) & JOY_HAT_DPAD_DOWN) != 0;
#endif
#if defined(JOY_HAT_DPAD_LEFT_HAT) && defined(JOY_HAT_DPAD_LEFT)
case ControllerButton::BUTTON_DPAD_LEFT:
return (SDL_JoystickGetHat(CurrentJoystick(), JOY_HAT_DPAD_LEFT_HAT) & JOY_HAT_DPAD_LEFT) != 0;
#endif
#if defined(JOY_HAT_DPAD_RIGHT_HAT) && defined(JOY_HAT_DPAD_RIGHT)
case ControllerButton::BUTTON_DPAD_RIGHT:
return (SDL_JoystickGetHat(CurrentJoystick(), JOY_HAT_DPAD_RIGHT_HAT) & JOY_HAT_DPAD_RIGHT) != 0;
#endif
default:
Fix IsJoystickHatButtonPressed
6 years ago
return false;
Controller: Support SDL1 joystick hat
6 years ago
}
}
} // namespace
bool IsJoystickButtonPressed(ControllerButton button)
{
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
if (CurrentJoystick() == nullptr)
return false;
Controller: Support SDL1 joystick hat
6 years ago
if (IsJoystickHatButtonPressed(button))
return true;
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
const int joy_button = JoyButtonToControllerButton(button);
return joy_button != -1 && SDL_JoystickGetButton(CurrentJoystick(), joy_button);
}
Controller: Support SDL1 joystick axes
6 years ago
bool ProcessJoystickAxisMotion(const SDL_Event &event)
{
if (event.type != SDL_JOYAXISMOTION)
return false;
switch (event.jaxis.axis) {
#ifdef JOY_AXIS_LEFTX
case JOY_AXIS_LEFTX:
leftStickXUnscaled = event.jaxis.value;
leftStickNeedsScaling = true;
break;
#endif
#ifdef JOY_AXIS_LEFTY
case JOY_AXIS_LEFTY:
leftStickYUnscaled = -event.jaxis.value;
leftStickNeedsScaling = true;
break;
#endif
#ifdef JOY_AXIS_RIGHTX
case JOY_AXIS_RIGHTX:
rightStickXUnscaled = event.jaxis.value;
rightStickNeedsScaling = true;
break;
#endif
#ifdef JOY_AXIS_RIGHTY
case JOY_AXIS_RIGHTY:
rightStickYUnscaled = -event.jaxis.value;
rightStickNeedsScaling = true;
break;
#endif
default:
return false;
}
return true;
}
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
static SDL_Joystick *current_joystick = nullptr;
SDL_Joystick *CurrentJoystick()
{
return current_joystick;
}
static int current_joystick_index = -1;
int CurrentJoystickIndex()
{
return current_joystick_index;
}
void InitJoystick()
{
Detect when gamepads are added or removed
6 years ago
#if HAS_KBCTRL == 1
sgbControllerActive = true;
#endif
if (SDL_NumJoysticks() == 0) {
current_joystick_index = -1;
#if HAS_KBCTRL == 0
sgbControllerActive = false;
#endif
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
return;
Detect when gamepads are added or removed
6 years ago
}
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
// Get the first available controller.
for (int i = 0; i < SDL_NumJoysticks(); ++i) {
#ifndef USE_SDL1
if (!SDL_IsGameController(i))
continue;
#endif
SDL_Log("Initializing joystick %d: %s", i, SDL_JoystickNameForIndex(i));
current_joystick = SDL_JoystickOpen(i);
if (current_joystick == nullptr) {
SDL_Log(SDL_GetError());
continue;
}
current_joystick_index = i;
Detect when gamepads are added or removed
6 years ago
sgbControllerActive = true;
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
break;
}
}
} // namespace dvl