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

Clean up some inlines and field names

Browse Source
This commit is contained in:
LagoLunatic
2025-06-18 19:29:02 -04:00
parent 65379a432f
commit 264ee5d6e1
5 changed files with 100 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_main.h
+41 -16
View File
@@ -96,10 +96,11 @@ public:
void setID(s32 id) { mId = id; }
s32 getID() const { return mId; }
void setAngle(csXyz* angle) { mAngle = *angle; }
const csXyz& getAngle() { return mAngle; }
csXyz& getAngle() { return mAngle; }
void setPos(const cXyz* pos) { mPos = *pos; }
const cXyz& getPos() { return mPos; }
cXyz& getPos() { return mPos; }
private:
/* 0x00 */ dPa_smokeEcallBack mSmokeCb;
/* 0x20 */ dPa_followEcallBack mFollowCb;
/* 0x34 */ cXyz mPos;
@@ -128,7 +129,7 @@ public:
}
}
public:
protected:
/* 0x4 */ BOOL mAlphaOutFlg;
/* 0x8 */ JPABaseEmitter* mpEmitter;
}; // Size: 0xC
@@ -137,8 +138,12 @@ class daPy_waterDropPcallBack_c : public JPACallBackBase2<JPABaseEmitter*, JPABa
public:
void execute(JPABaseEmitter*, JPABaseParticle*);
~daPy_waterDropPcallBack_c() {}
/* 0x4 */ BOOL field_0x4;
void offWaterMark() { mbWaterMark = FALSE; }
void onWaterMark() { mbWaterMark = TRUE; }
protected:
/* 0x4 */ BOOL mbWaterMark;
/* 0x8 */ dBgS_ObjGndChk mGndChk;
};
@@ -153,19 +158,27 @@ public:
daPy_swimTailEcallBack_c() {}
void onEnd() {
field_0x04 = true;
mbEnd = true;
field_0x20 = NULL;
}
bool getEnd() { return mbEnd; }
void onRightFlg() { field_0x05 = true; }
JPABaseEmitter* getEmitter() { return mpEmitter; }
cXyz& getPos() { return mPos; }
void setPos(cXyz& pos) { mPos = pos; }
/* 0x04 */ bool field_0x04;
void setSpeedRate(f32 rate) { mSpeedRate = rate; }
void setWaterY(f32 y) { mWaterY = y; }
void setWaterFlatY(f32 y) { mWaterFlatY = y; }
protected:
/* 0x04 */ bool mbEnd;
/* 0x05 */ bool field_0x05;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0C;
/* 0x10 */ f32 field_0x10;
/* 0x08 */ f32 mSpeedRate;
/* 0x0C */ f32 mWaterY;
/* 0x10 */ f32 mWaterFlatY;
/* 0x14 */ cXyz mPos;
/* 0x20 */ const csXyz* field_0x20;
/* 0x24 */ JPABaseEmitter* mpEmitter;
@@ -185,6 +198,7 @@ public:
void setPos(const cXyz* pos) { mPos = *pos; }
void setAngle(s16 x, s16 y, s16 z) { mAngle.set(x, y, z); }
protected:
/* 0x04 */ JPABaseEmitter* mpEmitter;
/* 0x08 */ cXyz mPos;
/* 0x14 */ csXyz mAngle;
@@ -198,6 +212,13 @@ public:
daPy_waterDropEcallBack_c() {}
~daPy_waterDropEcallBack_c() {}
BOOL checkReady() { return field_0x1C; }
void onReady() { field_0x1C = TRUE; }
void offReady() { field_0x1C = FALSE; }
static daPy_waterDropPcallBack_c* getPcallBack() { return &m_pcallback; }
protected:
static daPy_waterDropPcallBack_c m_pcallback;
/* 0x1C */ BOOL field_0x1C;
@@ -242,6 +263,7 @@ public:
daPy_mtxPosFollowEcallBack_c() {}
~daPy_mtxPosFollowEcallBack_c() {}
protected:
/* 0xC */ const csXyz* mpAngle;
}; // Size: 0x10
@@ -252,9 +274,9 @@ public:
virtual ~daPy_matAnm_c() {}
virtual void calc(J3DMaterial*) const;
static u8 m_maba_timer;
static u8 m_maba_flg;
static u8 m_eye_move_flg;
static u8 m_maba_timer;
static u8 m_morf_frame;
static void onMabaFlg() { m_maba_flg = 1; }
@@ -268,12 +290,14 @@ public:
static u8 getMabaFlg() { return m_maba_flg; }
static u8 getMabaTimer() { return m_maba_timer; }
static u8 getMorfFrame() { return m_morf_frame; }
static void getNowOffsetXP() {}
static void getNowOffsetYP() {}
static void offEyeMoveFlg() { m_eye_move_flg = 0; }
static void onEyeMoveFlg() { m_eye_move_flg = 1; }
static void setMabaTimer(u8 timer) { m_maba_timer = timer; }
static void setMorfFrame(u8 frame) { m_morf_frame = frame; }
// TODO:
static void getNowOffsetXP() {}
static void getNowOffsetYP() {}
static void setNowOffsetX(f32) {}
static void setNowOffsetY(f32) {}
@@ -289,12 +313,13 @@ public:
ELIXIR_SOUP_SLASH_BLUR,
PARRYING_SLASH_BLUR,
};
public:
void initSwBlur(MtxP, int, f32, int);
void copySwBlur(MtxP, int);
void draw();
~daPy_swBlur_c() {}
public:
/* 0x010 */ ResTIMG* mpTex;
/* 0x014 */ int field_0x014;
/* 0x018 */ int field_0x018;
@@ -328,14 +353,14 @@ public:
/* 0x088 */ Mtx field_0x088[3];
}; // Size: 0x118
struct daPy_aura_c {
class daPy_aura_c {
public:
void setModel(J3DModel* model) { mpYaura00Model = model; }
J3DModel* getModel() { return mpYaura00Model; }
void setFrame(f32 frame) { mFrame = frame; }
f32 getFrame() { return mFrame; }
public:
private:
/* 0x00 */ J3DModel* mpYaura00Model;
/* 0x04 */ f32 mFrame;
}; // Size: 0x08
include/d/d_bg_s_acch.h
+5 -5
View File
@@ -134,7 +134,7 @@ public:
cXyz* GetPos() { return pm_pos; }
cXyz* GetOldPos() { return pm_old_pos; }
f32 GetGroundH() { return m_ground_h; }
f32 GetRoofHeight() { return m_roof_crr_height; }
f32 GetRoofHeight() { return m_roof_height; }
f32 GetSeaHeight() { return m_sea_height; }
void SetLin() { m_lin.SetStartEnd(*pm_old_pos, *pm_pos); }
bool ChkGroundFind() { return m_flags & GROUND_FIND; }
@@ -173,7 +173,7 @@ public:
const u32 MaskWaterHit() { return m_flags & WATER_HIT; }
const bool ChkWaterHit() { return MaskWaterHit() != 0; }
void ClrWaterNone() { m_flags &= ~WATER_NONE; }
void SetWaterCheckOffset(f32 offset) { m_water_check_offset = offset; }
void SetWaterCheckOffset(f32 offset) { m_wtr_check_offset = offset; }
void OnLineCheck() { m_flags |= LINE_CHECK; }
void ClrRoofNone() { m_flags &= ~ROOF_NONE; }
void SetRoofCrrHeight(f32 height) { m_roof_crr_height = height; }
@@ -236,10 +236,10 @@ public:
/* 0x0B0 */ u8 field_0xb0;
/* 0x0B4 */ f32 field_0xb4;
/* 0x0B8 */ f32 field_0xb8;
/* 0x0BC */ f32 m_roof_y;
/* 0x0BC */ f32 m_roof_height;
/* 0x0C0 */ f32 m_roof_crr_height;
/* 0x0C4 */ f32 m_roof_height;
/* 0x0C8 */ f32 m_water_check_offset;
/* 0x0C4 */ f32 field_0xC4;
/* 0x0C8 */ f32 m_wtr_check_offset;
/* 0x0CC */ cBgS_PolyInfo* pm_out_poly_info;
/* 0x0D0 */ f32 m_sea_height;
/* 0x0D4 */ dBgS_GndChk m_gnd;
src/d/actor/d_a_player_main.cpp
+3 -6
View File
@@ -132,6 +132,7 @@ daPy_matAnm_c::daPy_matAnm_c() {
/* 80102F64-80103074 .text calc__13daPy_matAnm_cCFP11J3DMaterial */
void daPy_matAnm_c::calc(J3DMaterial* mat) const {
// Fakematch?
daPy_matAnm_c* i_this = const_cast<daPy_matAnm_c*>(this);
J3DMaterialAnm::calc(mat);
@@ -11131,7 +11132,7 @@ void daPy_lk_c::checkRoofRestart() {
}
#endif
f32 dVar9 = mAcch.m_roof_y;
f32 dVar9 = mAcch.GetRoofHeight();
if (dVar9 > mAcch.GetGroundH()) {
f32 dVar10 = mHeadTopPos.y - 10.0f;
f32 dVar8 = 10.0f + current.pos.y;
@@ -11730,11 +11731,7 @@ BOOL daPy_lk_c::playerDelete() {
mFootEffect[i].getSmokeCallBack()->remove();
mFootEffect[i].getOtherCallBack()->remove();
}
if (mFanSwingCb.mpEmitter) {
mFanSwingCb.mpEmitter->quitImmortalEmitter();
mFanSwingCb.mpEmitter->setEmitterCallBackPtr(NULL);
mFanSwingCb.mpEmitter = NULL;
}
mFanSwingCb.deleteCallBack();
m338C.end();
m33A8.end();
m3280.end();
src/d/actor/d_a_player_particle.inc
+38 -39
View File
@@ -25,7 +25,7 @@
/* 8012901C-80129034 .text setup__24daPy_swimTailEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void daPy_swimTailEcallBack_c::setup(JPABaseEmitter* emitter, const cXyz* pos, const csXyz* angle, s8) {
mpEmitter = emitter;
field_0x04 = false;
mbEnd = false;
field_0x20 = angle;
field_0x05 = false;
}
@@ -34,13 +34,13 @@ void daPy_swimTailEcallBack_c::setup(JPABaseEmitter* emitter, const cXyz* pos, c
void daPy_swimTailEcallBack_c::getMaxWaterY(JGeometry::TVec3<f32>* pos) {
if (daSea_ChkArea(pos->x, pos->z)) {
pos->y = daSea_calcWave(pos->x, pos->z) + 2.0f;
if (field_0x10 > pos->y) {
pos->y = field_0x10 + 2.0f;
if (mWaterFlatY > pos->y) {
pos->y = mWaterFlatY + 2.0f;
}
} else if (field_0x10 != -G_CM3D_F_INF) {
pos->y = field_0x10 + 2.0f;
} else if (mWaterFlatY != -G_CM3D_F_INF) {
pos->y = mWaterFlatY + 2.0f;
} else {
pos->y = field_0x0C;
pos->y = mWaterY;
}
}
@@ -62,7 +62,7 @@ void daPy_swimTailEcallBack_c::execute(JPABaseEmitter* emitter) {
dKy_get_seacolor(&ambColor, &difColor);
emitter->setGlobalPrmColor(ambColor.r, ambColor.g, ambColor.b);
if (field_0x04) {
if (mbEnd) {
s16 sp8 = emitter->getGlobalAlpha();
cLib_chaseS(&sp8, 0, 0x14);
emitter->setGlobalAlpha(sp8);
@@ -84,10 +84,10 @@ void daPy_swimTailEcallBack_c::execute(JPABaseEmitter* emitter) {
emitter->getGlobalTranslation(sp20);
getMaxWaterY(&sp20);
emitter->setGlobalTranslation(sp20);
cLib_chaseF(&field_0x08, 0.0f, 0.08f);
cLib_chaseF(&mSpeedRate, 0.0f, 0.08f);
}
emitter->setDirectionalSpeed(1.0f + 12.0f * field_0x08);
emitter->setDirectionalSpeed(1.0f + 12.0f * mSpeedRate);
if (field_0x05) {
emitter->setDirection(right_dir);
@@ -347,7 +347,7 @@ void daPy_fanSwingEcallBack_c::execute(JPABaseEmitter* emitter) {
/* 80129E9C-80129F48 .text execute__25daPy_waterDropPcallBack_cFP14JPABaseEmitterP15JPABaseParticle */
void daPy_waterDropPcallBack_c::execute(JPABaseEmitter* emitter, JPABaseParticle* ptcl) {
if (field_0x4) {
if (mbWaterMark) {
JGeometry::TVec3<f32> ptclPos;
ptcl->getGlobalPosition(ptclPos);
@@ -651,35 +651,29 @@ void daPy_lk_c::setWaterRipple() {
}
if (checkModeFlg(ModeFlg_SWIM)) {
if (!mSwimTailEcallBack[0].field_0x04) {
mSwimTailEcallBack[0].field_0x08 = std::fabsf(mVelocity / mMaxNormalSpeed);
if (!mSwimTailEcallBack[0].getEnd()) {
mSwimTailEcallBack[0].setSpeedRate(std::fabsf(mVelocity / mMaxNormalSpeed));
}
if (!mSwimTailEcallBack[1].field_0x04) {
mSwimTailEcallBack[1].field_0x08 = std::fabsf(mVelocity / mMaxNormalSpeed);
if (!mSwimTailEcallBack[1].getEnd()) {
mSwimTailEcallBack[1].setSpeedRate(std::fabsf(mVelocity / mMaxNormalSpeed));
}
cXyz local_1c;
cMtx_multVec(mpCLModel->getAnmMtx(15), &wave_offset, &local_1c);
cXyz local_20;
cXyz local_28;
local_1c.y = m35D0;
f32 cos = cM_scos(shape_angle.y) * 5.0f;
f32 sin = cM_ssin(shape_angle.y) * 5.0f;
local_20.x = local_1c.x + cos;
local_20.y = local_1c.y;
local_20.z = local_1c.z - sin;
local_28.x = local_1c.x - cos;
local_28.y = local_1c.y;
local_28.z = local_1c.z + sin;
mSwimTailEcallBack[0].mPos.set(local_20);
mSwimTailEcallBack[0].field_0x0C = m35D0 + 2.0f;
mSwimTailEcallBack[0].field_0x10 = mAcch.m_wtr.GetHeight();
mSwimTailEcallBack[1].mPos.set(local_28);
mSwimTailEcallBack[1].field_0x0C = m35D0 + 2.0f;
mSwimTailEcallBack[1].field_0x10 = mAcch.m_wtr.GetHeight();
cXyz local_20(local_1c.x + cos, local_1c.y, local_1c.z - sin);
cXyz local_28(local_1c.x - cos, local_1c.y, local_1c.z + sin);
mSwimTailEcallBack[0].setPos(local_20);
mSwimTailEcallBack[0].setWaterY(m35D0 + 2.0f);
mSwimTailEcallBack[0].setWaterFlatY(mAcch.m_wtr.GetHeight());
mSwimTailEcallBack[1].setPos(local_28);
mSwimTailEcallBack[1].setWaterY(m35D0 + 2.0f);
mSwimTailEcallBack[1].setWaterFlatY(mAcch.m_wtr.GetHeight());
cXyz local_40;
cMtx_multVec(mpCLModel->getAnmMtx(15), &swim_offset, &local_40);
@@ -808,7 +802,7 @@ void daPy_lk_c::setFootEffectType(int effectID, cXyz* i_pos, int param_2, int pa
footEffect->setAngle(&angle);
if (effectID == dPa_name::ID_COMMON_0023) {
if (checkNoResetFlg0(daPyFlg0_UNK80) && m35D0 > 10.0f + i_pos->y) {
footEffect->mPos.y = m35D0 - 10.0f;
footEffect->getPos().y = m35D0 - 10.0f;
}
} else if (mCurProc == daPyProc_CUT_ROLL_e && effectID == dPa_name::ID_COMMON_2022) {
effectID = -2;
@@ -897,7 +891,7 @@ void daPy_lk_c::setFootMark(cXyz* i_pos) {
fopKyM_create(PROC_WATER_MARK, (shape_angle.y << 16) | 2, &pos, &scale, NULL);
}
if (m336C.mpEmitter != NULL) {
if (m336C.getEmitter() != NULL) {
fopKyM_create(PROC_WATER_MARK, shape_angle.y << 16, i_pos, &scale);
}
}
@@ -931,7 +925,7 @@ void daPy_lk_c::setFootEffect() {
m3410.setAngle(0, current.angle.y + 0x8000, 0);
if (m3410.mpEmitter == NULL) {
if (m3410.getEmitter() == NULL) {
GXColor amb, dif;
dKy_get_seacolor(&amb, &dif);
@@ -1071,7 +1065,7 @@ void daPy_lk_c::setSwimTail() {
if (mSwimTailEcallBack[0].getEmitter() == NULL) {
dComIfGp_particle_setShipTail(dPa_name::ID_COMMON_003A, &mSwimTailEcallBack[0].getPos(), &current.angle, &scale, 0xFF, &mSwimTailEcallBack[0]);
mSwimTailEcallBack[0].field_0x05 = true;
mSwimTailEcallBack[0].onRightFlg();
}
if (mSwimTailEcallBack[1].getEmitter() == NULL) {
@@ -1093,20 +1087,20 @@ void daPy_lk_c::setCutWaterSplash() {
void daPy_lk_c::setSwimWaterDrop(daPy_waterDropEcallBack_c* callBack) {
f32 tmp = m35D0 + 10.0f;
if (checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP) || !checkNoResetFlg0(daPy_lk_c::daPyFlg0_UNK80) || (callBack->getPos().y > tmp && !checkModeFlg(ModeFlg_SWIM))) {
if (callBack->getEmitter() == NULL && (callBack->field_0x1C || checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP))) {
if (callBack->getEmitter() == NULL && (callBack->checkReady() || checkNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP))) {
JPABaseEmitter* emitter = dComIfGp_particle_setP1(dPa_name::ID_COMMON_0038, &callBack->getPos(), NULL, NULL, 0xFF, callBack);
if (emitter != NULL) {
emitter->setParticleCallBackPtr(&daPy_waterDropEcallBack_c::m_pcallback);
emitter->setParticleCallBackPtr(daPy_waterDropEcallBack_c::getPcallBack());
}
}
callBack->field_0x1C = FALSE;
callBack->offReady();
offNoResetFlg1(daPy_lk_c::daPyFlg1_WATER_DROP);
} else if (checkNoResetFlg0(daPy_lk_c::daPyFlg0_UNK80) && callBack->getPos().y < m35D0) {
callBack->end();
if (mCurProc != daPyProc_VOMIT_WAIT_e) {
callBack->field_0x1C = TRUE;
callBack->onReady();
}
}
}
@@ -1122,9 +1116,9 @@ void daPy_lk_c::setWaterDrop() {
m336C.setPos(&tmp);
if (checkModeFlg(ModeFlg_00000001)) {
daPy_waterDropEcallBack_c::m_pcallback.field_0x4 = TRUE;
daPy_waterDropEcallBack_c::getPcallBack()->onWaterMark();
} else {
daPy_waterDropEcallBack_c::m_pcallback.field_0x4 = FALSE;
daPy_waterDropEcallBack_c::getPcallBack()->offWaterMark();
}
if (daPy_dmEcallBack_c::checkFlame()) {
@@ -1135,7 +1129,12 @@ void daPy_lk_c::setWaterDrop() {
return;
}
if (dKyr_player_overhead_bg_chk() && dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_MISC_e && mCurProc != daPyProc_DEMO_LAST_COMBO_e && mAcch.m_roof_y == G_CM3D_F_INF) {
if (
dKyr_player_overhead_bg_chk() &&
dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_MISC_e &&
mCurProc != daPyProc_DEMO_LAST_COMBO_e &&
mAcch.GetRoofHeight() == G_CM3D_F_INF
) {
if (m3460[0].getEmitter() == NULL) {
m3460[0].makeEmitter(dPa_name::ID_COMMON_0432, mpCLModel->getAnmMtx(0x0E), &current.pos, NULL);
}
src/d/d_bg_s_acch.cpp
+13 -13
View File
@@ -65,10 +65,10 @@ dBgS_Acch::dBgS_Acch() {
field_0xb8 = 0.0f;
m_tbl_size = 0;
pm_acch_cir = NULL;
m_roof_y = 0.0f;
m_roof_crr_height = 0.0f;
m_roof_height = 0.0f;
m_water_check_offset = 200.0f;
m_roof_crr_height = 0.0f;
field_0xC4 = 0.0f;
m_wtr_check_offset = 200.0f;
pm_angle = NULL;
pm_shape_angle = NULL;
m_my_ac = NULL;
@@ -156,17 +156,17 @@ void dBgS_Acch::GroundCheck(dBgS& i_bgs) {
/* 800A305C-800A313C .text GroundRoofProc__9dBgS_AcchFR4dBgS */
void dBgS_Acch::GroundRoofProc(dBgS& i_bgs) {
if (m_ground_h != -G_CM3D_F_INF) {
if (field_0xb8 < m_roof_height && m_roof_height < pm_pos->y) {
pm_pos->y = m_roof_height;
if (field_0xb8 < field_0xC4 && field_0xC4 < pm_pos->y) {
pm_pos->y = field_0xC4;
}
if (!(m_flags & ROOF_NONE)) {
if (m_ground_h >= m_roof_y) {
if (m_ground_h >= m_roof_height) {
m_roof.SetExtChk(*this);
ClrRoofHit();
cXyz pos = *pm_pos;
m_roof.SetPos(pos);
m_roof_y = i_bgs.RoofChk(&m_roof);
m_roof_height = i_bgs.RoofChk(&m_roof);
}
}
}
@@ -248,15 +248,15 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
LineCheck(i_bgs);
}
m_roof_height = G_CM3D_F_INF;
field_0xC4 = G_CM3D_F_INF;
if (!(m_flags & ROOF_NONE)) {
m_roof.SetExtChk(*(cBgS_Chk*)this);
ClrRoofHit();
cXyz roofPos = *pm_pos;
m_roof.SetPos(roofPos);
m_roof_y = i_bgs.RoofChk(&m_roof);
if (m_roof_y != G_CM3D_F_INF && pm_pos->y + m_roof_crr_height > m_roof_y) {
m_roof_height = m_roof_y - m_roof_crr_height;
m_roof_height = i_bgs.RoofChk(&m_roof);
if (m_roof_height != G_CM3D_F_INF && pm_pos->y + m_roof_crr_height > m_roof_height) {
field_0xC4 = m_roof_height - m_roof_crr_height;
SetRoofHit();
}
}
@@ -265,8 +265,8 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
ClrGroundFind();
GroundCheck(i_bgs);
GroundRoofProc(i_bgs);
} else if (m_roof_height < pm_pos->y) {
pm_pos->y = m_roof_height;
} else if (field_0xC4 < pm_pos->y) {
pm_pos->y = field_0xC4;
}
if (!(m_flags & WATER_NONE)) {