encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work on d_cc_d debug (#3002)

Browse Source
This commit is contained in:
hatal175
2025-12-29 04:12:01 -08:00
committed by GitHub
parent 1f391dc5bd
commit e77f841d35
162 changed files with 1162 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+22 -14
View File
@@ -78,6 +78,10 @@ struct cCcD_SrcSphAttr {
cM3dGSphS mSph;
};
struct cCcD_SrcCylAttr {
cM3dGCylS mCyl;
};
class cCcD_DivideInfo {
private:
/* 0x00 */ u32 mXDivInfo;
@@ -214,7 +218,7 @@ public:
cCcD_Obj* GetHitObj() { return mHitObj; }
const cCcD_Obj* GetHitObj() const { return mHitObj; }
u32 MskSPrm(u32 mask) const { return mSPrm & mask; }
u32 MskRPrm(u32 mask) { return mRPrm & mask; }
u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
void OnSPrmBit(u32 flag) { mSPrm |= flag; }
void OffSPrmBit(u32 flag) { mSPrm &= ~flag; }
u32 ChkSPrm(u32 prm) const { return MskSPrm(prm); }
@@ -228,7 +232,8 @@ STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase));
#pragma pack(1)
class cCcD_ObjAt : public cCcD_ObjCommonBase {
public:
cCcD_ObjAt() { mType = 0; }
cCcD_ObjAt() { Ct(); }
void Ct() { mType = 0; }
virtual ~cCcD_ObjAt() {}
void SetHit(cCcD_Obj*);
void Set(cCcD_SrcObjAt const&);
@@ -241,7 +246,7 @@ public:
void SetType(u32 type) { mType = type; }
void SetAtp(int atp) { mAtp = atp; }
void ClrSet() { OffSPrmBit(1); }
u32 ChkHit() { return MskRPrm(1); }
u32 ChkHit() const { return MskRPrm(1); }
protected:
/* 0x10 */ int mType;
@@ -266,7 +271,7 @@ public:
u32 GetGrp() const { return MskSPrm(0x1E); }
bool ChkSet() const { return MskSPrm(1); }
void ClrSet() { OffSPrmBit(1); }
u32 ChkHit() { return MskRPrm(1); }
u32 ChkHit() const { return MskRPrm(1); }
private:
/* 0x10 */ int mType;
@@ -276,6 +281,8 @@ STATIC_ASSERT(0x14 == sizeof(cCcD_ObjTg));
class cCcD_ObjCo : public cCcD_ObjCommonBase {
public:
cCcD_ObjCo() { Ct(); }
void Ct() {}
virtual ~cCcD_ObjCo() {}
void SetHit(cCcD_Obj*);
void ClrHit();
@@ -292,7 +299,7 @@ public:
void OnCoSameActorHit() { OnSPrmBit(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); }
void OffCoSameActorHit() { OffSPrmBit(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); }
void ClrSet() { OffSPrmBit(1); }
u32 ChkHit() { return MskRPrm(1); }
u32 ChkHit() const { return MskRPrm(1); }
void Set(cCcD_SrcObjCo const& src) { cCcD_ObjCommonBase::Set(src.mBase); }
};
@@ -368,12 +375,12 @@ public:
void ClrAtHit() { mObjAt.ClrHit(); }
void ClrTgHit() { mObjTg.ClrHit(); }
void ClrCoHit() { mObjCo.ClrHit(); }
u32 ChkAtHit() { return mObjAt.ChkHit(); }
u32 ChkTgHit() { return mObjTg.ChkHit(); }
u32 ChkCoHit() { return mObjCo.ChkHit(); }
cCcD_Obj* GetAtHitObj() { return mObjAt.GetHitObj(); }
cCcD_Obj* GetTgHitObj() { return mObjTg.GetHitObj(); }
cCcD_Obj* GetCoHitObj() { return mObjCo.GetHitObj(); }
u32 ChkAtHit() const { return mObjAt.ChkHit(); }
u32 ChkTgHit() const { return mObjTg.ChkHit(); }
u32 ChkCoHit() const { return mObjCo.ChkHit(); }
cCcD_Obj* GetAtHitObj() const { return (cCcD_Obj*)mObjAt.GetHitObj(); }
cCcD_Obj* GetTgHitObj() const { return (cCcD_Obj*)mObjTg.GetHitObj(); }
cCcD_Obj* GetCoHitObj() const { return (cCcD_Obj*)mObjCo.GetHitObj(); }
u32 ChkAtSPrm(u32 prm) { return mObjAt.ChkSPrm(prm); }
u32 ChkCoSPrm(u32 prm) const { return mObjCo.ChkSPrm(prm); }
void OnTgNoSlingHitInfSet() { mObjTg.OnSPrmBit(0x40); }
@@ -463,9 +470,9 @@ class cCcD_GObjInf : public cCcD_Obj {
public:
cCcD_GObjInf() {}
virtual ~cCcD_GObjInf() {}
virtual void ClrAtHit() { mObjAt.ClrHit(); }
virtual void ClrTgHit() { mObjTg.ClrHit(); }
virtual void ClrCoHit() { mObjCo.ClrHit(); }
virtual void ClrAtHit() { cCcD_ObjHitInf::ClrAtHit(); }
virtual void ClrTgHit() { cCcD_ObjHitInf::ClrTgHit(); }
virtual void ClrCoHit() { cCcD_ObjHitInf::ClrCoHit(); }
virtual cCcD_GObjInf const* GetGObjInf() const { return this; }
virtual cCcD_GObjInf* GetGObjInf() { return this; }
};
@@ -582,6 +589,7 @@ public:
virtual void CalcAabBox();
virtual bool GetNVec(cXyz const&, cXyz*) const;
virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
void Set(const cCcD_SrcCylAttr& src) { cM3dGCyl::Set(src.mCyl); }
const cM3dGCyl* GetShapeP() const { return this; }
include/SSystem/SComponent/c_m3d.h
+7
View File
@@ -108,4 +108,11 @@ inline bool cM3d_Cross_CylSph(const cM3dGCyl* cyl, const cM3dGSph* sph, Vec* out
return cM3d_Cross_CylSph(cyl, sph, out, &sp10);
}
#ifdef DEBUG
bool cM3d_UpMtx_Base(const Vec& param_1, const Vec& param_2, Mtx param_3);
bool cM3d_UpMtx(const Vec& param_1, Mtx param_2);
#endif
#endif
include/SSystem/SComponent/c_m3d_g_lin.h
+2 -1
View File
@@ -18,7 +18,7 @@ public:
void SetStartEnd(const cXyz&, const cXyz&);
void SetStartEnd(const Vec&, const Vec&);
void CalcPos(Vec*, f32) const;
void CalcVec(Vec* pOut) const { VECSubtract(&this->mEnd, &this->mStart, pOut); }
void CalcVec(Vec* pOut) const { PSVECSubtract(&this->mEnd, &this->mStart, pOut); }
void SetEnd(const cXyz&);
void set(const Vec& i_start, const Vec& i_end) { SetStartEnd(i_start, i_end); }
@@ -31,6 +31,7 @@ public:
cXyz& GetEndP(void) { return mEnd; }
cXyz& GetEnd() { return mEnd; }
const cXyz& GetEnd() const { return mEnd; }
f32 GetLen() const { return PSVECDistance(&mStart, &mEnd); }
}; // Size = 0x1C
STATIC_ASSERT(0x1C == sizeof(cM3dGLin));
include/d/d_cc_d.h
+17 -2
View File
@@ -103,7 +103,7 @@ struct dCcD_SrcTri {
struct dCcD_SrcCyl {
/* 0x00 */ dCcD_SrcGObjInf mObjInf;
/* 0x30 */ cM3dGCylS mCyl;
/* 0x30 */ cCcD_SrcCylAttr mCylAttr;
}; // Size: 0x44
struct dCcD_SrcCps {
@@ -171,12 +171,13 @@ public:
void SetMtrl(u8 mtrl) { mMtrl = mtrl; }
void SetAtSpl(dCcG_At_Spl spl) { mSpl = spl; }
u8 GetSe() { return mSe; }
u8 GetSpl() { return mSpl; }
dCcG_At_Spl GetSpl() { return (dCcG_At_Spl)mSpl; }
u8 GetMtrl() { return mMtrl; }
u8 GetHitMark() { return mHitMark; }
void SetRVec(cXyz& vec) { mRVec = vec; }
void SetHitPos(cXyz& pos) { mHitPos = pos; }
cXyz* GetHitPosP() { return &mHitPos; }
void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); }
// private:
/* 0x1C */ u8 mSe;
@@ -212,6 +213,7 @@ public:
void SetHitPos(cXyz& pos) { mHitPos = pos; }
cXyz* GetHitPosP() { return &mHitPos; }
u8 GetSe() { return mSe; }
void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); }
private:
/* 0x1C */ u8 mSe;
@@ -231,6 +233,7 @@ class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase {
public:
virtual ~dCcD_GObjCo() {}
void Set(dCcD_SrcGObjCo const& pSrc) { dCcD_GAtTgCoCommonBase::Set(pSrc.mBase); }
void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); }
}; // Size = 0x1C ?
class dCcD_GStts : public cCcD_GStts {
@@ -448,6 +451,9 @@ public:
void CalcTgVec();
virtual ~dCcD_Cps() {}
dCcD_Cps() {}
#if DEBUG
virtual void Draw(const GXColor& color);
#endif
}; // Size = 0x144
// Triangle
@@ -457,6 +463,9 @@ public:
cCcD_ShapeAttr* GetShapeAttr();
virtual ~dCcD_Tri() {}
dCcD_Tri() {}
#if DEBUG
virtual void Draw(const GXColor& color);
#endif
};
// Cylinder
@@ -469,6 +478,9 @@ public:
void MoveCTg(cXyz&);
virtual ~dCcD_Cyl() {}
dCcD_Cyl() {}
#if DEBUG
virtual void Draw(const GXColor& color);
#endif
}; // Size = 0x13C
// Sphere
@@ -480,6 +492,9 @@ public:
void MoveCAt(cXyz&);
virtual cCcD_ShapeAttr* GetShapeAttr();
virtual ~dCcD_Sph() {}
#if DEBUG
virtual void Draw(const GXColor& color);
#endif
}; // Size = 0x138
dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* param_0);
include/m_Do/m_Do_mtx.h
+4
View File
@@ -100,6 +100,10 @@ inline void cMtx_copy(const Mtx src, Mtx dst) {
mDoMtx_copy(src, dst);
}
inline void cMtx_trans(Mtx pDest, f32 x, f32 y, f32 z) {
mDoMtx_trans(pDest, x, y, z);
}
inline void cMtx_multVecArray(const Mtx mtx, const Vec* src, Vec* dst, u32 count) {
mDoMtx_multVecArray(mtx, src, dst, count);
}
src/SSystem/SComponent/c_m3d.cpp
+41
View File
@@ -1978,6 +1978,47 @@ void cM3d_CalcVecZAngle(Vec const& param_0, csXyz* param_1) {
param_1->z = 0;
}
#ifdef DEBUG
bool cM3d_UpMtx_Base(const Vec& param_1, const Vec& param_2, Mtx param_3) {
Vec local_3c;
Vec auStack_48;
f32 dVar8;
f32 angle;
if (cM3d_IsZero(PSVECMag(&param_2))) {
MTXIdentity(param_3);
return false;
}
PSVECNormalize(&param_2, &auStack_48);
PSVECCrossProduct(&param_1, &auStack_48, &local_3c);
if (cM3d_IsZero(PSVECMag(&local_3c))) {
local_3c.x = 1.0f;
local_3c.y = 0.0f;
local_3c.z = 0.0f;
}
dVar8 = PSVECDotProduct(&param_1, &auStack_48);
if (dVar8 > 1.0f) {
dVar8 = 1.0f;
} else if (dVar8 < -1.0f) {
dVar8 = -1.0f;
}
angle = acosf(dVar8);
C_MTXRotAxisRad(param_3, &local_3c, angle);
return true;
}
static Vec base_y = {0.0f, 1.0f, 0.0f};
bool cM3d_UpMtx(const Vec& param_1, Mtx param_2) {
return cM3d_UpMtx_Base(base_y, param_1, param_2);
}
#endif
void cM3d_PlaneCrossLineProcWork(f32 f1, f32 f2, f32 f3, f32 f4, f32 f5, f32 f6, f32 f7, f32* pF1,
f32* pF2) {
src/d/actor/d_a_alink.cpp
+12 -8
View File
@@ -1249,10 +1249,12 @@ static dCcD_SrcCyl l_cylSrc = {
{0},
},
{
{0.0f, 0.0f, 0.0f},
35.0f,
180.0f,
},
{
{0.0f, 0.0f, 0.0f},
35.0f,
180.0f,
},
}
};
static dCcD_SrcSph l_sphSrc = {
@@ -1276,10 +1278,12 @@ static dCcD_SrcCyl l_atCylSrc = {
{0},
},
{
{0.0f, 0.0f, 0.0f},
180.0f,
130.0f,
},
{
{0.0f, 0.0f, 0.0f},
180.0f,
130.0f,
},
}
};
static dCcD_SrcCps l_atCpsSrc = {
src/d/actor/d_a_b_dr.cpp
+18 -12
View File
@@ -145,10 +145,12 @@ static dCcD_SrcCyl cc_dr_week_src = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
0.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
0.0f // mHeight
} // mCyl
} // mCylAttr
};
static dCcD_SrcSph cc_dr_tail_src = {
@@ -207,10 +209,12 @@ static dCcD_SrcCyl cc_pillar_src = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
0.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
0.0f // mHeight
} // mCyl
} // mCylAttr
};
static dCcD_SrcCyl cc_down_src = {
@@ -221,10 +225,12 @@ static dCcD_SrcCyl cc_down_src = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
50.0f, // mRadius
300.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
50.0f, // mRadius
300.0f // mHeight
} // mCyl
} // mCylAttr
};
static dCcD_SrcSph cc_downSph_src = {
src/d/actor/d_a_b_ds.cpp
+12 -8
View File
@@ -132,10 +132,12 @@ static dCcD_SrcCyl cc_ds_backbone_src = {
{0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
30.0f, // mRadius
130.0f, // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
30.0f, // mRadius
130.0f, // mHeight
} // mCyl
} // mCylAttr
};
static dCcD_SrcCyl cc_ds_hand_at_cyl_src = {
@@ -147,10 +149,12 @@ static dCcD_SrcCyl cc_ds_hand_at_cyl_src = {
{0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
30.0f, // mRadius
130.0f, // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
30.0f, // mRadius
130.0f, // mHeight
} // mCyl
} // mCylAttr
};
static dCcD_SrcSph cc_ds_breath_at_src = {
src/d/actor/d_a_b_gg.cpp
+12 -8
View File
@@ -196,10 +196,12 @@ void daB_GG_c::initCc() {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
130.0f, // mRadius
200.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
130.0f, // mRadius
200.0f // mHeight
} // mCyl
} // mCylAttr
};
const static dCcD_SrcCyl ccHookSrc = {
@@ -210,10 +212,12 @@ void daB_GG_c::initCc() {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
130.0f, // mRadius
200.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
130.0f, // mRadius
200.0f // mHeight
} // mCyl
} // mCylAttr
};
const static dCcD_SrcSph ccShieldSphSrc = {
src/d/actor/d_a_b_gnd.cpp
+6 -4
View File
@@ -4875,10 +4875,12 @@ static int daB_GND_Create(fopAc_ac_c* a_this) {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
100.0f, // mRadius
200.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
100.0f, // mRadius
200.0f // mHeight
} // mCyl
}
};
for (int i = 0; i < 2; i++) {
src/d/actor/d_a_b_gos.cpp
+8 -6
View File
@@ -389,12 +389,14 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) {
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
150.0f, // mRadius
60.0f // mHeight
} // mCyl
},
{ // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
150.0f, // mRadius
60.0f // mHeight
} // mCyl
}
};
a_this->mCcStts.Init(0xFA, 0, a_this);
src/d/actor/d_a_b_yo.cpp
+6 -4
View File
@@ -136,10 +136,12 @@ static dCcD_SrcCyl cc_yo_src = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
}
};
static dCcD_SrcSph cc_yo_tg_src = {
src/d/actor/d_a_b_yo_ice.cpp
+18 -12
View File
@@ -41,10 +41,12 @@ static dCcD_SrcCyl cc_yo_src = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
} // mCylAttr
};
static dCcD_SrcCyl cc_yo_iron_src = {
@@ -55,10 +57,12 @@ static dCcD_SrcCyl cc_yo_iron_src = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
} // mCylAttr
};
static dCcD_SrcCyl cc_yo_cam_src = {
@@ -69,10 +73,12 @@ static dCcD_SrcCyl cc_yo_cam_src = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
} // mCylAttr
};
} // namespace
src/d/actor/d_a_b_zant.cpp
+8 -6
View File
@@ -128,12 +128,14 @@ dCcD_SrcCyl cc_zant_roll_src = {
{dCcD_SE_METAL, 0x0, 0x6, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x2, 0x0, 0x0, 0x303}, // mGObjTg
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
},
{ // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
40.0f, // mRadius
40.0f // mHeight
} // mCyl
}
};
dCcD_SrcSph cc_zant_foot_src = {
src/d/actor/d_a_b_zant_mobile.cpp
+6 -4
View File
@@ -34,10 +34,12 @@ static dCcD_SrcCyl cc_zant_snort_src = {
{0},
},
{
{0.0f, 0.0f, 0.0f},
40.0f,
40.0f,
},
{
{0.0f, 0.0f, 0.0f},
40.0f,
40.0f,
},
}
};
}
src/d/actor/d_a_bg_obj.cpp
+6 -4
View File
@@ -265,10 +265,12 @@ static const dCcD_SrcCyl l_cyl_src = {
{0},
},
{
{0.0f, 0.0f, 0.0f},
0.0f,
0.0f,
},
{
{0.0f, 0.0f, 0.0f},
0.0f,
0.0f,
},
}
};
void daBgObj_c::initAtt() {
src/d/actor/d_a_boomerang.cpp
+5 -3
View File
@@ -1410,9 +1410,11 @@ static dCcD_SrcCyl l_windAtCylSrc = {
{0},
},
{
{0.0f, 0.0f, 0.0f},
150.0f,
600.0f,
{
{0.0f, 0.0f, 0.0f},
150.0f,
600.0f,
}
}
};
src/d/actor/d_a_canoe.cpp
+6 -4
View File
@@ -80,10 +80,12 @@ static dCcD_SrcCyl l_cylSrc = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
55.0f, // mRadius
80.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
55.0f, // mRadius
80.0f // mHeight
} // mCyl
}
};
int daCanoe_c::create() {
src/d/actor/d_a_cstaF.cpp
+6 -4
View File
@@ -92,10 +92,12 @@ static dCcD_SrcCyl l_cylSrc = {
{0x0}, // mGObjCo
}, // mObjInf
{
{0.0f, 0.0f, 0.0f}, // mCenter
125.0f, // mRadius
390.0f // mHeight
} // mCyl
{
{0.0f, 0.0f, 0.0f}, // mCenter
125.0f, // mRadius
390.0f // mHeight
} // mCyl
}
};
int daCstaF_c::create() {

Some files were not shown because too many files have changed in this diff Show More