mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-27 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang

Browse Source
This commit is contained in:
kalaposfos13 2025-02-27 14:15:14 +01:00
parent 180a34808a
commit 8cc101b3b0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/libraries/pad/pad.cpp
View File

@ -365,7 +365,7 @@ int PS4_SYSV_ABI scePadReadState(s32 handle, OrbisPadData* pData) {
int connectedCount = 0; int connectedCount = 0;
bool isConnected = false; bool isConnected = false;
Input::State state; Input::State state;
controllers[ handle - 1]->ReadState(&state, &isConnected, &connectedCount); controllers[handle - 1]->ReadState(&state, &isConnected, &connectedCount);
pData->buttons = state.buttonsState; pData->buttons = state.buttonsState;
pData->leftStick.x = state.axes[static_cast<int>(Input::Axis::LeftX)]; pData->leftStick.x = state.axes[static_cast<int>(Input::Axis::LeftX)];
pData->leftStick.y = state.axes[static_cast<int>(Input::Axis::LeftY)]; pData->leftStick.y = state.axes[static_cast<int>(Input::Axis::LeftY)];

8
src/input/controller.h
View File

@ -47,7 +47,8 @@ inline int GetAxis(int min, int max, int value) {
constexpr u32 MAX_STATES = 32; constexpr u32 MAX_STATES = 32;
class GameController { class GameController {
friend class GameControllers; friend class GameControllers;
public: public:
GameController(); GameController();
virtual ~GameController() = default; virtual ~GameController() = default;
@ -91,8 +92,11 @@ private:
class GameControllers { class GameControllers {
std::array<GameController*, 4> controllers; std::array<GameController*, 4> controllers;
public: public:
GameControllers() : controllers({new GameController(), new GameController(), new GameController(), new GameController()}) {}; GameControllers()
: controllers({new GameController(), new GameController(), new GameController(),
new GameController()}) {};
virtual ~GameControllers() = default; virtual ~GameControllers() = default;
GameController* operator[](const size_t& i) const { GameController* operator[](const size_t& i) const {
if (i > 3) { if (i > 3) {