encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_flag Matching (#2477)

Browse Source 
* d_a_obj_flag Matching

* Formatting
This commit is contained in:
hatal175
2025-06-05 15:17:38 -07:00
committed by GitHub
parent 2671e02784
commit 357de95e41
7 changed files with 121 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_e_gs.h
+3 -1
View File
@@ -37,11 +37,13 @@ public:
STATIC_ASSERT(sizeof(e_gs_class) == 0x6bc);
class daE_GS_HIO_c {
class daE_GS_HIO_c : public JORReflexible {
public:
/* 806DF46C */ daE_GS_HIO_c();
/* 806DFD5C */ virtual ~daE_GS_HIO_c() {}
void genMessage(JORMContext*);
/* 0x04 */ s8 id;
/* 0x08 */ f32 base_size;
/* 0x0C */ s16 appear_time_lag;
include/d/actor/d_a_e_is.h
+3 -1
View File
@@ -60,11 +60,13 @@ public:
STATIC_ASSERT(sizeof(e_is_class) == 0xcf8);
class daE_IS_HIO_c {
class daE_IS_HIO_c : public JORReflexible {
public:
/* 806F5A4C */ daE_IS_HIO_c();
/* 806F7AC4 */ virtual ~daE_IS_HIO_c() {}
void genMessage(JORMContext*);
/* 0x04 */ s8 id;
/* 0x08 */ f32 base_size;
/* 0x0C */ f32 normal_speed;
include/d/actor/d_a_obj_flag.h
+5 -80
View File
@@ -57,85 +57,10 @@ public:
dComIfG_resDelete(&this->mPhase2, daSetBgObj_c::getArcName(this));
}
int create() {
fopAcM_SetupActor(this, daObjFlag_c);
int phase_state = dComIfG_resLoad(&mPhase, "FlagObj");
if (phase_state != cPhs_COMPLEATE_e) {
return phase_state;
}
phase_state = dComIfG_resLoad(&mPhase2, daSetBgObj_c::getArcName(this));
if(phase_state == cPhs_COMPLEATE_e) {
if(!fopAcM_entrySolidHeap(this, createSolidHeap, 0x4000)) {
return cPhs_ERROR_e;
}
create_init();
}
return phase_state;
}
int execute() {
if (mpModel1 == NULL) {
return 1;
}
calcJointAngle();
return 1;
}
int draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
dComIfGd_setListBG();
g_env_light.setLightTevColorType_MAJI(mpModel2, &tevStr);
mDoExt_modelUpdateDL(mpModel2);
if(mpModel1 != NULL) {
g_env_light.setLightTevColorType_MAJI(mpModel1, &tevStr);
mDoExt_modelUpdateDL(mpModel1);
}
dComIfGd_setList();
return 1;
}
int createHeap() {
bool tmp = 0;
s8 angle = (u8)shape_angle.x;
if(angle <= -1 || angle > 99) {
tmp = false;
}
else {
tmp = true;
char resName[12];
sprintf(resName, "flag%02d.bmd");
shape_angle.setall(0);
current.angle.setall(0);
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("FlagObj", resName);
mpModel1 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
for(u8 i = 0; i < 5; i += 1) {
J3DJoint* nodePtr = (J3DJoint*)((u64)mpModel1->getModelData()->getJointNodePointer(i));
if(nodePtr != NULL) {
nodePtr->setCallBack(nodeCallBack);
mpModel1->setUserArea((u64)this);
}
}
}
mpModel2 = mDoExt_J3DModel__create((J3DModelData *)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "model0.bmd"), 0x80000, 0x11000084);
if(mpModel2 == NULL && tmp && mpModel1 == NULL) {
return 0;
}
return 1;
}
inline int create();
inline int execute();
inline int draw();
inline int createHeap();
struct M_attrs {
/* 0x00 */ f32 field_0x00;
@@ -162,7 +87,7 @@ public:
};
static M_attrs const M_attr;
static M_attrs const& attr() { return M_attr; }
M_attrs const& attr() const { return M_attr; }
};
STATIC_ASSERT(sizeof(daObjFlag_c) == 0x5ec);