d_a_swtdoor 90%

2026-05-25 15:25:07 -04:00 · 2023-10-20 21:14:00 -07:00
parent fed6248532
commit f890e8b293
3 changed files with 105 additions and 121 deletions
@@ -201,8 +201,8 @@ public:
    ~fopAc_cullSizeBox() {}
 #endif

-    /* 0x0 */ Vec mMin;
-    /* 0xC */ Vec mMax;
+    /* 0x0 */ cXyz mMin;
+    /* 0xC */ cXyz mMax;
 };

 class fopAc_ac_c : public leafdraw_class {
@@ -385,9 +385,13 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback

 bool fopAcM_entrySolidHeap(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback, u32 size);

-void fopAcM_SetMin(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ);
+inline void fopAcM_SetMin(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ) {
+    p_actor->mCull.mBox.mMin.set(minX, minY, minZ);
+}

-void fopAcM_SetMax(fopAc_ac_c* p_actor, f32 maxX, f32 maxY, f32 maxZ);
+inline void fopAcM_SetMax(fopAc_ac_c* p_actor, f32 maxX, f32 maxY, f32 maxZ) {
+    p_actor->mCull.mBox.mMax.set(maxX, maxY, maxZ);
+}

 void fopAcM_setCullSizeBox(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY,
                           f32 maxZ);
@@ -536,107 +540,4 @@ inline void fopAcM_monsSeStart(fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
    mDoAud_monsSeStart(sfxID, &actor->mEyePos, fopAcM_GetID(actor), 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
 }

-extern "C" {
-void fopAcM_initManager__Fv(void);
-void fopAcM_CreateAppend__Fv(void);
-void fopAcM_DeleteHeap__FP10fopAc_ac_c(void);
-void fopAcM_FastCreate__FsPFPv_iPvPv(void);
-void fopAcM_Log__FPC10fopAc_ac_cPCc(void);
-void fopAcM_SearchByID__FUiPP10fopAc_ac_c(void);
-void fopAcM_calcSpeed__FP10fopAc_ac_c(void);
-void fopAcM_callCallback__FP10fopAc_ac_cPFP10fopAc_ac_c_iP7JKRHeap(void);
-void fopAcM_cancelCarryNow__FP10fopAc_ac_c(void);
-void fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
-void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
-void fopAcM_createDemoItem__FPC4cXyziiPC5csXyziPC4cXyzUc(void);
-void fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi(void);
-void fopAcM_createItemForDirectGet__FPC4cXyziiPC5csXyzPC4cXyzff(void);
-void fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz(void);
-void fopAcM_createItemForSimpleDemo__FPC4cXyziiPC5csXyzPC4cXyzff(void);
-void fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz(void);
-void fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb(void);
-void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(void);
-void fopAcM_cullingCheck__FPC10fopAc_ac_c(void);
-void fopAcM_delete__FP10fopAc_ac_c(void);
-void fopAcM_delete__FUi(void);
-void fopAcM_effHamonSet__FPUlPC4cXyzff(void);
-void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(void);
-void fopAcM_entrySolidHeap___FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(void);
-void fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv(void);
-void fopAcM_fastCreateItem__FPC4cXyziiPC5csXyzPC4cXyzPfPfiiPFPv_i(void);
-void fopAcM_fastCreateItem2__FPC4cXyziiiiPC5csXyzPC4cXyz(void);
-void fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv(void);
-void fopAcM_findObject4EventCB__FP10fopAc_ac_cPv(void);
-void fopAcM_findObjectCB__FPC10fopAc_ac_cPv(void);
-void gndCheck__11fopAcM_gc_cFPC4cXyz(void);
-void fopAcM_getEventPartner__FPC10fopAc_ac_c(void);
-void fopAcM_getItemEventPartner__FPC10fopAc_ac_c(void);
-void fopAcM_getItemNoFromTableNo__FUc(void);
-void fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos(void);
-void fopAcM_getPolygonAngle__FPC8cM3dGPlas(void);
-void fopAcM_getProcNameString__FPC10fopAc_ac_c(void);
-void fopAcM_getTalkEventPartner__FPC10fopAc_ac_c(void);
-void fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii(void);
-void fopAcM_getWaterY__FPC4cXyzPf(void);
-void lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c(void);
-void fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
-void fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs(void);
-void fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
-void fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs(void);
-void fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs(void);
-void fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs(void);
-void fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs(void);
-void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(void);
-void fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs(void);
-void fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs(void);
-void fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
-void fopAcM_orderTalkItemBtnEvent__FUsP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
-void fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
-void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(void);
-void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(void);
-void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
-void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
-void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
-void fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
-void fopAcM_searchFromName__FPCcUlUl(void);
-void fopAcM_searchFromName4Event__FPCcs(void);
-void fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
-void fopAcM_setCarryNow__FP10fopAc_ac_ci(void);
-void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(void);
-void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(void);
-void fopAcM_setRoomLayer__FPvi(void);
-void fopAcM_setStageLayer__FPv(void);
-void waterCheck__11fopAcM_wt_cFPC4cXyz(void);
-void fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz(void);
-void fopAcM_SearchByName__FsPP10fopAc_ac_c(void);
-void fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
-void fopAcM_SetMin__FP10fopAc_ac_cfff(void);
-void fopAcM_SetMax__FP10fopAc_ac_cfff(void);
-void fopAcM_setCullSizeSphere__FP10fopAc_ac_cffff(void);
-void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(void);
-void fopAcM_addAngleY__FP10fopAc_ac_css(void);
-void fopAcM_searchActorAngleX__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
-void fopAcM_searchActorDistance2__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
-void fopAcM_rollPlayerCrash__FPC10fopAc_ac_cfUlffif(void);
-void fopAcM_checkCullingBox__FPA4_fffffff(void);
-void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs(void);
-void fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf(void);
-void fopAcM_createItemForBoss__FPC4cXyziiPC5csXyzPC4cXyzffi(void);
-void fopAcM_createItemForMidBoss__FPC4cXyziiPC5csXyzPC4cXyzii(void);
-void fopAcM_createBokkuri__FUsPC4cXyziiiPC4cXyzii(void);
-void fopAcM_createWarpHole__FPC4cXyzPC5csXyziUcUcUc(void);
-void fopAcM_myRoomSearchEnemy__FSc(void);
-void fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc(void);
-void fopAcM_otoCheck__FPC10fopAc_ac_cf(void);
-void fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
-void fopAcM_wayBgCheck__FPC10fopAc_ac_cff(void);
-void fopAcM_plAngleCheck__FPC10fopAc_ac_cs(void);
-void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void);
-void fopAcM_riverStream__FP4cXyzPsPff(void);
-void fopAcM_carryOffRevise__FP10fopAc_ac_c(void);
-void fopAcM_searchFromName4Event__FPCcs(void);
-void fopAcM_GetName__FPv(void);  // mostly inlined
-void fopAcM_GetID__FPCv(void);   // mostly inlined
-}
-
 #endif
@@ -3,36 +3,119 @@
 // Translation Unit: d_a_swtdoor.cpp
 //

-#include "d_a_swtdoor.h"
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/d_com_inf_game.h"
+#include "d/d_procname.h"
+#include "d/actor/d_a_player.h"
+#include "m_Do/m_Do_ext.h"
+#include "m_Do/m_Do_mtx.h"
+#include "SSystem/SComponent/c_lib.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include "JSystem/JUtility/JUTAssert.h"
+
+class swtdoor_class : public fopAc_ac_c {
+public:
+    /* 0x290 */ request_of_phase_process_class mPhs;
+    /* 0x298 */ J3DModel * model;
+    /* 0x29C */ u8 field_0x29c;
+    /* 0x29D */ u8 mSwitchNo;
+};

 /* 00000078-000000C4       .text daSwtdoor_Draw__FP13swtdoor_class */
-void daSwtdoor_Draw(swtdoor_class*) {
-    /* Nonmatching */
+BOOL daSwtdoor_Draw(swtdoor_class* i_this) {
+    J3DModel * model = i_this->model;
+    g_env_light.setLightTevColorType(model, &i_this->mTevStr);
+    mDoExt_modelUpdateDL(model);
+    return TRUE;
 }

 /* 000000C4-000001BC       .text daSwtdoor_Execute__FP13swtdoor_class */
-void daSwtdoor_Execute(swtdoor_class*) {
-    /* Nonmatching */
+BOOL daSwtdoor_Execute(swtdoor_class* i_this) {
+    g_env_light.settingTevStruct(TEV_TYPE_BG0, i_this->getPositionP(), &i_this->mTevStr);
+    if (dComIfGs_isSwitch(i_this->mSwitchNo, fopAcM_GetRoomNo(i_this)) && i_this->orig.pos.y > -300.0f)
+        i_this->orig.pos.y -= 10.0f;
+
+    MtxTrans(i_this->current.pos.x, i_this->current.pos.y + i_this->orig.pos.y, i_this->current.pos.z, false);
+    mDoMtx_YrotM(*calc_mtx, i_this->current.angle.y);
+    mDoMtx_XrotM(*calc_mtx, i_this->current.angle.x);
+    mDoMtx_ZrotM(*calc_mtx, i_this->current.angle.z);
+    i_this->model->setBaseTRMtx(*calc_mtx);
+    return TRUE;
 }

 /* 000001BC-000001C4       .text daSwtdoor_IsDelete__FP13swtdoor_class */
-void daSwtdoor_IsDelete(swtdoor_class*) {
-    /* Nonmatching */
+BOOL daSwtdoor_IsDelete(swtdoor_class* i_this) {
+    return TRUE;
 }

 /* 000001C4-000001F4       .text daSwtdoor_Delete__FP13swtdoor_class */
-void daSwtdoor_Delete(swtdoor_class*) {
-    /* Nonmatching */
+BOOL daSwtdoor_Delete(swtdoor_class* i_this) {
+    dComIfG_resDelete(&i_this->mPhs, "Swtdoor");
+    return TRUE;
 }

 /* 000001F4-00000260       .text useHeapInit__FP10fopAc_ac_c */
-void useHeapInit(fopAc_ac_c*) {
-    /* Nonmatching */
+BOOL useHeapInit(fopAc_ac_c* i_ac) {
+    swtdoor_class * i_this = (swtdoor_class *)i_ac;
+    J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes("Swtdoor", 3);
+    i_this->model = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
+    if (i_this->model == NULL)
+        return FALSE;
+    return TRUE;
 }

 /* 00000260-00000374       .text daSwtdoor_Create__FP10fopAc_ac_c */
-void daSwtdoor_Create(fopAc_ac_c*) {
-    /* Nonmatching */
+s32 daSwtdoor_Create(fopAc_ac_c* i_ac) {
+    /* Nonmatching - r30/r31 regswap */
+
+    swtdoor_class * i_this;
+
+    fopAcM_SetupActor(i_ac, swtdoor_class);
+    i_this = (swtdoor_class *)i_ac;
+
+    s32 rt = dComIfG_resLoad(&i_this->mPhs, "Swtdoor");
+    if (rt == cPhs_ERROR_e)
+        return cPhs_ERROR_e;
+
+    if (rt != cPhs_COMPLEATE_e)
+        return rt;
+
+    i_this->field_0x29c = (fopAcM_GetParam(i_this) >> 0) & 0xFF;
+    if (i_this->field_0x29c == 0xFF)
+        i_this->field_0x29c = 0;
+
+    i_this->mSwitchNo = (fopAcM_GetParam(i_this) >> 24) & 0xFF;
+    if (fopAcM_entrySolidHeap(i_this, useHeapInit, 0x3000) == 0)
+        return cPhs_ERROR_e;
+
+    fopAcM_SetMin(i_this, -2000.0f, -1000.0f, -2000.0f);
+    fopAcM_SetMax(i_this, 2000.0f, 1000.0f, 2000.0f);
+    fopAcM_SetMtx(i_this, i_this->model->getBaseTRMtx());
+    i_this->orig.pos.y = 0.0f;
+    return cPhs_COMPLEATE_e;
 }

+actor_method_class l_daSwtdoor_Method = {
+    (process_method_func)daSwtdoor_Create,
+    (process_method_func)daSwtdoor_Delete,
+    (process_method_func)daSwtdoor_Execute,
+    (process_method_func)daSwtdoor_IsDelete,
+    (process_method_func)daSwtdoor_Draw,
+};
+
+actor_process_profile_definition g_profile_SWTDOOR = {
+    fpcLy_CURRENT_e,
+    7,
+    fpcPi_CURRENT_e,
+    PROC_SWTDOOR,
+    &g_fpcLf_Method.mBase,
+    sizeof(swtdoor_class),
+    0,
+    0,
+    &g_fopAc_Method.base,
+    0x00ED,
+    &l_daSwtdoor_Method,
+    fopAcStts_CULL_e | fopAcStts_UNK40000_e,
+    fopAc_ACTOR_e,
+    fopAc_CULLBOX_CUSTOM_e,
+};