Compare commits

...

1 Commits

Author SHA1 Message Date
coah
f7d1a7f211 cleanup(iplController): name decide/pinch/kpad/classic fields
unk_0x08 -> mDecideHoldCount
unk_0x1C -> mbForceInvalid
unk_0x1D -> mbPinching
unk_0x1E -> mbWasPinching
unk_0x20 -> mpKpadStatus
unk_0x24 -> mClassicCursorPos
unk_0x2C -> mClassicCursorTimer

Also update iplControllerManager ctor inits for Base fields.

Matching 100% before/after; DOL sha1 unchanged.
2026-10-02 14:09:29 -05:00
3 changed files with 93 additions and 93 deletions

View File

@@ -118,26 +118,26 @@ namespace ipl {
public: public:
Base(int chan, KPADStatus& status) { Base(int chan, KPADStatus& status) {
mButton = 0; mButton = 0;
unk_0x08 = 0; mDecideHoldCount = 0;
mLastRumbleTime = 0; mLastRumbleTime = 0;
mRumbleType = -1; mRumbleType = -1;
mChan = chan; mChan = chan;
mType = 2; mType = 2;
unk_0x1C = 0; mbForceInvalid = 0;
KPADEnableDPD(chan); KPADEnableDPD(chan);
unk_0x1D = 0; mbPinching = 0;
unk_0x1E = 0; mbWasPinching = 0;
unk_0x20 = &status; mpKpadStatus = &status;
} }
Base(int chan, int type, KPADStatus& status) { Base(int chan, int type, KPADStatus& status) {
mButton = 0; mButton = 0;
unk_0x08 = 0; mDecideHoldCount = 0;
mLastRumbleTime = 0; mLastRumbleTime = 0;
mRumbleType = -1; mRumbleType = -1;
mChan = chan; mChan = chan;
mType = type; mType = type;
unk_0x1C = 0; mbForceInvalid = 0;
KPADEnableDPD(chan); KPADEnableDPD(chan);
} }
@@ -152,15 +152,15 @@ namespace ipl {
protected: protected:
u8 mButton; u8 mButton;
u32 unk_0x08; u32 mDecideHoldCount;
OSTick mLastRumbleTime; OSTick mLastRumbleTime;
s32 mRumbleType; s32 mRumbleType;
u32 mChan; u32 mChan;
u32 mType; u32 mType;
u8 unk_0x1C; u8 mbForceInvalid;
u8 unk_0x1D; u8 mbPinching;
u8 unk_0x1E; u8 mbWasPinching;
KPADStatus* unk_0x20; KPADStatus* mpKpadStatus;
}; };
class Revolution : public Base { class Revolution : public Base {
@@ -206,8 +206,8 @@ namespace ipl {
virtual BOOL isValidDpdClassic() const; virtual BOOL isValidDpdClassic() const;
private: private:
math::VEC2 unk_0x24; math::VEC2 mClassicCursorPos;
int unk_0x2C; int mClassicCursorTimer;
}; };
class Master : public Interface { class Master : public Interface {
@@ -264,18 +264,18 @@ namespace ipl {
public: public:
Base(int chan, KPADStatus& arg1) { Base(int chan, KPADStatus& arg1) {
mButton = 0; mButton = 0;
unk_0x08 = 0; mDecideHoldCount = 0;
mLastRumbleTime = 0; mLastRumbleTime = 0;
mRumbleType = -1; mRumbleType = -1;
mChan = chan; mChan = chan;
mType = 2; mType = 2;
unk_0x1C = 0; mbForceInvalid = 0;
KPADEnableDPD(chan); KPADEnableDPD(chan);
unk_0x1D = 0; mbPinching = 0;
unk_0x1E = 0; mbWasPinching = 0;
unk_0x20 = &arg1; mpKpadStatus = &arg1;
} }
virtual ~Base(); // 0x08 virtual ~Base(); // 0x08
@@ -326,15 +326,15 @@ namespace ipl {
// protected: // protected:
u8 mButton; // 0x4 u8 mButton; // 0x4
u32 unk_0x08; // 0x8 u32 mDecideHoldCount; // 0x8
OSTick mLastRumbleTime; // 0xC OSTick mLastRumbleTime; // 0xC
s32 mRumbleType; // 0x10 s32 mRumbleType; // 0x10
u32 mChan; // 0x14 u32 mChan; // 0x14
u32 mType; // 0x18 u32 mType; // 0x18
u8 unk_0x1C; u8 mbForceInvalid;
u8 unk_0x1D; // 0x1D u8 mbPinching; // 0x1D
u8 unk_0x1E; // 0x1E u8 mbWasPinching; // 0x1E
KPADStatus* unk_0x20; // 0x20 KPADStatus* mpKpadStatus; // 0x20
}; };
class Interface : public Base { class Interface : public Base {
@@ -446,8 +446,8 @@ namespace ipl {
virtual BOOL isValidDpdClassic() const; // 0x8C virtual BOOL isValidDpdClassic() const; // 0x8C
private: private:
math::VEC2 unk_0x24; math::VEC2 mClassicCursorPos;
int unk_0x2C; int mClassicCursorTimer;
}; };
class Manager { class Manager {

View File

@@ -46,17 +46,17 @@ namespace ipl {
} }
if (mButton != 0) { if (mButton != 0) {
if (down(BTN_INTERACT)) { if (down(BTN_INTERACT)) {
unk_0x08++; mDecideHoldCount++;
} else { } else {
unk_0x08 = 0; mDecideHoldCount = 0;
mButton = 0; mButton = 0;
} }
} else { } else {
unk_0x08 = 0; mDecideHoldCount = 0;
} }
} else { } else {
mButton = 0; mButton = 0;
unk_0x08 = 0; mDecideHoldCount = 0;
} }
switch (mRumbleType) { switch (mRumbleType) {
@@ -109,7 +109,7 @@ namespace ipl {
return NULL; return NULL;
} }
int ipl::controller::Base::decide() const { int ipl::controller::Base::decide() const {
return unk_0x08 == 5; return mDecideHoldCount == 5;
} }
int ipl::controller::Base::rumble(int type) { int ipl::controller::Base::rumble(int type) {
int ret = FALSE; int ret = FALSE;
@@ -130,44 +130,44 @@ namespace ipl {
} }
void ipl::controller::Revolution::read() { void ipl::controller::Revolution::read() {
if (!isValidDpd()) { if (!isValidDpd()) {
unk_0x20->pos.y = 1.0f / 0.0f; mpKpadStatus->pos.y = 1.0f / 0.0f;
unk_0x20->pos.x = 1.0f / 0.0f; mpKpadStatus->pos.x = 1.0f / 0.0f;
unk_0x20->speed = 0.0f; mpKpadStatus->speed = 0.0f;
unk_0x20->vec.y = 0.0f; mpKpadStatus->vec.y = 0.0f;
unk_0x20->vec.x = 0.0f; mpKpadStatus->vec.x = 0.0f;
} }
unk_0x1E = unk_0x1D; mbWasPinching = mbPinching;
if (isValidBtn()) { if (isValidBtn()) {
if (unk_0x1E == 0) { if (mbWasPinching == 0) {
if (down(0x800) && down(0x400)) { if (down(0x800) && down(0x400)) {
unk_0x1D = 1; mbPinching = 1;
} }
} else if (!down(0x800) || !down(0x400)) { } else if (!down(0x800) || !down(0x400)) {
unk_0x1D = 0; mbPinching = 0;
} }
} else { } else {
unk_0x1D = 0; mbPinching = 0;
} }
Base::read(); Base::read();
} }
bool ipl::controller::Revolution::isValidDpd() const { bool ipl::controller::Revolution::isValidDpd() const {
if (unk_0x1C != 0) { if (mbForceInvalid != 0) {
return false; return false;
} }
return (unk_0x20->wpad_err == 0 || unk_0x20->wpad_err == -7) && unk_0x20->dpd_valid_fg != 0; return (mpKpadStatus->wpad_err == 0 || mpKpadStatus->wpad_err == -7) && mpKpadStatus->dpd_valid_fg != 0;
} }
bool ipl::controller::Revolution::isValidBtn() const { bool ipl::controller::Revolution::isValidBtn() const {
u8 val = unk_0x20->wpad_err; u8 val = mpKpadStatus->wpad_err;
return (u8)(val + 7) <= 7 && ((1 << (val + 7)) & 0xA1) != 0; return (u8)(val + 7) <= 7 && ((1 << (val + 7)) & 0xA1) != 0;
} }
bool ipl::controller::Revolution::down(u32 mButton) const { bool ipl::controller::Revolution::down(u32 mButton) const {
bool ret = false; bool ret = false;
if (isValidBtn()) { if (isValidBtn()) {
if (unk_0x20->hold & (mButton & 0xFFFF)) { if (mpKpadStatus->hold & (mButton & 0xFFFF)) {
ret = true; ret = true;
} }
} }
@@ -177,7 +177,7 @@ namespace ipl {
ipl::math::VEC2 ipl::controller::Revolution::getDpdProjectionPos() const { ipl::math::VEC2 ipl::controller::Revolution::getDpdProjectionPos() const {
math::VEC2 ret; math::VEC2 ret;
Vec2 dest; Vec2 dest;
Vec2 src = {unk_0x20->pos.x, unk_0x20->pos.y}; Vec2 src = {mpKpadStatus->pos.x, mpKpadStatus->pos.y};
nw4r::ut::Rect nw4r_rect; // constructor shouldn't be inlined nw4r::ut::Rect nw4r_rect; // constructor shouldn't be inlined
Rect kpad_rect; Rect kpad_rect;
@@ -216,9 +216,9 @@ namespace ipl {
y = fy; y = fy;
} }
ipl::controller::Classic::Classic(int arg0, KPADStatus& arg1) : Revolution(arg0, arg1) { ipl::controller::Classic::Classic(int arg0, KPADStatus& arg1) : Revolution(arg0, arg1) {
unk_0x24.x = 0.01f; mClassicCursorPos.x = 0.01f;
unk_0x24.y = 0.01f; mClassicCursorPos.y = 0.01f;
unk_0x2C = 0; mClassicCursorTimer = 0;
} }
ipl::controller::Base::~Base() { ipl::controller::Base::~Base() {
} }
@@ -230,32 +230,32 @@ namespace ipl {
} }
void ipl::controller::Classic::read() { void ipl::controller::Classic::read() {
if (!Revolution::isValidDpd()) { if (!Revolution::isValidDpd()) {
math::VEC2 lstick(unk_0x20->ex_status.cl.lstick.x, unk_0x20->ex_status.cl.lstick.y); math::VEC2 lstick(mpKpadStatus->ex_status.cl.lstick.x, mpKpadStatus->ex_status.cl.lstick.y);
if (lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f) { if (lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f) {
unk_0x24.x = math::abs_clamp(unk_0x24.x + unk_0x20->ex_status.cl.lstick.x * 0.05f, 1.8f); mClassicCursorPos.x = math::abs_clamp(mClassicCursorPos.x + mpKpadStatus->ex_status.cl.lstick.x * 0.05f, 1.8f);
unk_0x24.y = math::abs_clamp(unk_0x24.y - unk_0x20->ex_status.cl.lstick.y * 0.05f, 1.2f); mClassicCursorPos.y = math::abs_clamp(mClassicCursorPos.y - mpKpadStatus->ex_status.cl.lstick.y * 0.05f, 1.2f);
} }
math::VEC2 rstick = math::VEC2(unk_0x20->ex_status.cl.rstick.x, unk_0x20->ex_status.cl.rstick.y); math::VEC2 rstick = math::VEC2(mpKpadStatus->ex_status.cl.rstick.x, mpKpadStatus->ex_status.cl.rstick.y);
if (getClassicHoldFlag() != 0 || lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f || if (getClassicHoldFlag() != 0 || lstick.x * lstick.x + lstick.y * lstick.y > 0.0036f ||
rstick.x * rstick.x + rstick.y * rstick.y > 0.0036f) { rstick.x * rstick.x + rstick.y * rstick.y > 0.0036f) {
unk_0x2C = 180; mClassicCursorTimer = 180;
} }
if (--unk_0x2C < 0) { if (--mClassicCursorTimer < 0) {
unk_0x2C = 0; mClassicCursorTimer = 0;
} }
} else { } else {
unk_0x24.y = 0.01f; mClassicCursorPos.y = 0.01f;
unk_0x24.x = 0.01f; mClassicCursorPos.x = 0.01f;
unk_0x2C = 0; mClassicCursorTimer = 0;
} }
Revolution::read(); Revolution::read();
} }
int ipl::controller::Classic::getClassicHoldFlag() const { int ipl::controller::Classic::getClassicHoldFlag() const {
return unk_0x20->ex_status.cl.hold; return mpKpadStatus->ex_status.cl.hold;
} }
template <> template <>
f32 ipl::math::abs_clamp<f32>(const f32& x, const f32& y) { f32 ipl::math::abs_clamp<f32>(const f32& x, const f32& y) {
@@ -270,7 +270,7 @@ namespace ipl {
ipl::math::VEC2 ipl::controller::Classic::getHorizon() const { ipl::math::VEC2 ipl::controller::Classic::getHorizon() const {
math::VEC2 ret; math::VEC2 ret;
if (Revolution::isValidDpd()) { if (Revolution::isValidDpd()) {
ret.set(unk_0x20->horizon.x, unk_0x20->horizon.y); ret.set(mpKpadStatus->horizon.x, mpKpadStatus->horizon.y);
} else { } else {
ret.x = 1.0f; ret.x = 1.0f;
ret.y = -0.2679492f; ret.y = -0.2679492f;
@@ -280,9 +280,9 @@ namespace ipl {
ipl::math::VEC2 ipl::controller::Classic::getDpdPos() const { ipl::math::VEC2 ipl::controller::Classic::getDpdPos() const {
math::VEC2 ret; math::VEC2 ret;
if (Revolution::isValidDpd()) { if (Revolution::isValidDpd()) {
ret.set(unk_0x20->pos.x, unk_0x20->pos.y); ret.set(mpKpadStatus->pos.x, mpKpadStatus->pos.y);
} else if (unk_0x2C != 0) { } else if (mClassicCursorTimer != 0) {
ret = unk_0x24; ret = mClassicCursorPos;
} else { } else {
ret.x = (1.0f / 0.0f); ret.x = (1.0f / 0.0f);
ret.y = (1.0f / 0.0f); ret.y = (1.0f / 0.0f);
@@ -296,9 +296,9 @@ namespace ipl {
ipl::math::VEC2 ipl::controller::Classic::getDpdProjectionPos() const { ipl::math::VEC2 ipl::controller::Classic::getDpdProjectionPos() const {
math::VEC2 ret; math::VEC2 ret;
if (Revolution::isValidDpd()) { if (Revolution::isValidDpd()) {
ret.set(unk_0x20->pos.x, unk_0x20->pos.y); ret.set(mpKpadStatus->pos.x, mpKpadStatus->pos.y);
} else if (unk_0x2C != 0) { } else if (mClassicCursorTimer != 0) {
ret = unk_0x24; ret = mClassicCursorPos;
} else { } else {
ret.set(1.0f / 0.0f, 1.0f / 0.0f); ret.set(1.0f / 0.0f, 1.0f / 0.0f);
} }
@@ -454,7 +454,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
return -1; return -1;
} }
void ipl::controller::Base::setForceInvalid(bool flag) { void ipl::controller::Base::setForceInvalid(bool flag) {
unk_0x1C = flag; mbForceInvalid = flag;
} }
int ipl::controller::Base::getType() const { int ipl::controller::Base::getType() const {
return mType; return mType;
@@ -463,65 +463,65 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
return mChan; return mChan;
} }
KPADStatus* ipl::controller::Revolution::getKPADStatus() const { KPADStatus* ipl::controller::Revolution::getKPADStatus() const {
return unk_0x20; return mpKpadStatus;
} }
f32 ipl::controller::Revolution::getDpdDistance() const { f32 ipl::controller::Revolution::getDpdDistance() const {
return unk_0x20->dist; return mpKpadStatus->dist;
} }
int ipl::controller::Revolution::getReleaseFlag() const { int ipl::controller::Revolution::getReleaseFlag() const {
return unk_0x20->release; return mpKpadStatus->release;
} }
int ipl::controller::Revolution::getTrigFlag() const { int ipl::controller::Revolution::getTrigFlag() const {
return unk_0x20->trig; return mpKpadStatus->trig;
} }
int ipl::controller::Revolution::getHoldFlag() const { int ipl::controller::Revolution::getHoldFlag() const {
return unk_0x20->hold; return mpKpadStatus->hold;
} }
int ipl::controller::Revolution::pinchOffTrg() const { int ipl::controller::Revolution::pinchOffTrg() const {
int ret = 0; int ret = 0;
if (isValidBtn() && unk_0x1D == 0 && unk_0x1E != 0) { if (isValidBtn() && mbPinching == 0 && mbWasPinching != 0) {
ret = 1; ret = 1;
} }
return ret; return ret;
} }
int ipl::controller::Revolution::pinch() const { int ipl::controller::Revolution::pinch() const {
int ret = 0; int ret = 0;
if (isValidBtn() && unk_0x1D != 0) { if (isValidBtn() && mbPinching != 0) {
ret = 1; ret = 1;
} }
return ret; return ret;
} }
int ipl::controller::Revolution::pinchTrg() const { int ipl::controller::Revolution::pinchTrg() const {
int ret = 0; int ret = 0;
if (isValidBtn() && unk_0x1D != 0 && unk_0x1E == 0) { if (isValidBtn() && mbPinching != 0 && mbWasPinching == 0) {
ret = 1; ret = 1;
} }
return ret; return ret;
} }
bool ipl::controller::Revolution::repeat(u32 button) const { bool ipl::controller::Revolution::repeat(u32 button) const {
return down(button) && (unk_0x20->hold & 0x80000000) != 0; return down(button) && (mpKpadStatus->hold & 0x80000000) != 0;
} }
BOOL ipl::controller::Classic::isValidDpdClassic() const { BOOL ipl::controller::Classic::isValidDpdClassic() const {
return unk_0x2C != 0; return mClassicCursorTimer != 0;
} }
bool ipl::controller::Classic::isValidDpd() const { bool ipl::controller::Classic::isValidDpd() const {
if (unk_0x1C != 0) { if (mbForceInvalid != 0) {
return false; return false;
} }
return (Revolution::isValidDpd() != 0) || (unk_0x2C != 0); return (Revolution::isValidDpd() != 0) || (mClassicCursorTimer != 0);
} }
int ipl::controller::Classic::getClassicReleaseFlag() const { int ipl::controller::Classic::getClassicReleaseFlag() const {
return unk_0x20->ex_status.cl.release; return mpKpadStatus->ex_status.cl.release;
} }
int ipl::controller::Classic::getClassicTrigFlag() const { int ipl::controller::Classic::getClassicTrigFlag() const {
return unk_0x20->ex_status.cl.trig; return mpKpadStatus->ex_status.cl.trig;
} }
bool ipl::controller::Classic::upTrg(u32 button) const { bool ipl::controller::Classic::upTrg(u32 button) const {
bool ret = false; bool ret = false;
if (isValidBtn()) { if (isValidBtn()) {
bool pressed = true; bool pressed = true;
KPADStatus* status = unk_0x20; KPADStatus* status = mpKpadStatus;
if ((status->release & (button & 0xFFFF)) == 0) { if ((status->release & (button & 0xFFFF)) == 0) {
if ((status->ex_status.cl.release & (button >> 16)) == 0) { if ((status->ex_status.cl.release & (button >> 16)) == 0) {
pressed = false; pressed = false;
@@ -537,7 +537,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
bool ret = false; bool ret = false;
if (isValidBtn()) { if (isValidBtn()) {
bool pressed = true; bool pressed = true;
KPADStatus* status = unk_0x20; KPADStatus* status = mpKpadStatus;
if ((status->trig & (button & 0xFFFF)) == 0) { if ((status->trig & (button & 0xFFFF)) == 0) {
if ((status->ex_status.cl.trig & (button >> 16)) == 0) { if ((status->ex_status.cl.trig & (button >> 16)) == 0) {
pressed = false; pressed = false;
@@ -553,8 +553,8 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
bool ret = false; bool ret = false;
if (isValidBtn()) { if (isValidBtn()) {
bool pressed = true; bool pressed = true;
if ((unk_0x20->hold & (button & 0xFFFF)) == 0) { if ((mpKpadStatus->hold & (button & 0xFFFF)) == 0) {
if ((unk_0x20->ex_status.cl.hold & (button >> 16)) == 0) { if ((mpKpadStatus->ex_status.cl.hold & (button >> 16)) == 0) {
pressed = false; pressed = false;
} }
} }
@@ -565,15 +565,15 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
return ret; return ret;
} }
ipl::math::VEC2 ipl::controller::Revolution::getHorizon() const { ipl::math::VEC2 ipl::controller::Revolution::getHorizon() const {
return math::VEC2(unk_0x20->horizon.x, unk_0x20->horizon.y); return math::VEC2(mpKpadStatus->horizon.x, mpKpadStatus->horizon.y);
} }
ipl::math::VEC2 ipl::controller::Revolution::getDpdPos() const { ipl::math::VEC2 ipl::controller::Revolution::getDpdPos() const {
return math::VEC2(unk_0x20->pos.x, unk_0x20->pos.y); return math::VEC2(mpKpadStatus->pos.x, mpKpadStatus->pos.y);
} }
bool ipl::controller::Revolution::upTrg(u32 button) const { bool ipl::controller::Revolution::upTrg(u32 button) const {
bool ret = false; bool ret = false;
if (isValidBtn()) { if (isValidBtn()) {
if (unk_0x20->release & (button & 0xFFFF)) { if (mpKpadStatus->release & (button & 0xFFFF)) {
ret = true; ret = true;
} }
} }
@@ -582,7 +582,7 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
bool ipl::controller::Revolution::downTrg(u32 button) const { bool ipl::controller::Revolution::downTrg(u32 button) const {
bool ret = false; bool ret = false;
if (isValidBtn()) { if (isValidBtn()) {
if (unk_0x20->trig & (button & 0xFFFF)) { if (mpKpadStatus->trig & (button & 0xFFFF)) {
ret = true; ret = true;
} }
} }

View File

@@ -152,9 +152,9 @@ namespace ipl {
} }
Revolution::Revolution(int chan, int type, KPADStatus& status) : Base(chan, type, status) { Revolution::Revolution(int chan, int type, KPADStatus& status) : Base(chan, type, status) {
unk_0x1D = 0; mbPinching = 0;
unk_0x1E = 0; mbWasPinching = 0;
unk_0x20 = &status; mpKpadStatus = &status;
} }
Interface* Manager::getMasterController() { Interface* Manager::getMasterController() {