Compare commits
3 Commits
agent/fix/
...
agent/w092
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
599d41bda7 | ||
|
|
782983dfe1 | ||
|
|
cc2887e52e |
@@ -624,8 +624,8 @@ config.libs = [
|
||||
Object(Matching, "system/rvl_dec.c"),
|
||||
Object(Matching, "system/RIPL_BoardRecord.c"),
|
||||
Object(Matching, "system/iplSystem.cpp"),
|
||||
Object(NonMatching, "system/iplController.cpp"),
|
||||
Object(NonMatching, "system/iplControllerManager.cpp"),
|
||||
Object(Matching, "system/iplController.cpp"),
|
||||
Object(Matching, "system/iplControllerManager.cpp"),
|
||||
Object(Matching, "system/iplChannelManager.cpp"),
|
||||
Object(Matching, "system/iplChannelScriptManager.cpp"),
|
||||
Object(Matching, "system/iplNand.cpp"),
|
||||
|
||||
@@ -63,10 +63,14 @@ namespace ipl {
|
||||
// clang-format on
|
||||
|
||||
#ifdef IPL_CONTROLLER_NATIVE_HIERARCHY
|
||||
#ifdef IPL_CONTROLLER_OUT_OF_LINE_INTERFACE
|
||||
#define IPL_CONTROLLER_DEFAULT_VIRTUAL(signature, implementation) virtual signature;
|
||||
#else
|
||||
#ifdef IPL_CONTROLLER_INLINE_INTERFACE
|
||||
#define IPL_CONTROLLER_DEFAULT_VIRTUAL(signature, implementation) virtual signature implementation
|
||||
#else
|
||||
#define IPL_CONTROLLER_DEFAULT_VIRTUAL(signature, implementation) virtual signature;
|
||||
#endif
|
||||
#endif
|
||||
class Interface {
|
||||
public:
|
||||
@@ -79,7 +83,7 @@ namespace ipl {
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinch() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinchTrg() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int pinchOffTrg() const, { return 0; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(int decide() const, { return 0; })
|
||||
virtual int decide() const = 0;
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(bool repeat(u32 button) const, { return false; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(BOOL rumble(int type = 0), { return FALSE; })
|
||||
IPL_CONTROLLER_DEFAULT_VIRTUAL(void cancelRumbling(), { })
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
|
||||
#define IPL_CONTROLLER_NATIVE_HIERARCHY
|
||||
#define IPL_CONTROLLER_INLINE_INTERFACE
|
||||
#define IPL_CONTROLLER_OUT_OF_LINE_INTERFACE
|
||||
#include "system/iplController.h"
|
||||
#undef IPL_CONTROLLER_OUT_OF_LINE_INTERFACE
|
||||
#undef IPL_CONTROLLER_INLINE_INTERFACE
|
||||
#undef IPL_CONTROLLER_NATIVE_HIERARCHY
|
||||
#include "system/iplSystem.h"
|
||||
@@ -91,6 +93,21 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
}
|
||||
bool ipl::controller::Interface::isValidBtn() const {
|
||||
return false;
|
||||
}
|
||||
bool ipl::controller::Interface::downTrg(u32 button) const {
|
||||
return false;
|
||||
}
|
||||
int ipl::controller::Interface::pinch() const {
|
||||
return 0;
|
||||
}
|
||||
bool ipl::controller::Interface::down(u32 button) const {
|
||||
return false;
|
||||
}
|
||||
KPADStatus* ipl::controller::Interface::getKPADStatus() const {
|
||||
return NULL;
|
||||
}
|
||||
int ipl::controller::Base::decide() const {
|
||||
return unk_0x08 == 5;
|
||||
}
|
||||
@@ -325,9 +342,15 @@ namespace ipl {
|
||||
bool ipl::controller::Master::upTrg(u32 button) const {
|
||||
return call(button, kUpTrgMember);
|
||||
}
|
||||
bool ipl::controller::Interface::upTrg(u32 button) const {
|
||||
return false;
|
||||
}
|
||||
bool ipl::controller::Master::repeat(u32 button) const {
|
||||
return call(button, kRepeatMember);
|
||||
}
|
||||
bool ipl::controller::Interface::repeat(u32 button) const {
|
||||
return false;
|
||||
}
|
||||
int ipl::controller::Master::decide() const {
|
||||
bool current = false;
|
||||
bool ret = false;
|
||||
@@ -365,6 +388,71 @@ void ipl::controller::Master::setForceInvalid(bool flag) {
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
void ipl::controller::Interface::read() {}
|
||||
int ipl::controller::Interface::getSubStickY() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getSubStickX() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getMainStickY() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getMainStickX() const {
|
||||
return 0;
|
||||
}
|
||||
bool ipl::controller::Interface::isValidDpd() const {
|
||||
return false;
|
||||
}
|
||||
PADStatus* ipl::controller::Interface::getPADStatus() const {
|
||||
return NULL;
|
||||
}
|
||||
f32 ipl::controller::Interface::getDpdDistance() const {
|
||||
return 0.0f;
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Interface::getHorizon() const {
|
||||
return ipl::math::VEC2(0.0f, 0.0f);
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Interface::getDpdProjectionPos() const {
|
||||
return ipl::math::VEC2(0.0f, 0.0f);
|
||||
}
|
||||
ipl::math::VEC2 ipl::controller::Interface::getDpdPos() const {
|
||||
return ipl::math::VEC2(0.0f, 0.0f);
|
||||
}
|
||||
int ipl::controller::Interface::getClassicReleaseFlag() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getClassicTrigFlag() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getClassicHoldFlag() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getReleaseFlag() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getTrigFlag() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getHoldFlag() const {
|
||||
return 0;
|
||||
}
|
||||
void ipl::controller::Interface::cancelRumbling() {}
|
||||
BOOL ipl::controller::Interface::rumble(int type) {
|
||||
return FALSE;
|
||||
}
|
||||
int ipl::controller::Interface::pinchOffTrg() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::pinchTrg() const {
|
||||
return 0;
|
||||
}
|
||||
int ipl::controller::Interface::getChannel() const {
|
||||
return -1;
|
||||
}
|
||||
int ipl::controller::Interface::getType() const {
|
||||
return -1;
|
||||
}
|
||||
void ipl::controller::Base::setForceInvalid(bool flag) {
|
||||
unk_0x1C = flag;
|
||||
}
|
||||
|
||||
@@ -98,11 +98,7 @@ namespace ipl {
|
||||
probe_valid:
|
||||
{
|
||||
s32 read = KPADRead(chan, &mKPADStatus[chan], 1);
|
||||
if (read > 0) {
|
||||
if (mKPADStatus[chan].wpad_err == -4 || deviceType == 0xfd) {
|
||||
goto store_null;
|
||||
}
|
||||
|
||||
if (read > 0 && mKPADStatus[chan].wpad_err != -4 && deviceType != 0xfd) {
|
||||
mInvalidCount[chan] = 0;
|
||||
if (mKPADStatus[chan].wpad_err == -7 || deviceType == 0 || deviceType == 0xfb ||
|
||||
deviceType == 0xfc || deviceType == 0xff) {
|
||||
@@ -120,7 +116,10 @@ namespace ipl {
|
||||
} else {
|
||||
mControllers[chan] = NULL;
|
||||
}
|
||||
} else if (read == 0) {
|
||||
} else {
|
||||
if (read != 0) {
|
||||
goto store_null;
|
||||
}
|
||||
mInvalidCount[chan]++;
|
||||
if (mInvalidCount[chan] > 0x3c) {
|
||||
mInvalidCount[chan] = 0x3c;
|
||||
@@ -129,8 +128,6 @@ namespace ipl {
|
||||
}
|
||||
mControllers[chan] = NULL;
|
||||
}
|
||||
} else {
|
||||
goto store_null;
|
||||
}
|
||||
}
|
||||
goto channel_done;
|
||||
|
||||
Reference in New Issue
Block a user