d_a_wall OK

This commit is contained in:
LagoLunatic
2024-02-16 14:19:33 -05:00
parent 3cf49ac324
commit 32728226a2
6 changed files with 45 additions and 47 deletions
+7 -2
View File
@@ -44,12 +44,17 @@ public:
f32 getSignedLenPos(const cXyz* param_1) const {
return cM3d_SignedLenPlaAndPos(this, param_1);
}
void Set(const cM3dGPla* pla) {
mNormal = *pla->GetNP();
mD = pla->GetD();
}
void SetupFrom3Vtx(const Vec* a, const Vec* b, const Vec* c) {
cM3d_CalcPla(a, b, c, &mNormal, &mD);
}
virtual ~cM3dGPla() {}
// TODO
void Set(const cM3dGPla*) {}
void SetupFrom3Vtx(const Vec*, const Vec*, const Vec*) {}
cM3dGPla(const cXyz*, f32) {}
void cross(const cM3dGLin&, Vec&) const {}
}; // Size: 0x14
+10 -3
View File
@@ -50,10 +50,17 @@ public:
mA = *a;
mB = *b;
mC = *c;
*((cM3dGPla*)this) = *pla;
Set(pla);
}
void setPos(const Vec* a, const Vec* b, const Vec* c) {
mA = *a;
mB = *b;
mC = *c;
setUp();
}
void setUp() {
SetupFrom3Vtx(&mA, &mB, &mC);
}
void setPos(const Vec*, const Vec*, const Vec*) {}
void setUp() {}
~cM3dGTri() {}
}; // Size: 0x38
+4 -4
View File
@@ -9,7 +9,7 @@
class daWall_c : public fopAc_ac_c {
public:
inline daWall_c();
daWall_c() : mSmokeCb(m_smoke_color, NULL, 0) {}
bool _delete();
BOOL CreateHeap();
void CreateInit();
@@ -34,15 +34,15 @@ public:
/* 0x5AC */ u8 mState;
/* 0x5B0 */ dPa_smokeEcallBack mSmokeCb;
/* 0x5D0 */ JPABaseEmitter* mpEmitter;
/* 0x5D4 */ float mDst;
/* 0x5D4 */ f32 mDst;
/* 0x5D8 */ u8 mBreakCounter;
/* 0x5DC */ s32 mSwitchIndex;
/* 0x5E0 */ u8 mType;
static _GXColor m_smoke_color;
static GXColor m_smoke_color;
static const s16 m_heapsize[3];
static const char* m_arcname[3];
static const Vec m_cull_size[6];
static const Vec m_cull_size[][2];
static const Vec m_tri_vtx[3][4];
static const s16 m_bmdname[3];
static const s16 m_dzbname[3];
+1 -1
View File
@@ -477,7 +477,7 @@ public:
class dCcD_Tri : public dCcD_GObjInf, public cCcD_TriAttr {
public:
void Set(dCcD_SrcTri const&);
cCcD_ShapeAttr* GetShapeAttr();
cCcD_ShapeAttr* GetShapeAttr() { return this; }
virtual ~dCcD_Tri() {}
dCcD_Tri() {}
};