mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 14:13:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

More miscellaneous TU improvements (#2665)

Browse Source
This commit is contained in:
Max Roncace
2025-09-17 08:01:59 -04:00
committed by GitHub
parent 2106c56f60
commit fe5e8aff98
33 changed files with 659 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_xyz.h
+15 -6
View File
@@ -64,13 +64,22 @@ struct cXyz : Vec {
z *= other.z;
}
void operator-=(const Vec& other) { VECSubtract(this, &other, this); }
cXyz* operator+=(const Vec& other) {
VECAdd(this, &other, this);
cXyz* operator-=(const Vec& other) {
PSVECSubtract(this, &other, this);
return this;
}
cXyz* operator+=(const Vec& other) {
PSVECAdd(this, &other, this);
return this;
}
cXyz* operator*=(f32 scale) {
PSVECScale(this, this, scale);
return this;
}
cXyz* operator/=(f32 scale) {
PSVECScale(this, this, 1.0f / scale);
return this;
}
void operator*=(f32 scale) { VECScale(this, this, scale); }
void operator/=(f32 scale) { VECScale(this, this, 1.0f / scale); }
/* 80266C6C */ cXyz getCrossProduct(Vec const&) const;
/* 80266CBC */ cXyz outprod(Vec const&) const;
/* 80266CE4 */ cXyz norm() const;
@@ -105,7 +114,7 @@ struct cXyz : Vec {
void zero() { set(0.0f, 0.0f, 0.0f); }
f32 getSquareMag() const { return VECSquareMag(this); }
f32 getSquareMag() const { return PSVECSquareMag(this); }
f32 getSquareDistance(const Vec& other) const { return PSVECSquareDistance(this, &other); }
static f32 getNearZeroValue() { return 8e-11f; }
include/d/actor/d_a_npc_ykm.h
+1 -1
View File
@@ -271,7 +271,7 @@ public:
}
int getBitTRB() { return (fopAcM_GetParam(this) & 0x3F0000) >> 16; }
u32 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
void dComIfGs_setRaceGameTime(u32 i_time) {
g_dComIfG_gameInfo.info.getMiniGame().setRaceGameTime(i_time);
include/d/actor/d_a_obj_toby.h
-11
View File
@@ -63,15 +63,4 @@ public:
STATIC_ASSERT(sizeof(obj_toby_class) == 0x6374);
class daObj_Toby_HIO_c : public JORReflexible{
public:
/* 80D1378C */ daObj_Toby_HIO_c();
/* 80D15534 */ virtual ~daObj_Toby_HIO_c() {}
void genMessage(JORMContext*);
/* 0x4 */ s8 field_0x4;
/* 0x8 */ f32 field_0x8;
};
#endif /* D_A_OBJ_TOBY_H */
include/d/d_bg_s.h
+1
View File
@@ -139,6 +139,7 @@ public:
u32 GetMtrlSndId(const cBgS_PolyInfo& param_0) { return dKy_pol_sound_get(&param_0); }
void DebugDrawPoly(dBgW_Base *param_1) {}
fopAc_ac_c* GetActorPointer(cBgS_PolyInfo const& param_0) const { return cBgS::GetActorPointer(param_0); }
f32 GroundCross(cBgS_GndChk* i_gndChk) { return (f32)((cBgS*)this)->GroundCross(i_gndChk); }
#ifdef DEBUG
/* 0x1404 */ u8 field_0x1404[0x1408 - 0x1404];
include/d/d_camera.h
+4 -4
View File
@@ -921,10 +921,10 @@ public:
/* 800965AC */ bool hintTalkEvCamera();
/* 80096EDC */ bool bspTransEvCamera();
/* 80097694 */ bool portalWarpEvCamera();
/* 8009771C */ cXyz attentionPos(fopAc_ac_c*);
/* 80097738 */ cSAngle directionOf(fopAc_ac_c*);
/* 8009775C */ cXyz positionOf(fopAc_ac_c*);
/* 8009778C */ cXyz eyePos(fopAc_ac_c*);
/* 8009771C */ cXyz attentionPos(fopAc_ac_c* i_this) { return i_this->attention_info.position; }
/* 80097738 */ cSAngle directionOf(fopAc_ac_c* i_this) { return i_this->shape_angle.y; }
/* 8009775C */ cXyz positionOf(fopAc_ac_c* i_this) { return i_this->current.pos; }
/* 8009778C */ cXyz eyePos(fopAc_ac_c* i_this) { return i_this->eyePos; }
/* 8016008C */ dCamera_c(camera_class*);
/* 80160304 */ ~dCamera_c();
/* 80160470 */ void initialize(camera_class*, fopAc_ac_c*, u32, u32);
include/d/d_com_inf_game.h
+1 -1
View File
@@ -3398,7 +3398,7 @@ inline dStage_roomDt_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) {
return g_dComIfG_gameInfo.play.getRoomControl()->getStatusRoomDt(room_no);
}
inline s32 dComIfGp_roomControl_getTimePass() {
inline BOOL dComIfGp_roomControl_getTimePass() {
return g_dComIfG_gameInfo.play.getRoomControl()->GetTimePass();
}
include/d/d_kankyo.h
+38 -13
View File
@@ -505,26 +505,46 @@ inline dScnKy_env_light_c* dKy_getEnvlight() {
return &g_env_light;
}
// unsure of correct size
class dKankyo_lightHIO_c {
public:
void dKankyo_lightHIOInfoUpDateF() {
// NONMATCHING
}
u8 field_0x0[4];
};
class dKankyo_HIO_c {
public:
/* 0x000 */ u8 field_0x000[0x6d - 0x0];
/* 0x000 */ u8 field_0x06d;
/* 0x000 */ u8 field_0x06e[0xb4 - 0x6e];
/* 0x000 */ u8 field_0x000[0x1c - 0x0];
/* 0x01C */ dKankyo_lightHIO_c field_0x01c;
/* 0x020 */ u8 field_0x020[0x6d - 0x20];
/* 0x06D */ u8 field_0x06d;
/* 0x06E */ u8 field_0x06e[0xb4 - 0x6e];
/* 0x0B4 */ u8 field_0x0b4;
/* 0x0B8 */ f32 field_0x0b8;
/* 0x0BC */ u8 field_0x0bc[0x3f4 - 0xbc];
/* 0x3F4 */ f32 field_0x3f4;
/* 0x3F8 */ f32 field_0x3f8;
/* 0x3FC */ u8 field_0x3fc[0x694 - 0x3fc];
u8 field_0x694;
u8 field_0x695;
u8 field_0x696;
u8 field_0x697[0x698 - 0x697];
bool field_0x698;
u8 field_0x699[0x69c - 0x699];
f32 field_0x69c;
u8 field_0x6a0[0x79b - 0x6a0];
u8 field_0x79b;
/* 0x3FC */ u8 field_0x3fc[0x686 - 0x3fc];
/* 0x686 */ u8 field_0x686;
/* 0x687 */ u8 field_0x687[0x694 - 0x687];
/* 0x694 */ u8 field_0x694;
/* 0x695 */ u8 field_0x695;
/* 0x696 */ u8 field_0x696;
/* 0x697 */ u8 field_0x697[0x698 - 0x697];
/* 0x698 */ bool field_0x698;
/* 0x699 */ u8 field_0x699[0x69c - 0x699];
/* 0x69C */ f32 field_0x69c;
/* 0x6A0 */ u8 field_0x6a0[0x6d9 - 0x6a0];
/* 0x6D9 */ u8 field_0x6d9;
/* 0x6DA */ u8 field_0x6da[0x6e0 - 0x6da];
/* 0x6E0 */ f32 field_0x6e0;
/* 0x6E4 */ f32 field_0x6e4;
/* 0x6E8 */ f32 field_0x6e8;
/* 0x6EC */ u8 field_0x6ec[0x79b - 0x6ec];
/* 0x79B */ u8 field_0x79b;
};
extern dKankyo_HIO_c g_kankyoHIO;
@@ -656,4 +676,9 @@ int dKy_Indoor_check();
void dKy_GfFog_tevstr_set(dKy_tevstr_c* tevstr_p);
void dKy_setLight_mine(dKy_tevstr_c* tevstr_p);
#if DEBUG
inline void dKankyo_lightHIOInfoUpDateF() {
}
#endif
#endif /* D_KANKYO_D_KANKYO_H */
include/d/d_stage.h
+1 -1
View File
@@ -1067,7 +1067,7 @@ public:
/* 80024954 */ static bool resetArchiveBank(int);
/* 80024DB0 */ static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; }
/* 8025BAAC */ static void setZoneNo(int, int);
static u8 GetTimePass() { return m_time_pass; }
static BOOL GetTimePass() { return m_time_pass; }
static s8 getStayNo() { return mStayNo; }
static u8 getRegionNo(int i_roomNo) { return mStatus[i_roomNo].mRegionNo; }
include/m_Do/m_Do_ext.h
+3 -3
View File
@@ -542,7 +542,7 @@ public:
/* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
virtual void draw();
virtual ~mDoExt_3DlineMatSortPacket();
virtual ~mDoExt_3DlineMatSortPacket() {}
private:
/* 0x10 */ mDoExt_3DlineMat_c* mp3DlineMat;
@@ -554,7 +554,7 @@ public:
/* 80013360 */ int init(u16, u16, ResTIMG*, int);
/* 80013FB0 */ void update(int, GXColor&, dKy_tevstr_c*);
/* 8001373C */ void update(int, f32, GXColor&, u16, dKy_tevstr_c*);
/* 80014E7C */ int getMaterialID();
/* 80014E7C */ int getMaterialID() { return 1; }
/* 800134F8 */ void setMaterial();
/* 800135D0 */ void draw();
@@ -578,7 +578,7 @@ public:
/* 80012874 */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);
/* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*);
/* 80014E84 */ virtual int getMaterialID();
/* 80014E84 */ virtual int getMaterialID() { return 0; }
/* 800126C0 */ virtual void setMaterial();
/* 80012774 */ virtual void draw();