mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 23:47:42 +00:00
New code style refactor
This commit is contained in:
Jack Andersen
@@ -4,153 +4,145 @@
|
||||
#include "CKeyboardMouseController.hpp"
|
||||
#include <boo/inputdev/DolphinSmashAdapter.hpp>
|
||||
|
||||
namespace urde
|
||||
{
|
||||
namespace urde {
|
||||
|
||||
struct CFinalInput
|
||||
{
|
||||
float x0_dt;
|
||||
u32 x4_controllerIdx;
|
||||
float x8_anaLeftX;
|
||||
float xc_anaLeftY;
|
||||
float x10_anaRightX;
|
||||
float x14_anaRightY;
|
||||
float x18_anaLeftTrigger;
|
||||
float x1c_anaRightTrigger;
|
||||
struct CFinalInput {
|
||||
float x0_dt;
|
||||
u32 x4_controllerIdx;
|
||||
float x8_anaLeftX;
|
||||
float xc_anaLeftY;
|
||||
float x10_anaRightX;
|
||||
float x14_anaRightY;
|
||||
float x18_anaLeftTrigger;
|
||||
float x1c_anaRightTrigger;
|
||||
|
||||
/* These were originally per-axis bools, requiring two logical tests
|
||||
* at read-time; now they're logical cardinal-direction states
|
||||
* (negative values indicated) */
|
||||
bool x20_enableAnaLeftXP:1;
|
||||
bool x20_enableAnaLeftNegXP:1;
|
||||
bool x21_enableAnaLeftYP:1;
|
||||
bool x21_enableAnaLeftNegYP:1;
|
||||
bool x22_enableAnaRightXP:1;
|
||||
bool x22_enableAnaRightNegXP:1;
|
||||
bool x23_enableAnaRightYP:1;
|
||||
bool x23_enableAnaRightNegYP:1;
|
||||
/* These were originally per-axis bools, requiring two logical tests
|
||||
* at read-time; now they're logical cardinal-direction states
|
||||
* (negative values indicated) */
|
||||
bool x20_enableAnaLeftXP : 1;
|
||||
bool x20_enableAnaLeftNegXP : 1;
|
||||
bool x21_enableAnaLeftYP : 1;
|
||||
bool x21_enableAnaLeftNegYP : 1;
|
||||
bool x22_enableAnaRightXP : 1;
|
||||
bool x22_enableAnaRightNegXP : 1;
|
||||
bool x23_enableAnaRightYP : 1;
|
||||
bool x23_enableAnaRightNegYP : 1;
|
||||
|
||||
/* These were originally redundantly-compared floats;
|
||||
* now the logical state is stored directly */
|
||||
bool x24_anaLeftTriggerP:1;
|
||||
bool x28_anaRightTriggerP:1;
|
||||
/* These were originally redundantly-compared floats;
|
||||
* now the logical state is stored directly */
|
||||
bool x24_anaLeftTriggerP : 1;
|
||||
bool x28_anaRightTriggerP : 1;
|
||||
|
||||
bool x2c_b24_A:1;
|
||||
bool x2c_b25_B:1;
|
||||
bool x2c_b26_X:1;
|
||||
bool x2c_b27_Y:1;
|
||||
bool x2c_b28_Z:1;
|
||||
bool x2c_b29_L:1;
|
||||
bool x2c_b30_R:1;
|
||||
bool x2c_b31_DPUp:1;
|
||||
bool x2d_b24_DPRight:1;
|
||||
bool x2d_b25_DPDown:1;
|
||||
bool x2d_b26_DPLeft:1;
|
||||
bool x2d_b27_Start:1;
|
||||
bool x2c_b24_A : 1;
|
||||
bool x2c_b25_B : 1;
|
||||
bool x2c_b26_X : 1;
|
||||
bool x2c_b27_Y : 1;
|
||||
bool x2c_b28_Z : 1;
|
||||
bool x2c_b29_L : 1;
|
||||
bool x2c_b30_R : 1;
|
||||
bool x2c_b31_DPUp : 1;
|
||||
bool x2d_b24_DPRight : 1;
|
||||
bool x2d_b25_DPDown : 1;
|
||||
bool x2d_b26_DPLeft : 1;
|
||||
bool x2d_b27_Start : 1;
|
||||
|
||||
bool x2d_b28_PA:1;
|
||||
bool x2d_b29_PB:1;
|
||||
bool x2d_b30_PX:1;
|
||||
bool x2d_b31_PY:1;
|
||||
bool x2e_b24_PZ:1;
|
||||
bool x2e_b25_PL:1;
|
||||
bool x2e_b26_PR:1;
|
||||
bool x2e_b27_PDPUp:1;
|
||||
bool x2e_b28_PDPRight:1;
|
||||
bool x2e_b29_PDPDown:1;
|
||||
bool x2e_b30_PDPLeft:1;
|
||||
bool x2e_b31_PStart:1;
|
||||
bool x2d_b28_PA : 1;
|
||||
bool x2d_b29_PB : 1;
|
||||
bool x2d_b30_PX : 1;
|
||||
bool x2d_b31_PY : 1;
|
||||
bool x2e_b24_PZ : 1;
|
||||
bool x2e_b25_PL : 1;
|
||||
bool x2e_b26_PR : 1;
|
||||
bool x2e_b27_PDPUp : 1;
|
||||
bool x2e_b28_PDPRight : 1;
|
||||
bool x2e_b29_PDPDown : 1;
|
||||
bool x2e_b30_PDPLeft : 1;
|
||||
bool x2e_b31_PStart : 1;
|
||||
|
||||
CFinalInput();
|
||||
CFinalInput(int cIdx, float dt,
|
||||
const boo::DolphinControllerState& data,
|
||||
const CFinalInput& prevInput,
|
||||
float leftDiv, float rightDiv);
|
||||
CFinalInput(int cIdx, float dt,
|
||||
const CKeyboardMouseControllerData& data,
|
||||
const CFinalInput& prevInput);
|
||||
CFinalInput& operator|=(const CFinalInput& other);
|
||||
bool operator==(const CFinalInput& other)
|
||||
{ return memcmp(this, &other, sizeof(CFinalInput)) == 0; }
|
||||
float DeltaTime() const {return x0_dt;}
|
||||
u32 ControllerIdx() const {return x4_controllerIdx;}
|
||||
CFinalInput();
|
||||
CFinalInput(int cIdx, float dt, const boo::DolphinControllerState& data, const CFinalInput& prevInput, float leftDiv,
|
||||
float rightDiv);
|
||||
CFinalInput(int cIdx, float dt, const CKeyboardMouseControllerData& data, const CFinalInput& prevInput);
|
||||
CFinalInput& operator|=(const CFinalInput& other);
|
||||
bool operator==(const CFinalInput& other) { return memcmp(this, &other, sizeof(CFinalInput)) == 0; }
|
||||
float DeltaTime() const { return x0_dt; }
|
||||
u32 ControllerIdx() const { return x4_controllerIdx; }
|
||||
|
||||
bool PStart() const {return x2e_b31_PStart;}
|
||||
bool PR() const {return x2e_b26_PR;}
|
||||
bool PL() const {return x2e_b25_PL;}
|
||||
bool PZ() const {return x2e_b24_PZ;}
|
||||
bool PY() const {return x2d_b31_PY;}
|
||||
bool PX() const {return x2d_b30_PX;}
|
||||
bool PB() const {return x2d_b29_PB;}
|
||||
bool PA() const {return x2d_b28_PA;}
|
||||
bool PDPRight() const {return x2e_b28_PDPRight;}
|
||||
bool PDPLeft() const {return x2e_b30_PDPLeft;}
|
||||
bool PDPDown() const {return x2e_b29_PDPDown;}
|
||||
bool PDPUp() const {return x2e_b27_PDPUp;}
|
||||
bool PRTrigger() const {return x28_anaRightTriggerP;}
|
||||
bool PLTrigger() const {return x24_anaLeftTriggerP;}
|
||||
bool PRARight() const {return x22_enableAnaRightXP;}
|
||||
bool PRALeft() const {return x22_enableAnaRightNegXP;}
|
||||
bool PRADown() const {return x23_enableAnaRightNegYP;}
|
||||
bool PRAUp() const {return x23_enableAnaRightYP;}
|
||||
bool PLARight() const {return x20_enableAnaLeftXP;}
|
||||
bool PLALeft() const {return x20_enableAnaLeftNegXP;}
|
||||
bool PLADown() const {return x21_enableAnaLeftNegYP;}
|
||||
bool PLAUp() const {return x21_enableAnaLeftYP;}
|
||||
bool DStart() const {return x2d_b27_Start;}
|
||||
bool DR() const {return x2c_b30_R;}
|
||||
bool DL() const {return x2c_b29_L;}
|
||||
bool DZ() const {return x2c_b28_Z;}
|
||||
bool DY() const {return x2c_b27_Y;}
|
||||
bool DX() const {return x2c_b26_X;}
|
||||
bool DB() const {return x2c_b25_B;}
|
||||
bool DA() const {return x2c_b24_A;}
|
||||
bool DDPRight() const {return x2d_b24_DPRight;}
|
||||
bool DDPLeft() const {return x2d_b26_DPLeft;}
|
||||
bool DDPDown() const {return x2d_b25_DPDown;}
|
||||
bool DDPUp() const {return x2c_b31_DPUp;}
|
||||
bool DRTrigger() const {return x1c_anaRightTrigger > 0.05f;}
|
||||
bool DLTrigger() const {return x18_anaLeftTrigger > 0.05f;}
|
||||
bool DRARight() const {return x10_anaRightX > 0.7f;}
|
||||
bool DRALeft() const {return x10_anaRightX < -0.7f;}
|
||||
bool DRADown() const {return x14_anaRightY < -0.7f;}
|
||||
bool DRAUp() const {return x14_anaRightY > 0.7f;}
|
||||
bool DLARight() const {return x8_anaLeftX > 0.7f;}
|
||||
bool DLALeft() const {return x8_anaLeftX < -0.7f;}
|
||||
bool DLADown() const {return xc_anaLeftY < -0.7f;}
|
||||
bool DLAUp() const {return xc_anaLeftY > 0.7f;}
|
||||
float AStart() const {return x2d_b27_Start ? 1.f : 0.f;}
|
||||
float AR() const {return x2c_b30_R ? 1.f : 0.f;}
|
||||
float AL() const {return x2c_b29_L ? 1.f : 0.f;}
|
||||
float AZ() const {return x2c_b28_Z ? 1.f : 0.f;}
|
||||
float AY() const {return x2c_b27_Y ? 1.f : 0.f;}
|
||||
float AX() const {return x2c_b26_X ? 1.f : 0.f;}
|
||||
float AB() const {return x2c_b25_B ? 1.f : 0.f;}
|
||||
float AA() const {return x2c_b24_A ? 1.f : 0.f;}
|
||||
float ADPRight() const {return x2d_b24_DPRight ? 1.f : 0.f;}
|
||||
float ADPLeft() const {return x2d_b26_DPLeft ? 1.f : 0.f;}
|
||||
float ADPDown() const {return x2d_b25_DPDown ? 1.f : 0.f;}
|
||||
float ADPUp() const {return x2c_b31_DPUp ? 1.f : 0.f;}
|
||||
float ARTrigger() const {return x1c_anaRightTrigger;}
|
||||
float ALTrigger() const {return x18_anaLeftTrigger;}
|
||||
float ARARight() const {return x10_anaRightX > 0.f ? x10_anaRightX : 0.f;}
|
||||
float ARALeft() const {return x10_anaRightX < 0.f ? -x10_anaRightX : 0.f;}
|
||||
float ARADown() const {return x14_anaRightY < 0.f ? -x14_anaRightY : 0.f;}
|
||||
float ARAUp() const {return x14_anaRightY > 0.f ? x14_anaRightY : 0.f;}
|
||||
float ALARight() const {return x8_anaLeftX > 0.f ? x8_anaLeftX : 0.f;}
|
||||
float ALALeft() const {return x8_anaLeftX < 0.f ? -x8_anaLeftX : 0.f;}
|
||||
float ALADown() const {return xc_anaLeftY < 0.f ? -xc_anaLeftY : 0.f;}
|
||||
float ALAUp() const {return xc_anaLeftY > 0.f ? xc_anaLeftY : 0.f;}
|
||||
bool PStart() const { return x2e_b31_PStart; }
|
||||
bool PR() const { return x2e_b26_PR; }
|
||||
bool PL() const { return x2e_b25_PL; }
|
||||
bool PZ() const { return x2e_b24_PZ; }
|
||||
bool PY() const { return x2d_b31_PY; }
|
||||
bool PX() const { return x2d_b30_PX; }
|
||||
bool PB() const { return x2d_b29_PB; }
|
||||
bool PA() const { return x2d_b28_PA; }
|
||||
bool PDPRight() const { return x2e_b28_PDPRight; }
|
||||
bool PDPLeft() const { return x2e_b30_PDPLeft; }
|
||||
bool PDPDown() const { return x2e_b29_PDPDown; }
|
||||
bool PDPUp() const { return x2e_b27_PDPUp; }
|
||||
bool PRTrigger() const { return x28_anaRightTriggerP; }
|
||||
bool PLTrigger() const { return x24_anaLeftTriggerP; }
|
||||
bool PRARight() const { return x22_enableAnaRightXP; }
|
||||
bool PRALeft() const { return x22_enableAnaRightNegXP; }
|
||||
bool PRADown() const { return x23_enableAnaRightNegYP; }
|
||||
bool PRAUp() const { return x23_enableAnaRightYP; }
|
||||
bool PLARight() const { return x20_enableAnaLeftXP; }
|
||||
bool PLALeft() const { return x20_enableAnaLeftNegXP; }
|
||||
bool PLADown() const { return x21_enableAnaLeftNegYP; }
|
||||
bool PLAUp() const { return x21_enableAnaLeftYP; }
|
||||
bool DStart() const { return x2d_b27_Start; }
|
||||
bool DR() const { return x2c_b30_R; }
|
||||
bool DL() const { return x2c_b29_L; }
|
||||
bool DZ() const { return x2c_b28_Z; }
|
||||
bool DY() const { return x2c_b27_Y; }
|
||||
bool DX() const { return x2c_b26_X; }
|
||||
bool DB() const { return x2c_b25_B; }
|
||||
bool DA() const { return x2c_b24_A; }
|
||||
bool DDPRight() const { return x2d_b24_DPRight; }
|
||||
bool DDPLeft() const { return x2d_b26_DPLeft; }
|
||||
bool DDPDown() const { return x2d_b25_DPDown; }
|
||||
bool DDPUp() const { return x2c_b31_DPUp; }
|
||||
bool DRTrigger() const { return x1c_anaRightTrigger > 0.05f; }
|
||||
bool DLTrigger() const { return x18_anaLeftTrigger > 0.05f; }
|
||||
bool DRARight() const { return x10_anaRightX > 0.7f; }
|
||||
bool DRALeft() const { return x10_anaRightX < -0.7f; }
|
||||
bool DRADown() const { return x14_anaRightY < -0.7f; }
|
||||
bool DRAUp() const { return x14_anaRightY > 0.7f; }
|
||||
bool DLARight() const { return x8_anaLeftX > 0.7f; }
|
||||
bool DLALeft() const { return x8_anaLeftX < -0.7f; }
|
||||
bool DLADown() const { return xc_anaLeftY < -0.7f; }
|
||||
bool DLAUp() const { return xc_anaLeftY > 0.7f; }
|
||||
float AStart() const { return x2d_b27_Start ? 1.f : 0.f; }
|
||||
float AR() const { return x2c_b30_R ? 1.f : 0.f; }
|
||||
float AL() const { return x2c_b29_L ? 1.f : 0.f; }
|
||||
float AZ() const { return x2c_b28_Z ? 1.f : 0.f; }
|
||||
float AY() const { return x2c_b27_Y ? 1.f : 0.f; }
|
||||
float AX() const { return x2c_b26_X ? 1.f : 0.f; }
|
||||
float AB() const { return x2c_b25_B ? 1.f : 0.f; }
|
||||
float AA() const { return x2c_b24_A ? 1.f : 0.f; }
|
||||
float ADPRight() const { return x2d_b24_DPRight ? 1.f : 0.f; }
|
||||
float ADPLeft() const { return x2d_b26_DPLeft ? 1.f : 0.f; }
|
||||
float ADPDown() const { return x2d_b25_DPDown ? 1.f : 0.f; }
|
||||
float ADPUp() const { return x2c_b31_DPUp ? 1.f : 0.f; }
|
||||
float ARTrigger() const { return x1c_anaRightTrigger; }
|
||||
float ALTrigger() const { return x18_anaLeftTrigger; }
|
||||
float ARARight() const { return x10_anaRightX > 0.f ? x10_anaRightX : 0.f; }
|
||||
float ARALeft() const { return x10_anaRightX < 0.f ? -x10_anaRightX : 0.f; }
|
||||
float ARADown() const { return x14_anaRightY < 0.f ? -x14_anaRightY : 0.f; }
|
||||
float ARAUp() const { return x14_anaRightY > 0.f ? x14_anaRightY : 0.f; }
|
||||
float ALARight() const { return x8_anaLeftX > 0.f ? x8_anaLeftX : 0.f; }
|
||||
float ALALeft() const { return x8_anaLeftX < 0.f ? -x8_anaLeftX : 0.f; }
|
||||
float ALADown() const { return xc_anaLeftY < 0.f ? -xc_anaLeftY : 0.f; }
|
||||
float ALAUp() const { return xc_anaLeftY > 0.f ? xc_anaLeftY : 0.f; }
|
||||
|
||||
float ALeftX() const {return x8_anaLeftX;}
|
||||
float ALeftY() const {return xc_anaLeftY;}
|
||||
float ARightX() const {return x10_anaRightX;}
|
||||
float ARightY() const {return x14_anaRightY;}
|
||||
float ALeftTrigger() const {return x18_anaLeftTrigger;}
|
||||
float ARightTrigger() const {return x1c_anaRightTrigger;}
|
||||
float ALeftX() const { return x8_anaLeftX; }
|
||||
float ALeftY() const { return xc_anaLeftY; }
|
||||
float ARightX() const { return x10_anaRightX; }
|
||||
float ARightY() const { return x14_anaRightY; }
|
||||
float ALeftTrigger() const { return x18_anaLeftTrigger; }
|
||||
float ARightTrigger() const { return x1c_anaRightTrigger; }
|
||||
|
||||
CFinalInput ScaleAnalogueSticks(float leftDiv, float rightDiv) const;
|
||||
CFinalInput ScaleAnalogueSticks(float leftDiv, float rightDiv) const;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
} // namespace urde
|
||||
|
||||
Reference in New Issue
Block a user