thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-28 21:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix input state mapping.

Browse source
This commit is contained in:
Skyth 2024-11-18 21:54:14 +03:00
parent 57fe789903
commit 6f31815f7d
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
UnleashedRecomp/api/SWA/System/InputState.h
View file

@ -11,10 +11,9 @@ namespace SWA
// TODO: Hedgehog::Base::TSynchronizedPtr<CInputState> // TODO: Hedgehog::Base::TSynchronizedPtr<CInputState>
static CInputState* GetInstance(); static CInputState* GetInstance();
SPadState m_PadStates[40]; SWA_INSERT_PADDING(0x4);
SWA_INSERT_PADDING(0x50); SPadState m_PadStates[8];
be<uint32_t> m_CurrentPadStateIndex; be<uint32_t> m_CurrentPadStateIndex;
SWA_INSERT_PADDING(0x04);
const SPadState& GetPadState() const; const SPadState& GetPadState() const;
}; };

2
UnleashedRecomp/api/SWA/System/InputState.inl
View file

@ -3,7 +3,7 @@ namespace SWA
// TODO: Hedgehog::Base::TSynchronizedPtr<CInputState> // TODO: Hedgehog::Base::TSynchronizedPtr<CInputState>
inline CInputState* CInputState::GetInstance() inline CInputState* CInputState::GetInstance()
{ {
return *(xpointer<CInputState>*)MmGetHostAddress(0x833671EC); return *(xpointer<CInputState>*)MmGetHostAddress(0x83361F5C);
} }
inline const SPadState& CInputState::GetPadState() const inline const SPadState& CInputState::GetPadState() const

7
UnleashedRecomp/api/SWA/System/PadState.h
View file

@ -43,16 +43,11 @@ namespace SWA
struct SPadState struct SPadState
{ {
SWA_INSERT_PADDING(0x20);
be<uint32_t> DownState; be<uint32_t> DownState;
be<uint32_t> UpState; be<uint32_t> UpState;
be<uint32_t> TappedState; be<uint32_t> TappedState;
be<uint32_t> ReleasedState; be<uint32_t> ReleasedState;
// TODO: This structure seems different than the Generations counterpart,
// these paddings might not be there.
be<float> LeftStickHorizontal; be<float> LeftStickHorizontal;
be<float> LeftStickVertical; be<float> LeftStickVertical;
@ -66,7 +61,7 @@ namespace SWA
be<float> LeftTrigger; be<float> LeftTrigger;
be<float> RightTrigger; be<float> RightTrigger;
SWA_INSERT_PADDING(0x24); SWA_INSERT_PADDING(0x08);
bool IsDown(const EKeyState in_Keys) const; bool IsDown(const EKeyState in_Keys) const;
bool IsUp(const EKeyState in_Keys) const; bool IsUp(const EKeyState in_Keys) const;