d_a_obj_nameplate matching (#2445)

* d_a_obj_nameplate equivalent

* Address review comments d_a_obj_nameplate matching
This commit is contained in:
Lachlan Watson
2025-05-17 00:22:14 +10:00
committed by GitHub
parent d86fc591f4
commit df8d6655a3
3 changed files with 346 additions and 331 deletions
+46 -10
View File
@@ -1,8 +1,9 @@
#ifndef D_A_OBJ_NAMEPLATE_H
#define D_A_OBJ_NAMEPLATE_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
#include "d/d_com_inf_game.h"
#include "d/d_msg_flow.h"
/**
* @ingroup actors-objects
@@ -21,21 +22,56 @@ public:
/* 805942B8 */ void setCcSphere();
/* 8059434C */ void calcAngle();
/* 805945CC */ void calcSpring();
/* 80594754 */ void checkHitAngle();
/* 80594754 */ int checkHitAngle();
/* 805947F8 */ void messageProc();
static u8 const M_attr[32];
struct M_attrs {
/* 0x00 */ f32 radius1;
/* 0x04 */ f32 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0C;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ s16 field_0x18;
/* 0x1A */ s16 field_0x1A;
/* 0x1C */ s16 field_0x1C;
// unknown types
/* 0x1E */ u8 field_0x1E;
/* 0x1F */ u8 field_0x1F;
};
static M_attrs const M_attr;
static M_attrs const& attr() { return M_attr; }
static char* l_arcName;
~daObjNameplate_c() { dComIfG_resDelete(&this->mPhase, l_arcName); }
inline int create();
inline int draw();
inline int createHeap();
private:
/* 0x568 */ u8 field_0x568[0x780 - 0x568];
/* 0x568 */ J3DModel* model;
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ Mtx mMtx;
/* 0x5A4 */ dCcD_Stts mCcDStts;
/* 0x5E0 */ dCcD_Sph mCcDSph;
/* 0x718 */ f32 field_0x718;
/* 0x71C */ f32 field_0x71C;
/* 0x720 */ s16 field_0x720;
/* 0x722 */ s16 field_0x722;
/* 0x724 */ s16 field_0x724;
/* 0x726 */ u16 field_0x726;
/* 0x728 */ dMsgFlow_c mMsgFlow;
/* 0x774 */ s16 mShowMessage;
/* 0x776 */ s16 mMessageFlowId;
/* 0x778 */ s16 field_0x778;
/* 0x77A */ s16 field_0x77A;
/* 0x77C */ s16 field_0x77C;
/* 0x77E */ s16 field_0x77E;
};
STATIC_ASSERT(sizeof(daObjNameplate_c) == 0x780);
struct daObj {
public:
/* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32);
};
#endif /* D_A_OBJ_NAMEPLATE_H */