mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up HIO for TUs using HIOParam/Param_c/HIO_c pattern (#3043)

Browse Source
This commit is contained in:
Max Roncace
2026-01-13 17:58:15 -05:00
committed by GitHub
parent 223d307f70
commit db936de5c9
143 changed files with 6215 additions and 4094 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_zelRo.cpp
+54 -29
View File
@@ -88,14 +88,6 @@ daNpc_ZelRo_c::cutFunc daNpc_ZelRo_c::mCutList[1] = {
NULL
};
daNpc_ZelRo_c::~daNpc_ZelRo_c() {
if (heap != NULL) {
mpMorf[0]->stopZelAnime();
}
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
const daNpc_ZelRo_HIOParam daNpc_ZelRo_Param_c::m = {
190.0f,
-3.0f,
@@ -140,6 +132,36 @@ const daNpc_ZelRo_HIOParam daNpc_ZelRo_Param_c::m = {
0.0f,
};
static NPC_ZELRO_HIO_CLASS l_HIO;
#if DEBUG
daNpc_ZelRo_HIO_c::daNpc_ZelRo_HIO_c() {
m = daNpc_ZelRo_Param_c::m;
}
void daNpc_ZelRo_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
// NONMATCHING
}
void daNpc_ZelRo_HIO_c::genMessage(JORMContext* ctx) {
// NONMATCHING
}
#endif
daNpc_ZelRo_c::~daNpc_ZelRo_c() {
if (heap != NULL) {
mpMorf[0]->stopZelAnime();
}
#if DEBUG
if (mpHIO != NULL) {
mpHIO->removeHIO();
}
#endif
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
cPhs__Step daNpc_ZelRo_c::create() {
daNpcT_ct(this, daNpc_ZelRo_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -170,6 +192,11 @@ cPhs__Step daNpc_ZelRo_c::create() {
mSound.init(&current.pos, &eyePos, 3, 1);
#if DEBUG
mpHIO = &l_HIO;
mpHIO->entryHIO("フ－ドなしロ－ブゼルダ");
#endif
mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this),
fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this));
@@ -180,7 +207,7 @@ cPhs__Step daNpc_ZelRo_c::create() {
setEnvTevColor();
setRoomNo();
mCcStts.Init(daNpc_ZelRo_Param_c::m.common.weight, 0, this);
mCcStts.Init(mpHIO->m.common.weight, 0, this);
mCyl.Set(mCcDCyl);
mCyl.SetStts(&mCcStts);
mCyl.SetTgHitCallback(tgHitCallBack);
@@ -374,25 +401,25 @@ void daNpc_ZelRo_c::setParam() {
selectAction();
srchActors();
s16 talk_distance = daNpc_ZelRo_Param_c::m.common.talk_distance;
s16 talk_angle = daNpc_ZelRo_Param_c::m.common.talk_angle;
s16 talk_distance = mpHIO->m.common.talk_distance;
s16 talk_angle = mpHIO->m.common.talk_angle;
attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(daNpc_ZelRo_Param_c::m.common.attention_distance, daNpc_ZelRo_Param_c::m.common.attention_angle);
attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(mpHIO->m.common.attention_distance, mpHIO->m.common.attention_angle);
attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e];
attention_info.distances[fopAc_attn_SPEAK_e] = daNpcT_getDistTableIdx(talk_distance, talk_angle);
attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
scale.set(daNpc_ZelRo_Param_c::m.common.scale, daNpc_ZelRo_Param_c::m.common.scale, daNpc_ZelRo_Param_c::m.common.scale);
mCcStts.SetWeight(daNpc_ZelRo_Param_c::m.common.weight);
mCylH = daNpc_ZelRo_Param_c::m.common.height;
mWallR = daNpc_ZelRo_Param_c::m.common.width;
scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale);
mCcStts.SetWeight(mpHIO->m.common.weight);
mCylH = mpHIO->m.common.height;
mWallR = mpHIO->m.common.width;
mAcchCir.SetWallR(mWallR);
mAcchCir.SetWallH(daNpc_ZelRo_Param_c::m.common.knee_length);
mAcchCir.SetWallH(mpHIO->m.common.knee_length);
mRealShadowSize = daNpc_ZelRo_Param_c::m.common.real_shadow_size;
gravity = daNpc_ZelRo_Param_c::m.common.gravity;
mExpressionMorfFrame = daNpc_ZelRo_Param_c::m.common.expression_morf_frame;
mMorfFrames = daNpc_ZelRo_Param_c::m.common.morf_frame;
mRealShadowSize = mpHIO->m.common.real_shadow_size;
gravity = mpHIO->m.common.gravity;
mExpressionMorfFrame = mpHIO->m.common.expression_morf_frame;
mMorfFrames = mpHIO->m.common.morf_frame;
}
void daNpc_ZelRo_c::setAfterTalkMotion() {
@@ -479,11 +506,11 @@ void daNpc_ZelRo_c::setAttnPos() {
mStagger.calc(FALSE);
mJntAnm.setParam(this, mpMorf[0]->getModel(), &sp48, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(),
daNpc_ZelRo_Param_c::m.common.body_angleX_min, daNpc_ZelRo_Param_c::m.common.body_angleX_max,
daNpc_ZelRo_Param_c::m.common.body_angleY_min, daNpc_ZelRo_Param_c::m.common.body_angleY_max,
daNpc_ZelRo_Param_c::m.common.head_angleX_min, daNpc_ZelRo_Param_c::m.common.head_angleX_max,
daNpc_ZelRo_Param_c::m.common.head_angleY_min, daNpc_ZelRo_Param_c::m.common.head_angleY_max,
daNpc_ZelRo_Param_c::m.common.neck_rotation_ratio, 0.0f, NULL);
mpHIO->m.common.body_angleX_min, mpHIO->m.common.body_angleX_max,
mpHIO->m.common.body_angleY_min, mpHIO->m.common.body_angleY_max,
mpHIO->m.common.head_angleX_min, mpHIO->m.common.head_angleX_max,
mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max,
mpHIO->m.common.neck_rotation_ratio, 0.0f, NULL);
mJntAnm.calcJntRad(0.2f, 1.0f, cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y)));
setMtx();
@@ -492,7 +519,7 @@ void daNpc_ZelRo_c::setAttnPos() {
mJntAnm.setEyeAngleX(eyePos, 1.0f, 0);
mJntAnm.setEyeAngleY(eyePos, mCurAngle.y, FALSE, 1.0f, 0);
attention_info.position = current.pos;
attention_info.position.y += daNpc_ZelRo_Param_c::m.common.attention_offset;
attention_info.position.y += mpHIO->m.common.attention_offset;
}
void daNpc_ZelRo_c::setCollision() {
@@ -651,8 +678,6 @@ static int daNpc_ZelRo_IsDelete(void* a_this) {
return 1;
}
static daNpc_ZelRo_Param_c l_HIO;
static actor_method_class daNpc_ZelRo_MethodTable = {
(process_method_func)daNpc_ZelRo_Create,
(process_method_func)daNpc_ZelRo_Delete,