mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-14 14:28:14 -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 235cb9a9ad
commit c0e0bbaaf3
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_grm.cpp
+55 -30
View File
@@ -131,6 +131,28 @@ daNpc_grM_c::cutFunc daNpc_grM_c::mCutList[2] = {
&daNpc_grM_c::cutTalkSpa,
};
static NPC_GRM_HIO_CLASS l_HIO;
daNpc_grM_HIOParam const daNpc_grM_Param_c::m = {
300.0f, -3.0f, 1.0f, 600.0f, 255.0f, 260.0f, 35.0f, 70.0f, 0.0f, 0.0f, 30.0f,
-30.0f, 30.0f, -10.0f, 20.0f, -20.0f, 0.6f, 12.0f, 8, 6, 8, 6,
0.0f, 0.0f, 0.0f, 0.0f, 60, 8, 0, 0, 0, false, false,
4.0f, -20.0f, 0.0f, -20.0f, 20.0f, 40.0f, 20.0f, 110.0f};
#if DEBUG
daNpc_grM_HIO_c::daNpc_grM_HIO_c() {
m = daNpc_grM_Param_c::m;
}
void daNpc_grM_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
// NONMATCHING
}
void daNpc_grM_HIO_c::genMessage(JORMContext* ctx) {
// NONMATCHING
}
#endif
daNpc_grM_c::~daNpc_grM_c() {
deleteObject();
@@ -138,15 +160,15 @@ daNpc_grM_c::~daNpc_grM_c() {
mpMorf[0]->stopZelAnime();
}
#if DEBUG
if (mpHIO != NULL) {
mpHIO->removeHIO();
}
#endif
deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
}
daNpc_grM_HIOParam const daNpc_grM_Param_c::m = {
300.0f, -3.0f, 1.0f, 600.0f, 255.0f, 260.0f, 35.0f, 70.0f, 0.0f, 0.0f, 30.0f,
-30.0f, 30.0f, -10.0f, 20.0f, -20.0f, 0.6f, 12.0f, 8, 6, 8, 6,
0.0f, 0.0f, 0.0f, 0.0f, 60, 8, 0, 0, 0, false, false,
4.0f, -20.0f, 0.0f, -20.0f, 20.0f, 40.0f, 20.0f, 110.0f};
cPhs__Step daNpc_grM_c::create() {
daNpcT_ct(this, daNpc_grM_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -176,6 +198,11 @@ cPhs__Step daNpc_grM_c::create() {
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
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));
mAcch.CrrPos(dComIfG_Bgsp());
@@ -184,7 +211,7 @@ cPhs__Step daNpc_grM_c::create() {
setEnvTevColor();
setRoomNo();
mCcStts.Init(daNpc_grM_Param_c::m.common.weight, 0, this);
mCcStts.Init(mpHIO->m.common.weight, 0, this);
mCyl.Set(mCcDCyl);
mCyl.SetStts(&mCcStts);
mCyl.SetTgHitCallback(tgHitCallBack);
@@ -344,10 +371,10 @@ void daNpc_grM_c::setParam() {
selectAction();
srchActors();
s16 talk_distance = daNpc_grM_Param_c::m.common.talk_distance;
s16 talk_angle = daNpc_grM_Param_c::m.common.talk_angle;
s16 attention_distance = daNpc_grM_Param_c::m.common.attention_distance;
s16 attention_angle = daNpc_grM_Param_c::m.common.attention_angle;
s16 talk_distance = mpHIO->m.common.talk_distance;
s16 talk_angle = mpHIO->m.common.talk_angle;
s16 attention_distance = mpHIO->m.common.attention_distance;
s16 attention_angle = mpHIO->m.common.attention_angle;
attention_info.distances[fopAc_attn_LOCK_e] =
daNpcT_getDistTableIdx(attention_distance, attention_angle);
@@ -356,17 +383,17 @@ void daNpc_grM_c::setParam() {
daNpcT_getDistTableIdx(talk_distance, talk_angle);
attention_info.flags = uVar1;
scale.set(daNpc_grM_Param_c::m.common.scale, daNpc_grM_Param_c::m.common.scale,
daNpc_grM_Param_c::m.common.scale);
mCcStts.SetWeight(daNpc_grM_Param_c::m.common.weight);
mCylH = daNpc_grM_Param_c::m.common.height;
mWallR = daNpc_grM_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_grM_Param_c::m.common.knee_length);
mRealShadowSize = daNpc_grM_Param_c::m.common.real_shadow_size;
gravity = daNpc_grM_Param_c::m.common.gravity;
mExpressionMorfFrame = daNpc_grM_Param_c::m.common.expression_morf_frame;
mMorfFrames = daNpc_grM_Param_c::m.common.morf_frame;
mAcchCir.SetWallH(mpHIO->m.common.knee_length);
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_grM_c::setAfterTalkMotion() {
@@ -521,12 +548,12 @@ void daNpc_grM_c::setAttnPos() {
mStagger.calc(FALSE);
mJntAnm.setParam(
this, mpMorf[0]->getModel(), &sp48, getBackboneJointNo(), getNeckJointNo(),
getHeadJointNo(), daNpc_grM_Param_c::m.common.body_angleX_min,
daNpc_grM_Param_c::m.common.body_angleX_max, daNpc_grM_Param_c::m.common.body_angleY_min,
daNpc_grM_Param_c::m.common.body_angleY_max, daNpc_grM_Param_c::m.common.head_angleX_min,
daNpc_grM_Param_c::m.common.head_angleX_max, daNpc_grM_Param_c::m.common.head_angleY_min,
daNpc_grM_Param_c::m.common.head_angleY_max,
daNpc_grM_Param_c::m.common.neck_rotation_ratio, 0.0f, NULL);
getHeadJointNo(), 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)));
J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -540,7 +567,7 @@ void daNpc_grM_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_grM_Param_c::m.common.attention_offset;
attention_info.position.y += mpHIO->m.common.attention_offset;
}
void daNpc_grM_c::setCollision() {
@@ -784,8 +811,6 @@ static BOOL daNpc_grM_IsDelete(void* param_0) {
return TRUE;
}
static daNpc_grM_Param_c l_HIO;
static actor_method_class daNpc_grM_MethodTable = {
(process_method_func)daNpc_grM_Create, (process_method_func)daNpc_grM_Delete,
(process_method_func)daNpc_grM_Execute, (process_method_func)daNpc_grM_IsDelete,