d_a_obj_gaship2 work

This commit is contained in:
Crain-32
2024-01-20 14:50:55 -07:00
parent 4803c19fe0
commit e1b0b34519
3 changed files with 120 additions and 127 deletions
+1 -1
View File
@@ -1530,7 +1530,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_ftree"),
ActorRel(Matching, "d_a_obj_ganonbed", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_obj_gaship"),
ActorRel(NonMatching, "d_a_obj_gaship2"),
ActorRel(Matching, "d_a_obj_gaship2"),
ActorRel(NonMatching, "d_a_obj_gnnbtltaki"),
ActorRel(NonMatching, "d_a_obj_gnndemotakie"),
ActorRel(NonMatching, "d_a_obj_gnndemotakis"),
+5 -5
View File
@@ -19,11 +19,11 @@ public:
static const char M_arcname[8];
request_of_phase_process_class mphs;
J3DModel* mpModel;
dBgW* field_x2A0;
Mtx field_x2A4;
/* Place member variables here */
/* 0x290 */ request_of_phase_process_class mphs;
/* 0x29C */ J3DModel* mpModel;
/* 0x2A0 */ dBgW* field_x2A0;
/* 0x2A4 */ Mtx field_x2A4;
/* 0x2D4 u8 padding? */
};
}; // namespace daObjGaship2
+114 -121
View File
@@ -11,147 +11,140 @@
#include "d/d_procname.h"
#include "m_Do/m_Do_mtx.h"
const char daObjGaship2::Act_c::M_arcname[] = "YakeRom";
/* 00000078-0000009C .text solidHeapCB__Q212daObjGaship25Act_cFP10fopAc_ac_c */
BOOL daObjGaship2::Act_c::solidHeapCB(fopAc_ac_c *i_this) {
return ((Act_c *) i_this)->create_heap();
}
/* 0000009C-00000220 .text create_heap__Q212daObjGaship25Act_cFv */
bool daObjGaship2::Act_c::create_heap() {
J3DModelData *mdl_data;
cBgD_t *bgw_data;
bool uVar4;
mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, 4));
JUT_ASSERT(0x5A, mdl_data != 0);
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002);
set_mtx();
bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, 7));
JUT_ASSERT(0x67, bgw_data != 0);
if (bgw_data != NULL) {
field_x2A0 = new dBgW();
if (field_x2A0 != NULL && (field_x2A0->Set(bgw_data, cBgW::MOVE_BG_e, &field_x2A4) == 1)) {
return false;
}
}
uVar4 = false;
if (mdl_data != NULL && mpModel != NULL && bgw_data != NULL && field_x2A0 != NULL) {
uVar4 = true;
}
return uVar4;
}
/* 00000220-000002F8 .text _create__Q212daObjGaship25Act_cFv */
s32 daObjGaship2::Act_c::_create() {
fopAcM_SetupActor(this, Act_c);
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mphs, M_arcname);
if (phase == cPhs_COMPLEATE_e) {
if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0) & 0xFF) {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
dComIfG_Bgsp()->Regist(field_x2A0, this);
field_x2A0->SetCrrFunc(dBgS_MoveBGProc_Typical);
} else {
phase = cPhs_ERROR_e;
}
}
return phase;
}
/* 000002F8-00000384 .text _delete__Q212daObjGaship25Act_cFv */
BOOL daObjGaship2::Act_c::_delete() {
if (heap != NULL && field_x2A0 != NULL) {
if (field_x2A0->ChkUsed()) {
dComIfG_Bgsp()->Release(field_x2A0);
}
}
dComIfG_resDelete(&mphs, M_arcname);
return true;
}
/* 00000384-00000430 .text set_mtx__Q212daObjGaship25Act_cFv */
// Not Matching
void daObjGaship2::Act_c::set_mtx() {
mpModel->setBaseScale(mScale);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
MTXCopy(mDoMtx_stack_c::now, field_x2A4);
mpModel->calc();
}
/* 00000430-00000468 .text _execute__Q212daObjGaship25Act_cFv */
BOOL daObjGaship2::Act_c::_execute() {
set_mtx();
field_x2A0->Move();
return TRUE;
}
/* 00000468-00000508 .text _draw__Q212daObjGaship25Act_cFv */
BOOL daObjGaship2::Act_c::_draw() {
dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
dComIfGd_setListBG();
dKy_getEnvlight().setLightTevColorType(mpModel, &mTevStr);
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
return TRUE;
};
namespace daObjGaship2 {
const char Act_c::M_arcname[] = "YakeRom";
/* 00000078-0000009C .text solidHeapCB__Q212daObjGaship25Act_cFP10fopAc_ac_c */
BOOL daObjGaship2::Act_c::solidHeapCB(fopAc_ac_c *i_this) {
return ((Act_c *) i_this)->create_heap();
}
/* 0000009C-00000220 .text create_heap__Q212daObjGaship25Act_cFv */
bool daObjGaship2::Act_c::create_heap() {
J3DModelData *mdl_data;
cBgD_t *bgw_data;
bool uVar4;
mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, 4));
JUT_ASSERT(0x5A, mdl_data != 0);
mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002);
set_mtx();
bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, 7));
JUT_ASSERT(0x67, bgw_data != 0);
if (bgw_data != NULL) {
field_x2A0 = new dBgW();
if (field_x2A0 != NULL && (field_x2A0->Set(bgw_data, cBgW::MOVE_BG_e, &field_x2A4) == 1)) {
return false;
}
}
uVar4 = false;
if (mdl_data != NULL && mpModel != NULL && bgw_data != NULL && field_x2A0 != NULL) {
uVar4 = true;
}
return uVar4;
}
/* 00000220-000002F8 .text _create__Q212daObjGaship25Act_cFv */
s32 daObjGaship2::Act_c::_create() {
fopAcM_SetupActor((fopAc_ac_c*)this, Act_c);
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mphs, M_arcname);
if (phase == cPhs_COMPLEATE_e) {
if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0) & 0xFF) {
mCullMtx = mpModel->mBaseTransformMtx;
dComIfG_Bgsp()->Regist(field_x2A0, this);
field_x2A0->SetCrrFunc(dBgS_MoveBGProc_Typical);
} else {
phase = cPhs_ERROR_e;
}
}
return phase;
}
/* 000002F8-00000384 .text _delete__Q212daObjGaship25Act_cFv */
BOOL daObjGaship2::Act_c::_delete() {
if (heap != NULL && field_x2A0 != NULL) {
if (field_x2A0->ChkUsed()) {
dComIfG_Bgsp()->Release(field_x2A0);
}
}
dComIfG_resDelete(&mphs, M_arcname);
return true;
}
/* 00000384-00000430 .text set_mtx__Q212daObjGaship25Act_cFv */
// Not Matching
void daObjGaship2::Act_c::set_mtx() {
MtxP pNow = mDoMtx_stack_c::get();
mpModel->mBaseScale = mScale;
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::transS(mpModel->mBaseScale);
mpModel->setBaseTRMtx(pNow);
MTXCopy(mDoMtx_stack_c::now, field_x2A4);
mpModel->calc();
}
/* 00000430-00000468 .text _execute__Q212daObjGaship25Act_cFv */
BOOL daObjGaship2::Act_c::_execute() {
set_mtx();
field_x2A0->Move();
return TRUE;
}
/* 00000468-00000508 .text _draw__Q212daObjGaship25Act_cFv */
BOOL daObjGaship2::Act_c::_draw() {
dKy_getEnvlight().settingTevStruct(TEV_TYPE_BG0, &current.pos, &mTevStr);
dComIfGd_setListBG();
dKy_getEnvlight().setLightTevColorType(mpModel, &mTevStr);
mDoExt_modelUpdateDL(mpModel);
dComIfGd_setList();
return TRUE;
};
namespace {
/* 000005EC-0000060C .text Mthd_Create__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
s32 Mthd_Create(void *i_this) {
return ((Act_c *) i_this)->_create();
return ((daObjGaship2::Act_c *) i_this)->_create();
}
/* 0000060C-00000630 .text Mthd_Delete__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
u8 Mthd_Delete(void *i_this) {
return ((Act_c *) i_this)->_delete();
return ((daObjGaship2::Act_c *) i_this)->_delete();
}
/* 00000630-00000654 .text Mthd_Execute__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
u8 Mthd_Execute(void *i_this) {
return ((Act_c *) i_this)->_execute();
return ((daObjGaship2::Act_c *) i_this)->_execute();
}
/* 00000654-00000678 .text Mthd_Draw__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
u8 Mthd_Draw(void *i_this) {
return ((Act_c *) i_this)->_draw();
return ((daObjGaship2::Act_c *) i_this)->_draw();
}
/* 00000678-00000680 .text Mthd_IsDelete__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
BOOL Mthd_IsDelete(void *i_this) {
return TRUE;
}
actor_method_class Mthd_Table = {
(process_method_func) Mthd_Create, (process_method_func) Mthd_Delete,
(process_method_func) Mthd_Execute, (process_method_func) Mthd_IsDelete,
(process_method_func) Mthd_Create,
(process_method_func) Mthd_Delete,
(process_method_func) Mthd_Execute,
(process_method_func) Mthd_IsDelete,
(process_method_func) Mthd_Draw,
};
}
}
actor_process_profile_definition g_profile_Obj_Gaship2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 3,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Obj_Gaship2,
/* Proc SubMtd */ &g_fpcLf_Method.mBase,
/* Size */ sizeof(Act_c),
/* SizeOther */ 0,
/* Parameters */ 0x00,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 0x0040,
/* Actor SubMtd */ &Mthd_Table,
/* Group */ 0x00040000,
};
}// namespace
}; // namespace daObjGaship2
actor_process_profile_definition g_profile_Obj_Gaship2 = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 3,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_Obj_Gaship2,
/* Proc SubMtd */ &g_fpcLf_Method.mBase,
/* Size */ sizeof(daObjGaship2::Act_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 0x0040,
/* Actor SubMtd */ &daObjGaship2::Mthd_Table,
/* Status */ fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* Cull Type */ fopAc_CULLBOX_0_e,
};