RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-03-22 05:06:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Experimental gamepad support (#50)

Browse source 
* Experimental gamepad support

* Typo fix
This commit is contained in:
igor725 2023-08-15 03:09:11 +03:00 committed by GitHub
parent 2222d4e25c
commit f5ea7e84ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 131 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

202
rpcsx-gpu/main.cpp
View file

@ -771,6 +771,8 @@ int main(int argc, const char *argv[]) {
uint32_t imageIndex = 0; uint32_t imageIndex = 0;
bool isImageAcquired = false; bool isImageAcquired = false;
uint32_t gpIndex = -1;
GLFWgamepadstate gpState;
while (!glfwWindowShouldClose(window)) { while (!glfwWindowShouldClose(window)) {
glfwPollEvents(); glfwPollEvents();
@ -778,83 +780,141 @@ int main(int argc, const char *argv[]) {
std::size_t pulledCount = std::size_t pulledCount =
bridgePuller.pullCommands(commandsBuffer, std::size(commandsBuffer)); bridgePuller.pullCommands(commandsBuffer, std::size(commandsBuffer));
bridge->kbPadState.leftStickX = 0x80; if (gpIndex > GLFW_JOYSTICK_LAST) {
bridge->kbPadState.leftStickY = 0x80; for (int i = 0; i <= GLFW_JOYSTICK_LAST; ++i) {
bridge->kbPadState.rightStickX = 0x80; if (glfwJoystickIsGamepad(i) == GLFW_TRUE) {
bridge->kbPadState.rightStickY = 0x80; std::printf("Gamepad \"%s\" activated", glfwGetGamepadName(i));
bridge->kbPadState.buttons = 0; gpIndex = i;
break;
if (glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS) { }
bridge->kbPadState.leftStickX = 0; }
} else if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS) { } else if (gpIndex <= GLFW_JOYSTICK_LAST) {
bridge->kbPadState.leftStickX = 0xff; if (!glfwJoystickIsGamepad(gpIndex)) {
} gpIndex = -1;
if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS) { }
bridge->kbPadState.leftStickY = 0;
} else if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS) {
bridge->kbPadState.leftStickY = 0xff;
} }
if (glfwGetKey(window, GLFW_KEY_O) == GLFW_PRESS) { if (gpIndex <= GLFW_JOYSTICK_LAST) {
bridge->kbPadState.rightStickX = 0; if (glfwGetGamepadState(gpIndex, &gpState) == GLFW_TRUE) {
} else if (glfwGetKey(window, GLFW_KEY_L) == GLFW_PRESS) { bridge->kbPadState.leftStickX = gpState.axes[GLFW_GAMEPAD_AXIS_LEFT_X] * 127.5f + 127.5f;
bridge->kbPadState.rightStickX = 0xff; bridge->kbPadState.leftStickY = gpState.axes[GLFW_GAMEPAD_AXIS_LEFT_Y] * 127.5f + 127.5f;
} bridge->kbPadState.rightStickX = gpState.axes[GLFW_GAMEPAD_AXIS_RIGHT_X] * 127.5f + 127.5f;
if (glfwGetKey(window, GLFW_KEY_K) == GLFW_PRESS) { bridge->kbPadState.rightStickY = gpState.axes[GLFW_GAMEPAD_AXIS_RIGHT_Y] * 127.5f + 127.5f;
bridge->kbPadState.rightStickY = 0; bridge->kbPadState.l2 = (gpState.axes[GLFW_GAMEPAD_AXIS_LEFT_TRIGGER] + 1.0f) * 127.5f;
} else if (glfwGetKey(window, GLFW_KEY_SEMICOLON) == GLFW_PRESS) { bridge->kbPadState.r2 = (gpState.axes[GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER] + 1.0f) * 127.5f;
bridge->kbPadState.rightStickY = 0xff; bridge->kbPadState.buttons = 0;
}
if (glfwGetKey(window, GLFW_KEY_UP) == GLFW_PRESS) { if (bridge->kbPadState.l2 == 0xFF) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnUp; bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnL2;
} }
if (glfwGetKey(window, GLFW_KEY_DOWN) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnDown;
}
if (glfwGetKey(window, GLFW_KEY_LEFT) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnLeft;
}
if (glfwGetKey(window, GLFW_KEY_RIGHT) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnRight;
}
if (glfwGetKey(window, GLFW_KEY_Z) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnSquare;
}
if (glfwGetKey(window, GLFW_KEY_X) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnCross;
}
if (glfwGetKey(window, GLFW_KEY_C) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnCircle;
}
if (glfwGetKey(window, GLFW_KEY_V) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnTriangle;
}
if (glfwGetKey(window, GLFW_KEY_Q) == GLFW_PRESS) { if (bridge->kbPadState.r2 == 0xFF) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnL1; bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnR2;
} }
if (glfwGetKey(window, GLFW_KEY_E) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnL2;
bridge->kbPadState.l2 = 0xff;
}
if (glfwGetKey(window, GLFW_KEY_F) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnL3;
}
if (glfwGetKey(window, GLFW_KEY_I) == GLFW_PRESS) { static const uint32_t gpmap[GLFW_GAMEPAD_BUTTON_LAST + 1] = {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnR1; [GLFW_GAMEPAD_BUTTON_A] = amdgpu::bridge::kPadBtnCross,
} [GLFW_GAMEPAD_BUTTON_B] = amdgpu::bridge::kPadBtnCircle,
if (glfwGetKey(window, GLFW_KEY_P) == GLFW_PRESS) { [GLFW_GAMEPAD_BUTTON_X] = amdgpu::bridge::kPadBtnSquare,
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnR2; [GLFW_GAMEPAD_BUTTON_Y] = amdgpu::bridge::kPadBtnTriangle,
bridge->kbPadState.r2 = 0xff; [GLFW_GAMEPAD_BUTTON_LEFT_BUMPER] = amdgpu::bridge::kPadBtnL1,
} [GLFW_GAMEPAD_BUTTON_RIGHT_BUMPER] = amdgpu::bridge::kPadBtnR1,
if (glfwGetKey(window, GLFW_KEY_APOSTROPHE) == GLFW_PRESS) { [GLFW_GAMEPAD_BUTTON_BACK] = 0,
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnR3; [GLFW_GAMEPAD_BUTTON_START] = amdgpu::bridge::kPadBtnOptions,
} [GLFW_GAMEPAD_BUTTON_GUIDE] = 0,
[GLFW_GAMEPAD_BUTTON_LEFT_THUMB] = amdgpu::bridge::kPadBtnL3,
[GLFW_GAMEPAD_BUTTON_RIGHT_THUMB] = amdgpu::bridge::kPadBtnR3,
[GLFW_GAMEPAD_BUTTON_DPAD_UP] = amdgpu::bridge::kPadBtnUp,
[GLFW_GAMEPAD_BUTTON_DPAD_RIGHT] = amdgpu::bridge::kPadBtnRight,
[GLFW_GAMEPAD_BUTTON_DPAD_DOWN] = amdgpu::bridge::kPadBtnDown,
[GLFW_GAMEPAD_BUTTON_DPAD_LEFT] = amdgpu::bridge::kPadBtnLeft
};
if (glfwGetKey(window, GLFW_KEY_ENTER) == GLFW_PRESS) { for (int i = 0; i <= GLFW_GAMEPAD_BUTTON_LAST; ++i) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnOptions; if (gpState.buttons[i] == GLFW_PRESS) {
bridge->kbPadState.buttons |= gpmap[i];
}
}
}
} else {
bridge->kbPadState.leftStickX = 0x80;
bridge->kbPadState.leftStickY = 0x80;
bridge->kbPadState.rightStickX = 0x80;
bridge->kbPadState.rightStickY = 0x80;
bridge->kbPadState.buttons = 0;
if (glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS) {
bridge->kbPadState.leftStickX = 0;
} else if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS) {
bridge->kbPadState.leftStickX = 0xff;
}
if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS) {
bridge->kbPadState.leftStickY = 0;
} else if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS) {
bridge->kbPadState.leftStickY = 0xff;
}
if (glfwGetKey(window, GLFW_KEY_O) == GLFW_PRESS) {
bridge->kbPadState.rightStickX = 0;
} else if (glfwGetKey(window, GLFW_KEY_L) == GLFW_PRESS) {
bridge->kbPadState.rightStickX = 0xff;
}
if (glfwGetKey(window, GLFW_KEY_K) == GLFW_PRESS) {
bridge->kbPadState.rightStickY = 0;
} else if (glfwGetKey(window, GLFW_KEY_SEMICOLON) == GLFW_PRESS) {
bridge->kbPadState.rightStickY = 0xff;
}
if (glfwGetKey(window, GLFW_KEY_UP) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnUp;
}
if (glfwGetKey(window, GLFW_KEY_DOWN) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnDown;
}
if (glfwGetKey(window, GLFW_KEY_LEFT) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnLeft;
}
if (glfwGetKey(window, GLFW_KEY_RIGHT) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnRight;
}
if (glfwGetKey(window, GLFW_KEY_Z) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnSquare;
}
if (glfwGetKey(window, GLFW_KEY_X) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnCross;
}
if (glfwGetKey(window, GLFW_KEY_C) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnCircle;
}
if (glfwGetKey(window, GLFW_KEY_V) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnTriangle;
}
if (glfwGetKey(window, GLFW_KEY_Q) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnL1;
}
if (glfwGetKey(window, GLFW_KEY_E) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnL2;
bridge->kbPadState.l2 = 0xff;
}
if (glfwGetKey(window, GLFW_KEY_F) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnL3;
}
if (glfwGetKey(window, GLFW_KEY_I) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnR1;
}
if (glfwGetKey(window, GLFW_KEY_P) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnR2;
bridge->kbPadState.r2 = 0xff;
}
if (glfwGetKey(window, GLFW_KEY_APOSTROPHE) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnR3;
}
if (glfwGetKey(window, GLFW_KEY_ENTER) == GLFW_PRESS) {
bridge->kbPadState.buttons |= amdgpu::bridge::kPadBtnOptions;
}
} }
bridge->kbPadState.timestamp = bridge->kbPadState.timestamp =