Compare commits
1 Commits
matcher/NH
...
cleanup/ww
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d6c755791 |
@@ -14994,8 +14994,8 @@ __vt__Q37ext_ead3www14SurfaceManager = .data:0x81643AA0; // type:object size:0xC
|
||||
@1183 = .data:0x81643AB8; // type:object size:0x21 scope:local data:string
|
||||
__vt__Q37ext_ead3www9ut_thread = .data:0x81643ADC; // type:object size:0x28
|
||||
lbl_81643B08 = .data:0x81643B08; // type:object size:0x38
|
||||
lbl_81643B40 = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
lbl_81643B5E = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
scWwwTexBufFmt = .data:0x81643B40; // type:object size:0x1E data:string
|
||||
scWwwNoBrowserWin = .data:0x81643B5E; // type:object size:0x24 data:string
|
||||
lbl_81643B82 = .data:0x81643B82; // type:object size:0x1B data:string
|
||||
lbl_81643B9D = .data:0x81643B9D; // type:object size:0x2B data:string
|
||||
lbl_81643BC8 = .data:0x81643BC8; // type:object size:0x12 data:string
|
||||
@@ -21589,7 +21589,7 @@ lbl_816962DB = .sdata:0x816962DB; // type:object size:0x8 data:string
|
||||
lbl_816962E3 = .sdata:0x816962E3; // type:object size:0x1
|
||||
lbl_816962E4 = .sdata:0x816962E4; // type:object size:0x8 data:string
|
||||
lbl_816962F0 = .sdata:0x816962F0; // type:object size:0x8 data:string
|
||||
lbl_816962F8 = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
scWwwErrorQ = .sdata:0x816962F8; // type:object size:0x8 data:string
|
||||
globalNames__Q23www9trasition = .sdata:0x81696300; // type:object size:0x8 scope:local
|
||||
@1425 = .sdata:0x81696308; // type:object size:0x1 scope:local
|
||||
gEnableDpd = .sdata:0x81696310; // type:object size:0x4 data:4byte
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
|
||||
T get() const {
|
||||
f32 var_f27 = mFrame;
|
||||
@@ -81,11 +81,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(unkVal0 *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -101,7 +101,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
@@ -109,8 +109,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
|
||||
template <>
|
||||
@@ -119,7 +119,7 @@ namespace ipl {
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD,
|
||||
void init(const f32& start, const f32& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD,
|
||||
f32 speed = 1.0f);
|
||||
|
||||
f32 get() const {
|
||||
@@ -132,10 +132,10 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(unkVal0 *
|
||||
(var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -144,8 +144,8 @@ namespace ipl {
|
||||
protected:
|
||||
f32 mStart;
|
||||
f32 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
|
||||
#pragma dont_instantiate HermiteIntp<float>
|
||||
@@ -155,12 +155,12 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
}
|
||||
|
||||
#ifdef IPL_SD_CHANNEL_SELECT_CPP
|
||||
@@ -176,9 +176,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -196,7 +196,7 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
|
||||
r = r + temp_f3;
|
||||
|
||||
@@ -213,15 +213,15 @@ namespace ipl {
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 =
|
||||
(mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
(unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) + (unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r = r + temp_f3;
|
||||
return r;*/
|
||||
}
|
||||
#endif
|
||||
|
||||
protected:
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -236,7 +236,7 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
virtual ~HermiteIntp();
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
void init(const VEC3& start, const VEC3& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f);
|
||||
VEC3 get() const {
|
||||
f32 frame = mFrame;
|
||||
f32 inverseDuration = 1.0f / mMaxFrame;
|
||||
@@ -249,9 +249,9 @@ namespace ipl {
|
||||
inverseDuration * (inverseDuration * (3.0f * frame * frame))));
|
||||
f32 frameSquared = frame * frame;
|
||||
f32 cubic = inverseDuration * (inverseDuration * (frame * frameSquared));
|
||||
f32 tangent = mStartTangent * (frame + (cubic -
|
||||
f32 tangent = unkVal0 * (frame + (cubic -
|
||||
inverseDuration * (2.0f * frame * frame))) +
|
||||
mEndTangent * (cubic - inverseDuration * frameSquared);
|
||||
unkVal1 * (cubic - inverseDuration * frameSquared);
|
||||
result.x += tangent;
|
||||
result.y += tangent;
|
||||
result.z += tangent;
|
||||
@@ -260,8 +260,8 @@ namespace ipl {
|
||||
protected:
|
||||
VEC3 mStart;
|
||||
VEC3 mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
@@ -371,9 +371,9 @@ static BOOL NHTTPi_RecvProxyConnectHeader(NHTTPThreadContext* context)
|
||||
response->httpStatus = NHTTPi_strToInt(header + 9, 3);
|
||||
if (NHTTPi_strnicmp(header, "HTTP/", 5) == 0 && header[8] == ' '
|
||||
&& response->httpStatus == 200) accepted = TRUE;
|
||||
ended = FALSE;
|
||||
cursor = header;
|
||||
index = 0;
|
||||
ended = FALSE;
|
||||
while (index < used)
|
||||
{
|
||||
if (index > 1 && cursor[-1] == '\r' && *cursor == '\r') ended = TRUE;
|
||||
|
||||
@@ -12,11 +12,11 @@ namespace ext_ead {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" char lbl_816962F8[] = "ERROR?\n";
|
||||
extern "C" char lbl_81643B40[] = " TextureBuffer_ %d:%d ptr:%p\n";
|
||||
extern "C" char lbl_81643B5E[] = "INFO: cannot create browser window\n";
|
||||
extern "C" char scWwwErrorQ[] = "ERROR?\n";
|
||||
extern "C" char scWwwTexBufFmt[] = " TextureBuffer_ %d:%d ptr:%p\n";
|
||||
extern "C" char scWwwNoBrowserWin[] = "INFO: cannot create browser window\n";
|
||||
|
||||
#define OSReport(...) OSReport(lbl_816962F8)
|
||||
#define OSReport(...) OSReport(scWwwErrorQ)
|
||||
#include "iplwww/www_window.h"
|
||||
#undef OSReport
|
||||
|
||||
@@ -76,12 +76,12 @@ namespace ext_ead {
|
||||
memset(mTexBufArr[i][j], 0, texBufSize);
|
||||
DCStoreRange(mTexBufArr[i][j], texBufSize);
|
||||
|
||||
print::IPLWWWReport(print::WWW_DEBUG, lbl_81643B40, j, i, mTexBufArr[i][j]);
|
||||
print::IPLWWWReport(print::WWW_DEBUG, scWwwTexBufFmt, j, i, mTexBufArr[i][j]);
|
||||
}
|
||||
}
|
||||
|
||||
if (WWWCreateBrowserWindow(mpBrowserThread->GetHandle(), &mpWwwWindow, 0)) {
|
||||
print::IPLWWWReport(print::WWW_WARNING, lbl_81643B5E);
|
||||
print::IPLWWWReport(print::WWW_WARNING, scWwwNoBrowserWin);
|
||||
return NULL;
|
||||
} else {
|
||||
WWWRect rect = {0, 0, 0, 0};
|
||||
|
||||
@@ -35,8 +35,8 @@ namespace ipl {
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27))))));
|
||||
f32 temp_f4 = var_f27 * var_f27;
|
||||
f32 temp_f7 = var_f28 * (var_f28 * (var_f27 * temp_f4));
|
||||
f32 temp_f3 = (mStartTangent * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * (temp_f7 - (var_f28 * temp_f4)));
|
||||
f32 temp_f3 = (unkVal0 * (var_f27 + (temp_f7 - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * (temp_f7 - (var_f28 * temp_f4)));
|
||||
r.x += temp_f3;
|
||||
r.y += temp_f3;
|
||||
r.z += temp_f3;
|
||||
@@ -51,8 +51,8 @@ namespace ipl {
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))))) -
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r += (mStartTangent * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
|
||||
r += (unkVal0 * (var_f27 + ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) - (var_f28 * (var_f27 * var_f27))));
|
||||
return r;
|
||||
}
|
||||
} // namespace math
|
||||
|
||||
@@ -53,10 +53,16 @@ void iplContest_813D54F8(BOOL success, NAT nat);
|
||||
void* IPLContestAlloc(int size);
|
||||
void IPLContestFree(void* block, u32 _unused);
|
||||
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes);
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes);
|
||||
void sNHTTPCleanupCallback();
|
||||
|
||||
void IPLContestInitialize(void* heapBuf, NCDProxyProfile* proxy) {
|
||||
char* pcVar1;
|
||||
char cVar2;
|
||||
char* pcVar3;
|
||||
char* pcVar4;
|
||||
int iVar5;
|
||||
|
||||
g_session.heapBuf = heapBuf;
|
||||
g_session.heap = MEMCreateExpHeapEx(heapBuf, 0x10000, 0);
|
||||
OSInitMutex(&g_session.mutex);
|
||||
@@ -410,9 +416,9 @@ void IPLContestFree(void* block, u32 _unused) {
|
||||
OSUnlockMutex(&g_session.mutex);
|
||||
}
|
||||
|
||||
void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
|
||||
void sNHTTPReqCallback(int param_1, NHTTPResponse* httpRes) {
|
||||
g_session.httpResponse = httpRes;
|
||||
if (error == 0) {
|
||||
if (param_1 == 0) {
|
||||
switch (NHTTPGetResultCode(httpRes)) {
|
||||
case 200: {
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_RECEIVED;
|
||||
@@ -434,7 +440,7 @@ void sNHTTPReqCallback(int error, NHTTPResponse* httpRes) {
|
||||
}
|
||||
|
||||
g_session.httpTestState = HTTP_TEST_RESPONSE_ERRORED;
|
||||
switch (error) {
|
||||
switch (param_1) {
|
||||
case 0x4: {
|
||||
g_session.errCode = g_session.errCode != 0 ? g_session.errCode : -52100;
|
||||
break;
|
||||
|
||||
@@ -234,10 +234,10 @@ namespace ipl {
|
||||
OSReport("NUP region code : %s\n", productAreaString);
|
||||
const char* isoCountryCode = SCUTILGetISOCountryCodeA2();
|
||||
OSReport("NUP country code : %s\n", isoCountryCode);
|
||||
int nupResult = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
int iVar8 = NUP_Start(mpNUPInstance, nus, isoCountryCode, productAreaString, 0);
|
||||
OSReport("NUP_Start()\n");
|
||||
if (nupResult < 0) {
|
||||
switch (nupResult) {
|
||||
if (iVar8 < 0) {
|
||||
switch (iVar8) {
|
||||
case -5000: {
|
||||
OSReport("FAIL ALLOC\n");
|
||||
}
|
||||
@@ -426,8 +426,8 @@ namespace ipl {
|
||||
int val;
|
||||
int len = 4;
|
||||
if (SOGetInterfaceOpt(NULL, SO_SOL_CONFIG, SO_CONFIG_ERROR, &val, &len) == 0 && val == -111) {
|
||||
int startupErr = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-startupErr / 100) * 100;
|
||||
int iVar7 = NETGetStartupErrorCode(-111);
|
||||
mNetSetupLastErr = (-iVar7 / 100) * 100;
|
||||
mNetSetupLastErr = mNetSetup.getconntype();
|
||||
}
|
||||
Setting* settingScene = (Setting*)System::getScene(SCENE_SETTING);
|
||||
@@ -451,6 +451,8 @@ namespace ipl {
|
||||
}
|
||||
|
||||
void* NakamuraTest::conntestthread(void*) {
|
||||
int iVar1;
|
||||
|
||||
IPLContestStart();
|
||||
while (true) {
|
||||
switch (IPLContestProcess()) {
|
||||
|
||||
@@ -46,12 +46,12 @@ namespace ipl {
|
||||
public:
|
||||
HermiteIntp() {}
|
||||
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 startTangent, f32 endTangent, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
void init(const T& start, const T& end, f32 maxFrame, f32 param_5, f32 param_6, int playback = ANIM_TYPE_FORWARD, f32 speed = 1.0f) {
|
||||
mStart = start;
|
||||
mEnd = end;
|
||||
utility::FrameController::init(playback, maxFrame, 0.0f, speed);
|
||||
mStartTangent = startTangent;
|
||||
mEndTangent = endTangent;
|
||||
unkVal0 = param_5;
|
||||
unkVal1 = param_6;
|
||||
}
|
||||
|
||||
T get() const {
|
||||
@@ -64,11 +64,11 @@ namespace ipl {
|
||||
(mEnd * ((var_f28 * (var_f28 * (var_f28 * (var_f27 * (2.0f * var_f27 * var_f27))))) -
|
||||
(var_f28 * (var_f28 * (3.0f * var_f27 * var_f27)))));
|
||||
r +=
|
||||
(mStartTangent *
|
||||
(unkVal0 *
|
||||
(var_f27 +
|
||||
((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (2.0f * var_f27 * var_f27))))) +
|
||||
(mEndTangent * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(unkVal1 * ((var_f28 * (var_f28 * (var_f27 * (var_f27 * var_f27)))) -
|
||||
(var_f28 * (var_f27 * var_f27))));
|
||||
|
||||
return r;
|
||||
@@ -77,8 +77,8 @@ namespace ipl {
|
||||
protected:
|
||||
T mStart;
|
||||
T mEnd;
|
||||
f32 mStartTangent;
|
||||
f32 mEndTangent;
|
||||
f32 unkVal0;
|
||||
f32 unkVal1;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user