Emulation/DobieStation
1
0
Fork 0
mirror of https://github.com/PSI-Rockin/DobieStation.git synced 2024-05-20 05:01:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixing controls

Browse source
This commit is contained in:
Mrlinkwii 2020-07-28 19:58:40 +01:00
parent 8259071c02
commit 6149221282
2 changed files with 52 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
README.md
View file

@ -69,28 +69,32 @@ The various command line options are as follows:
The key bindings are as follows: The key bindings are as follows:
| Keyboard | DualShock 2 | | Keyboard | DualShock 2 |
| ---------------- | ----------------- | | ---------------- | ------------------ |
| <kbd>A</kbd> | Triangle | | <kbd>S</kbd> | Triangle |
| <kbd>S</kbd> | Square | | <kbd>A</kbd> | Square |
| <kbd>Z</kbd> | Circle | | <kbd>X</kbd> | Circle |
| <kbd>X</kbd> | Cross | | <kbd>Z</kbd> | Cross |
| <kbd>Enter</kbd> | Start | | <kbd>Enter</kbd> | Start |
| <kbd>Space</kbd> | Select | | <kbd>Space</kbd> | Select |
| <kbd>Q</kbd> | L1 | | <kbd>Q</kbd> | L1 |
| N/A | L2 | | N/A | L2 |
| N/A | L3 | | N/A | L3 |
| <kbd>W</kbd> | R1 | | <kbd>W</kbd> | R1 |
| N/A | R2 | | N/A | R2 |
| N/A | R3 | | N/A | R3 |
| <kbd>↑</kbd> | D-pad up | | <kbd>↑</kbd> | D-pad up |
| <kbd>↓</kbd> | D-pad down | | <kbd>↓</kbd> | D-pad down |
| <kbd>←</kbd> | D-pad left | | <kbd>←</kbd> | D-pad left |
| <kbd>→</kbd> | D-pad right | | <kbd>→</kbd> | D-pad right |
| <kbd>I</kbd> | Left Analog up | | <kbd>R</kbd> | Left Analog up |
| <kbd>K</kbd> | Left Analog down | | <kbd>F</kbd> | Left Analog down |
| <kbd>J</kbd> | Left Analog left | | <kbd>D</kbd> | Left Analog left |
| <kbd>L</kbd> | Left Analog right | | <kbd>G</kbd> | Left Analog right |
| <kbd>I</kbd> | Right Analog up |
| <kbd>K</kbd> | Right Analog down |
| <kbd>J</kbd> | Right Analog left |
| <kbd>L</kbd> | Right Analog right |
| Keyboard | DobieStation | | Keyboard | DobieStation |
| ------------- | -------------------------- | | ------------- | -------------------------- |

52
src/qt/emuwindow.cpp
View file

@ -522,16 +522,16 @@ void EmuWindow::keyPressEvent(QKeyEvent *event)
emit press_key(PAD_BUTTON::RIGHT); emit press_key(PAD_BUTTON::RIGHT);
break; break;
case Qt::Key_Z: case Qt::Key_Z:
emit press_key(PAD_BUTTON::CIRCLE);
break;
case Qt::Key_X:
emit press_key(PAD_BUTTON::CROSS); emit press_key(PAD_BUTTON::CROSS);
break; break;
case Qt::Key_X:
emit press_key(PAD_BUTTON::CIRCLE );
break;
case Qt::Key_A: case Qt::Key_A:
emit press_key(PAD_BUTTON::TRIANGLE); emit press_key(PAD_BUTTON::SQUARE);
break; break;
case Qt::Key_S: case Qt::Key_S:
emit press_key(PAD_BUTTON::SQUARE); emit press_key(PAD_BUTTON::TRIANGLE );
break; break;
case Qt::Key_Q: case Qt::Key_Q:
emit press_key(PAD_BUTTON::L1); emit press_key(PAD_BUTTON::L1);
@ -548,27 +548,27 @@ void EmuWindow::keyPressEvent(QKeyEvent *event)
case Qt::Key_Period: case Qt::Key_Period:
emu_thread.unpause(PAUSE_EVENT::FRAME_ADVANCE); emu_thread.unpause(PAUSE_EVENT::FRAME_ADVANCE);
break; break;
case Qt::Key_J: case Qt::Key_R:
emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::X, 0x00); emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::X, 0x00);
break; break;
case Qt::Key_L: case Qt::Key_F:
emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::X, 0xFF); emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::X, 0xFF);
break; break;
case Qt::Key_I: case Qt::Key_G:
emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::Y, 0x00); emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::Y, 0x00);
break; break;
case Qt::Key_K: case Qt::Key_D:
emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::Y, 0xFF); emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::Y, 0xFF);
break; break;
case Qt::Key_1: case Qt::Key_I:
emit update_joystick(JOYSTICK::RIGHT,JOYSTICK_AXIS::X, 0x00); emit update_joystick(JOYSTICK::RIGHT,JOYSTICK_AXIS::X, 0x00);
break; break;
case Qt::Key_2: case Qt::Key_K:
emit update_joystick(JOYSTICK::RIGHT,JOYSTICK_AXIS::X, 0xFF); emit update_joystick(JOYSTICK::RIGHT,JOYSTICK_AXIS::X, 0xFF);
case Qt::Key_3: case Qt::Key_J:
emit update_joystick(JOYSTICK::RIGHT,JOYSTICK_AXIS::Y, 0x00); emit update_joystick(JOYSTICK::RIGHT,JOYSTICK_AXIS::Y, 0x00);
break; break;
case Qt::Key_5: case Qt::Key_L:
emit update_joystick(JOYSTICK::RIGHT,JOYSTICK_AXIS::Y, 0xFF); emit update_joystick(JOYSTICK::RIGHT,JOYSTICK_AXIS::Y, 0xFF);
break; break;
case Qt::Key_F1: case Qt::Key_F1:
@ -609,16 +609,16 @@ void EmuWindow::keyReleaseEvent(QKeyEvent *event)
emit release_key(PAD_BUTTON::RIGHT); emit release_key(PAD_BUTTON::RIGHT);
break; break;
case Qt::Key_Z: case Qt::Key_Z:
emit release_key(PAD_BUTTON::CIRCLE);
break;
case Qt::Key_X:
emit release_key(PAD_BUTTON::CROSS); emit release_key(PAD_BUTTON::CROSS);
break; break;
case Qt::Key_X:
emit release_key(PAD_BUTTON::CIRCLE );
break;
case Qt::Key_A: case Qt::Key_A:
emit release_key(PAD_BUTTON::TRIANGLE); emit release_key(PAD_BUTTON::SQUARE);
break; break;
case Qt::Key_S: case Qt::Key_S:
emit release_key(PAD_BUTTON::SQUARE); emit release_key(PAD_BUTTON::TRIANGLE);
break; break;
case Qt::Key_Q: case Qt::Key_Q:
emit release_key(PAD_BUTTON::L1); emit release_key(PAD_BUTTON::L1);
@ -632,20 +632,20 @@ void EmuWindow::keyReleaseEvent(QKeyEvent *event)
case Qt::Key_Space: case Qt::Key_Space:
emit release_key(PAD_BUTTON::SELECT); emit release_key(PAD_BUTTON::SELECT);
break; break;
case Qt::Key_J: case Qt::Key_R:
case Qt::Key_L: case Qt::Key_F:
emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::X, 0x80); emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::X, 0x80);
break; break;
case Qt::Key_K: case Qt::Key_D:
case Qt::Key_I: case Qt::Key_G:
emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::Y, 0x80); emit update_joystick(JOYSTICK::LEFT, JOYSTICK_AXIS::Y, 0x80);
break; break;
case Qt::Key_1: case Qt::Key_I:
case Qt::Key_2: case Qt::Key_K:
emit update_joystick(JOYSTICK::RIGHT, JOYSTICK_AXIS::X, 0x80); emit update_joystick(JOYSTICK::RIGHT, JOYSTICK_AXIS::X, 0x80);
break; break;
case Qt::Key_3: case Qt::Key_J:
case Qt::Key_5: case Qt::Key_L:
emit update_joystick(JOYSTICK::RIGHT, JOYSTICK_AXIS::Y, 0x80); emit update_joystick(JOYSTICK::RIGHT, JOYSTICK_AXIS::Y, 0x80);
break; break;
} }