Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #660 from tophyr/pr/check-x-and-y-axes

Browse Source 
fill in x and y only if axes are valid
This commit is contained in:
Louis Gombert 2025-01-01 07:07:35 -08:00 committed by GitHub
commit 11f93221e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ddio/sdlcontroller.cpp
View File

@ -901,11 +901,11 @@ bool sdlgameController::enum_controllers() {
m_ControlList[num_devs].buttons = jc.num_btns;
m_ControlList[num_devs].btnmask = 0;
m_ControlList[num_devs].flags =
CTF_X_AXIS | CTF_Y_AXIS | ((jc.axes_mask & JOYFLAG_ZVALID) ? CTF_Z_AXIS : 0) |
((jc.axes_mask & JOYFLAG_RVALID) ? CTF_R_AXIS : 0) | ((jc.axes_mask & JOYFLAG_UVALID) ? CTF_U_AXIS : 0) |
((jc.axes_mask & JOYFLAG_VVALID) ? CTF_V_AXIS : 0) | ((jc.axes_mask & JOYFLAG_POVVALID) ? CTF_POV : 0) |
((jc.axes_mask & JOYFLAG_POV2VALID) ? CTF_POV2 : 0) | ((jc.axes_mask & JOYFLAG_POV3VALID) ? CTF_POV3 : 0) |
((jc.axes_mask & JOYFLAG_POV4VALID) ? CTF_POV4 : 0);
((jc.axes_mask & JOYFLAG_XVALID) ? CTF_X_AXIS : 0) | ((jc.axes_mask & JOYFLAG_YVALID) ? CTF_Y_AXIS : 0) |
((jc.axes_mask & JOYFLAG_ZVALID) ? CTF_Z_AXIS : 0) | ((jc.axes_mask & JOYFLAG_RVALID) ? CTF_R_AXIS : 0) |
((jc.axes_mask & JOYFLAG_UVALID) ? CTF_U_AXIS : 0) | ((jc.axes_mask & JOYFLAG_VVALID) ? CTF_V_AXIS : 0) |
((jc.axes_mask & JOYFLAG_POVVALID) ? CTF_POV : 0) | ((jc.axes_mask & JOYFLAG_POV2VALID) ? CTF_POV2 : 0) |
((jc.axes_mask & JOYFLAG_POV3VALID) ? CTF_POV3 : 0) | ((jc.axes_mask & JOYFLAG_POV4VALID) ? CTF_POV4 : 0);
m_ControlList[num_devs].normalizer[0] = (jc.maxx - jc.minx) / 2.0f;
m_ControlList[num_devs].normalizer[1] = (jc.maxy - jc.miny) / 2.0f;
m_ControlList[num_devs].normalizer[2] = (jc.maxz - jc.minz) / 2.0f;

8
ddio/sdljoy.cpp
View File

@ -284,8 +284,12 @@ void joy_GetPos(tJoystick joy, tJoyPos *pos) {
uint32_t mask;
mask = Joysticks[joy].caps.axes_mask;
pos->x = SDL_JoystickGetAxis(stick, 0);
pos->y = SDL_JoystickGetAxis(stick, 1);
if (mask & JOYFLAG_XVALID) {
pos->x = SDL_JoystickGetAxis(stick, 0);
}
if (mask & JOYFLAG_YVALID) {
pos->y = SDL_JoystickGetAxis(stick, 1);
}
if (mask & JOYFLAG_ZVALID) {
pos->z = SDL_JoystickGetAxis(stick, 2);
}