d_file_select::dFile_select3D_c (#1899)

This commit is contained in:
Jcw87
2023-08-27 20:09:20 -07:00
committed by GitHub
parent d369e2908c
commit 6a4e50e74b
9 changed files with 228 additions and 164 deletions
@@ -34,6 +34,10 @@ public:
J3DModel() {
initialize();
}
J3DModel(J3DModelData* param_0, u32 param_1, u32 param_2) {
initialize();
entryModelData(param_0, param_1, param_2);
}
/* 800CFFF4 */ void setBaseTRMtx(f32 (*)[4]);
/* 80327100 */ void initialize();
@@ -10,6 +10,8 @@ struct J3DAnmBase;
struct J3DAnmLoaderDataBase {
/* 80337B40 */ static void* load(void const*, J3DAnmLoaderDataBaseFlag);
/* 80338134 */ static void setResource(J3DAnmBase*, void const*);
static void* load(void const* param_0) { return load(param_0, J3DLOADER_UNK_FLAG0); }
};
#endif /* J3DANMLOADER_H */
+5 -8
View File
@@ -20,7 +20,7 @@ public:
class dFile_select3D_c {
public:
/* 801902F0 */ dFile_select3D_c();
/* 80190380 */ ~dFile_select3D_c();
/* 80190380 */ /* virtual */ ~dFile_select3D_c();
/* 801903DC */ void _create(u8, u8);
/* 8019049C */ void _delete();
/* 801904A0 */ void freeHeap();
@@ -33,7 +33,7 @@ public:
/* 80190BA8 */ void createMaskModel();
/* 80190D68 */ void createMirrorModel();
/* 80190FE8 */ void toItem3Dpos(f32, f32, f32, cXyz*);
/* 801910D4 */ void calcViewMtx(f32 (*)[4]);
/* 801910D4 */ void calcViewMtx(Mtx);
void drawOff() { mpModel = 0; }
@@ -42,12 +42,9 @@ public:
/* 0x0008 */ J3DModel* mpModel;
/* 0x000C */ mDoExt_bckAnm* mBckAnm;
/* 0x0010 */ mDoExt_brkAnm* mBrkAnm;
/* 0x0014 */ J3DLightInfo mLightInfo;
/* 0x0048 */ u8 field_0x0048[0x0088 - 0x0048];
/* 0x0088 */ J3DLightObj mLightObjects[6];
/* 0x0340 */ u8 field_0x0340[0x039C - 0x0340];
/* 0x039C */ J2DPane* pane;
/* 0x03A0 */ u8 field_0x03A0[0x03A4 - 0x03A0];
/* 0x0014 */ dKy_tevstr_c mTevstr;
/* 0x039C */ CPaneMgr* mPaneMgr;
/* 0x03A0 */ J2DPane* mPane;
/* 0x03A4 */ cXyz field_0x03a4;
/* 0x03B0 */ csXyz field_0x03b0;
/* 0x03B6 */ u8 padding[2];
+9 -1
View File
@@ -73,7 +73,7 @@ inline void cMtx_multVec(Mtx mtx, const Vec* src, Vec* dst) {
mDoMtx_multVec(mtx, src, dst);
}
inline void cMtx_lookAt(f32 (*param_0)[4],Vec const* param_1, Vec const* param_2,Vec const* param_3, s16 param_4) {
inline void cMtx_lookAt(Mtx param_0, const Vec* param_1, const Vec* param_2, const Vec* param_3, s16 param_4) {
mDoMtx_lookAt(param_0,param_1,param_2,param_3,param_4);
}
@@ -107,6 +107,14 @@ inline void mDoMtx_concat(const Mtx a, const Mtx b, Mtx c) {
PSMTXConcat(a, b, c);
}
inline void mDoMtx_inverse(const Mtx a, Mtx b) {
PSMTXInverse(a, b);
}
inline void cMtx_inverse(const Mtx a, Mtx b) {
mDoMtx_inverse(a, b);
}
class mDoMtx_stack_c {
public:
/* 8000CCC8 */ static bool push();