From 071e69e78ab7752da0693265ef10a5c09bdb7121 Mon Sep 17 00:00:00 2001 From: roeming Date: Fri, 17 Oct 2025 11:27:09 -0400 Subject: [PATCH] link d_a_obj_lv6SwGate (#2740) * link d_a_obj_lv6SwGate * retrigger build * resolving suggestions --- configure.py | 2 +- include/d/actor/d_a_obj_lv6SwGate.h | 50 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 742 ++++++++++------------------ 3 files changed, 306 insertions(+), 488 deletions(-) diff --git a/configure.py b/configure.py index 590b2b9a868..5828be150a6 100755 --- a/configure.py +++ b/configure.py @@ -2086,7 +2086,7 @@ config.libs = [ ActorRel(Equivalent, "d_a_obj_lv6ChangeGate"), # weak func order ActorRel(NonMatching, "d_a_obj_lv6FurikoTrap"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6Lblock"), - ActorRel(NonMatching, "d_a_obj_lv6SwGate"), + ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6SwGate"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6SzGate"), ActorRel(NonMatching, "d_a_obj_lv6Tenbin"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6TogeRoll"), diff --git a/include/d/actor/d_a_obj_lv6SwGate.h b/include/d/actor/d_a_obj_lv6SwGate.h index 6b85755722c..38f35b1ad91 100644 --- a/include/d/actor/d_a_obj_lv6SwGate.h +++ b/include/d/actor/d_a_obj_lv6SwGate.h @@ -1,7 +1,9 @@ #ifndef D_A_OBJ_LV6SWGATE_H #define D_A_OBJ_LV6SWGATE_H +#include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" +#include "d/d_bg_s_movebg_actor.h" /** * @ingroup actors-objects @@ -11,13 +13,13 @@ * @details * */ -class daLv6SwGate_c : public fopAc_ac_c { +class daLv6SwGate_c : public dBgS_MoveBgActor { public: /* 80C74004 */ void setBaseMtx(); - /* 80C74158 */ void CreateHeap(); - /* 80C7429C */ void create(); - /* 80C74720 */ void isSwitch(); - /* 80C7476C */ void Execute(Mtx**); + /* 80C74158 */ int CreateHeap(); + /* 80C7429C */ int create(); + /* 80C74720 */ u8 isSwitch(); + /* 80C7476C */ int Execute(Mtx**); /* 80C74A3C */ void moveGate(); /* 80C74B48 */ void init_modeWait(); /* 80C74B54 */ void modeWait(); @@ -27,22 +29,44 @@ public: /* 80C74C94 */ void modeClose(); /* 80C74DBC */ void init_modeBreak(); /* 80C74E40 */ void modeBreak(); - /* 80C7524C */ void Draw(); - /* 80C752F8 */ void Delete(); + /* 80C7524C */ int Draw(); + /* 80C752F8 */ int Delete(); - static u8 const mCcDObjInfo[48]; - static u8 mCcDCyl[68]; + int getSw() { return fopAcM_GetParamBit(this, 0, 8); } + int getSwState() { return fopAcM_GetParamBit(this, 12, 4); } + int getSw2() { return fopAcM_GetParamBit(this, 16, 8); } + static const dCcD_SrcGObjInf mCcDObjInfo; + static dCcD_SrcCyl mCcDCyl; private: - /* 0x568 */ u8 field_0x568[0x14f8 - 0x568]; + /* 0x5A0 */ dCcD_Stts mCcStts; + /* 0x5DC */ dCcD_Cyl mCcDCyls[12]; + /* 0x14AC */ request_of_phase_process_class mPhase; + /* 0x14B4 */ J3DModel* mModel1; + /* 0x14B8 */ J3DModel* mModel2; + /* 0x14BC */ u8 mMode; + /* 0x14BD */ u8 mUnderlyingSwitchState; + /* 0x14BE */ u8 mUnderylingSwitch; + /* 0x14BE */ u8 mIsSwitch; + /* 0x14C0 */ f32 mMovementAmount; + /* 0x14C4 */ dBgW* mpBgW; + /* 0x14C8 */ Mtx mMtx; }; STATIC_ASSERT(sizeof(daLv6SwGate_c) == 0x14f8); -class daLv6SwGate_HIO_c { +class daLv6SwGate_HIO_c : public fOpAcm_HIO_entry_c { public: - /* 80C73F0C */ daLv6SwGate_HIO_c(); - /* 80C75434 */ ~daLv6SwGate_HIO_c(); + /* 80C73F0C */ + daLv6SwGate_HIO_c(); + + void genMessage(JORMContext*); + + /* 0x8 */ float mSpeed; + /* 0xC */ float mMaximumSpeed; + /* 0x10 */ float mAcceleration; + /* 0x14 */ float mMovementAmount; + /* 0x18 */ u8 unk18; // UNUSED }; diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index 0590252f126..c7ce7473546 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -4,565 +4,359 @@ */ #include "d/dolzel_rel.h" // IWYU pragma: keep +#include "d/d_s_play.h" #include "d/actor/d_a_obj_lv6SwGate.h" -#include "dol2asm.h" +daLv6SwGate_HIO_c::daLv6SwGate_HIO_c() { + mSpeed = 15.0f; + mMaximumSpeed = 30.0f; + mAcceleration = 15.0f; + mMovementAmount = 275.0f; + unk18 = 3; +} +#if DEBUG +void daLv6SwGate_HIO_c::genMessage(JORMContext* context) +{ + context->genLabel("--- 開く ---", 0, 0, 0, -1, -1, 0x200, 0x18); + context->genSlider("速度", &this->mSpeed, 0.1f, 100.0f, 0, NULL, -1, -1, 0x200, 0x18); + context->genLabel("\n--- 閉まる ---", 0, 0, 0, -1, -1, 0x200, 0x18); + context->genSlider("最大速度", &this->mMaximumSpeed, 0.1f, 100.0f, 0, NULL, -1, -1, 0x200, 0x18); + context->genSlider("加速度", &this->mAcceleration, 0.1f, 100.0f, 0, NULL, -1, -1, 0x200, 0x18); + context->genLabel("\n------", 0, 0, 0, -1, -1, 0x200, 0x18); + context->genSlider("移動量", &this->mMovementAmount, 0.1f, 100.0f, 0, NULL, -1, -1, 0x200, 0x18); +} +#endif -// -// Forward References: -// +/* 80C75754-80C7576C 000014 0018+00 4/4 0/0 0/0 .bss l_HIO */ +static daLv6SwGate_HIO_c l_HIO; -extern "C" void __ct__17daLv6SwGate_HIO_cFv(); -extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__13daLv6SwGate_cFv(); -extern "C" void CreateHeap__13daLv6SwGate_cFv(); -extern "C" void create__13daLv6SwGate_cFv(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void isSwitch__13daLv6SwGate_cFv(); -extern "C" void Execute__13daLv6SwGate_cFPPA3_A4_f(); -extern "C" void moveGate__13daLv6SwGate_cFv(); -extern "C" void init_modeWait__13daLv6SwGate_cFv(); -extern "C" void modeWait__13daLv6SwGate_cFv(); -extern "C" void init_modeOpen__13daLv6SwGate_cFv(); -extern "C" void modeOpen__13daLv6SwGate_cFv(); -extern "C" void init_modeClose__13daLv6SwGate_cFv(); -extern "C" void modeClose__13daLv6SwGate_cFv(); -extern "C" void init_modeBreak__13daLv6SwGate_cFv(); -extern "C" void modeBreak__13daLv6SwGate_cFv(); -extern "C" void Draw__13daLv6SwGate_cFv(); -extern "C" void Delete__13daLv6SwGate_cFv(); -extern "C" static void daLv6SwGate_Draw__FP13daLv6SwGate_c(); -extern "C" static void daLv6SwGate_Execute__FP13daLv6SwGate_c(); -extern "C" static void daLv6SwGate_Delete__FP13daLv6SwGate_c(); -extern "C" static void daLv6SwGate_Create__FP10fopAc_ac_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__17daLv6SwGate_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv6SwGate_cpp(); -extern "C" u8 const mCcDObjInfo__13daLv6SwGate_c[48]; -extern "C" extern char const* const d_a_obj_lv6SwGate__stringBase0; -extern "C" u8 mCcDCyl__13daLv6SwGate_c[68]; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitGObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C75524-80C75528 000000 0004+00 5/5 0/0 0/0 .rodata @3633 */ -SECTION_RODATA static f32 const lit_3633 = 15.0f; -COMPILER_STRIP_GATE(0x80C75524, &lit_3633); - -/* 80C75528-80C7552C 000004 0004+00 0/2 0/0 0/0 .rodata @3634 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3634 = 30.0f; -COMPILER_STRIP_GATE(0x80C75528, &lit_3634); -#pragma pop - -/* 80C7552C-80C75530 000008 0004+00 0/2 0/0 0/0 .rodata @3635 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3635 = 275.0f; -COMPILER_STRIP_GATE(0x80C7552C, &lit_3635); -#pragma pop +/* 80C75530-80C75560 00000C 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__13daLv6SwGate_c */ +const dCcD_SrcGObjInf daLv6SwGate_c::mCcDObjInfo = { + {0, {{0, 0, 0}, {0x400, 0x11}, {0x79}}}, {1, 0, 0, 0, 0}, {0xA, 0, 0, 0, 0}, {0} +}; /* 80C755B8-80C755FC 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__13daLv6SwGate_c */ -SECTION_DATA u8 daLv6SwGate_c::mCcDCyl[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +dCcD_SrcCyl daLv6SwGate_c::mCcDCyl = {mCcDObjInfo}; /* 80C755FC-80C75614 000064 0018+00 1/1 0/0 0/0 .data l_cull_box */ -SECTION_DATA static u8 l_cull_box[24] = { - 0xC4, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, -}; - -/* 80C75614-80C75620 -00001 000C+00 0/1 0/0 0/0 .data @3948 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3948[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__13daLv6SwGate_cFv, -}; -#pragma pop - -/* 80C75620-80C7562C -00001 000C+00 0/1 0/0 0/0 .data @3949 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3949[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeOpen__13daLv6SwGate_cFv, -}; -#pragma pop - -/* 80C7562C-80C75638 -00001 000C+00 0/1 0/0 0/0 .data @3950 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3950[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeClose__13daLv6SwGate_cFv, -}; -#pragma pop - -/* 80C75638-80C75644 -00001 000C+00 0/1 0/0 0/0 .data @3951 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3951[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeBreak__13daLv6SwGate_cFv, -}; -#pragma pop - -/* 80C75644-80C75674 0000AC 0030+00 0/1 0/0 0/0 .data mode_proc$3947 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80C75674-80C75694 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6SwGate_Method */ -static actor_method_class l_daLv6SwGate_Method = { - (process_method_func)daLv6SwGate_Create__FP10fopAc_ac_c, - (process_method_func)daLv6SwGate_Delete__FP13daLv6SwGate_c, - (process_method_func)daLv6SwGate_Execute__FP13daLv6SwGate_c, - 0, - (process_method_func)daLv6SwGate_Draw__FP13daLv6SwGate_c, -}; - -/* 80C75694-80C756C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6SwGate */ -extern actor_process_profile_definition g_profile_Obj_Lv6SwGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6SwGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6SwGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 624, // mPriority - &l_daLv6SwGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80C756C4-80C756D0 00012C 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80C756D0-80C756DC 000138 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80C756DC-80C756E8 000144 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80C756E8-80C756F4 000150 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80C756F4-80C7571C 00015C 0028+00 1/1 0/0 0/0 .data __vt__13daLv6SwGate_c */ -SECTION_DATA extern void* __vt__13daLv6SwGate_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__13daLv6SwGate_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__13daLv6SwGate_cFPPA3_A4_f, - (void*)Draw__13daLv6SwGate_cFv, - (void*)Delete__13daLv6SwGate_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C7571C-80C75728 000184 000C+00 2/2 0/0 0/0 .data __vt__17daLv6SwGate_HIO_c */ -SECTION_DATA extern void* __vt__17daLv6SwGate_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17daLv6SwGate_HIO_cFv, -}; - -/* 80C75728-80C75734 000190 000C+00 3/3 0/0 0/0 .data __vt__18fOpAcm_HIO_entry_c */ -SECTION_DATA extern void* __vt__18fOpAcm_HIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__18fOpAcm_HIO_entry_cFv, -}; - -/* 80C75734-80C75740 00019C 000C+00 4/4 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; - -/* 80C73F0C-80C73F60 0000EC 0054+00 1/1 0/0 0/0 .text __ct__17daLv6SwGate_HIO_cFv */ -daLv6SwGate_HIO_c::daLv6SwGate_HIO_c() { - // NONMATCHING -} - -/* 80C73F60-80C73FBC 000140 005C+00 1/0 0/0 0/0 .text __dt__18fOpAcm_HIO_entry_cFv */ -// fOpAcm_HIO_entry_c::~fOpAcm_HIO_entry_c() { -extern "C" void __dt__18fOpAcm_HIO_entry_cFv() { - // NONMATCHING -} - -/* 80C73FBC-80C74004 00019C 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -// mDoHIO_entry_c::~mDoHIO_entry_c() { -extern "C" void __dt__14mDoHIO_entry_cFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C75530-80C75560 00000C 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__13daLv6SwGate_c */ -SECTION_RODATA u8 const daLv6SwGate_c::mCcDObjInfo[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x79, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C75530, &daLv6SwGate_c::mCcDObjInfo); - -/* 80C75560-80C75564 00003C 0004+00 1/3 0/0 0/0 .rodata @3674 */ -SECTION_RODATA static f32 const lit_3674 = -150.0f; -COMPILER_STRIP_GATE(0x80C75560, &lit_3674); - -/* 80C75564-80C75568 000040 0004+00 3/7 0/0 0/0 .rodata @3675 */ -SECTION_RODATA static u8 const lit_3675[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C75564, &lit_3675); +static cull_box l_cull_box = {-1200.0f, -300.0f, -100.0f, 1200.0f, 300.0f, 100.0f}; /* 80C74004-80C74158 0001E4 0154+00 2/2 0/0 0/0 .text setBaseMtx__13daLv6SwGate_cFv */ void daLv6SwGate_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::transM(-150.0f - mMovementAmount, 0.0f, 0.0f); + mModel1->setBaseScale(scale); + mModel1->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y + 0x8000, shape_angle.z); + mDoMtx_stack_c::transM(-150.0f - mMovementAmount, 0.0f, 0.0f); + mModel2->setBaseScale(scale); + mModel2->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mMtx); } -/* ############################################################################################## */ -/* 80C7558C-80C7558C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C7558C = "L6SwGate"; -#pragma pop - /* 80C74158-80C7429C 000338 0144+00 1/0 0/0 0/0 .text CreateHeap__13daLv6SwGate_cFv */ -void daLv6SwGate_c::CreateHeap() { - // NONMATCHING +int daLv6SwGate_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6SwGate", 4); + JUT_ASSERT(273, modelData != NULL); + mModel1 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + + if (mModel1 == NULL) { + return FALSE; + } + modelData = (J3DModelData*)dComIfG_getObjectRes("L6SwGate", 4); + JUT_ASSERT(284, modelData != NULL); + mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mModel2 == NULL) { + return FALSE; + } + mpBgW = new dBgW(); + if (mpBgW != NULL && !mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("L6SwGate", 7), 0x1, &mMtx)) { + mpBgW->SetCrrFunc(dBgS_MoveBGProc_TypicalRotY); + } else { + mpBgW = NULL; + return FALSE; + } + return TRUE; } -/* ############################################################################################## */ -/* 80C75748-80C75754 000008 000C+00 1/1 0/0 0/0 .bss @3625 */ -static u8 lit_3625[12]; - -/* 80C75754-80C7576C 000014 0018+00 4/4 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[24]; - /* 80C7429C-80C744E4 00047C 0248+00 1/1 0/0 0/0 .text create__13daLv6SwGate_cFv */ -void daLv6SwGate_c::create() { - // NONMATCHING -} - -/* 80C744E4-80C745B0 0006C4 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_CylFv */ -// dCcD_Cyl::~dCcD_Cyl() { -extern "C" void __dt__8dCcD_CylFv() { - // NONMATCHING -} - -/* 80C745B0-80C74634 000790 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -// dCcD_Cyl::dCcD_Cyl() { -extern "C" void __ct__8dCcD_CylFv() { - // NONMATCHING -} - -/* 80C74634-80C7467C 000814 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 80C7467C-80C746C4 00085C 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* 80C746C4-80C74720 0008A4 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING +int daLv6SwGate_c::create() { + fopAcM_SetupActor(this, daLv6SwGate_c); + if (getSw2() != 0xff && fopAcM_isSwitch(this, getSw2())) { + return cPhs_ERROR_e; + } + int phase = dComIfG_resLoad(&mPhase, "L6SwGate"); + if (phase == cPhs_COMPLEATE_e) { + if (MoveBGCreate("L6SwGate", 7, dBgS_MoveBGProc_TypicalRotY, 0x1700, NULL) == cPhs_ERROR_e) + { + return cPhs_ERROR_e; + } + fopAcM_SetMtx(this, mModel1->getBaseTRMtx()); + // copy-paste error? l_cull_box.max.y twice + fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, + l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.y); + mCcStts.Init(0xff, 0xff, this); + for (int i = 0; i < 12; i++) { + mCcDCyls[i].Set(mCcDCyl); + mCcDCyls[i].SetStts(&mCcStts); + } + if (mpBgW != NULL) { + dComIfG_Bgsp().Regist(mpBgW, this); + mpBgW->Move(); + } + mUnderlyingSwitchState = getSwState(); + if (mUnderlyingSwitchState == 0xf) { + mUnderlyingSwitchState = 0; + } + mUnderylingSwitch = getSw(); + mIsSwitch = isSwitch(); + mMovementAmount = 0.0f; + if (mIsSwitch) { + mMovementAmount = l_HIO.mMovementAmount; + } + init_modeWait(); + setBaseMtx(); +#if DEBUG + l_HIO.entryHIO("スイッチゲート(Lv6)"); +#endif + } + return phase; } /* 80C74720-80C7476C 000900 004C+00 2/2 0/0 0/0 .text isSwitch__13daLv6SwGate_cFv */ -void daLv6SwGate_c::isSwitch() { - // NONMATCHING +u8 daLv6SwGate_c::isSwitch() { + return fopAcM_isSwitch(this, mUnderylingSwitch) ^ mUnderlyingSwitchState; } -/* ############################################################################################## */ -/* 80C75568-80C7556C 000044 0004+00 0/1 0/0 0/0 .rodata @3939 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3939 = 120.0f; -COMPILER_STRIP_GATE(0x80C75568, &lit_3939); -#pragma pop - -/* 80C7556C-80C75570 000048 0004+00 0/1 0/0 0/0 .rodata @3940 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3940 = 55.0f; -COMPILER_STRIP_GATE(0x80C7556C, &lit_3940); -#pragma pop - -/* 80C75570-80C75574 00004C 0004+00 0/1 0/0 0/0 .rodata @3941 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3941 = 300.0f; -COMPILER_STRIP_GATE(0x80C75570, &lit_3941); -#pragma pop - -/* 80C75574-80C7557C 000050 0008+00 0/1 0/0 0/0 .rodata @3943 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3943[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C75574, &lit_3943); -#pragma pop - /* 80C7476C-80C74A3C 00094C 02D0+00 1/0 0/0 0/0 .text Execute__13daLv6SwGate_cFPPA3_A4_f */ -void daLv6SwGate_c::Execute(Mtx** param_0) { - // NONMATCHING +int daLv6SwGate_c::Execute(Mtx** i_pMTx) { + moveGate(); + for (int i = 0; i < 12; i++) { + if (mCcDCyls[i].ChkTgHit()) { + dCcD_GObjInf* o = mCcDCyls[i].GetTgHitGObj(); + if (o->GetAtType() & 0x400) { + init_modeBreak(); + break; + } + } + } + for (int i = 0; i < 6; i++) { + cXyz p(-150.0f - mMovementAmount + 120.0f - i * (55.0f + oREG_F(2)), 0.0f, 0.0f); + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&p, &p); + p += current.pos; + mCcDCyls[i].SetR(30.0f + oREG_F(0)); + mCcDCyls[i].SetH(300.0f + oREG_F(1)); + mCcDCyls[i].SetC(p); + dComIfG_Ccsp()->Set(&mCcDCyls[i]); + } + for (int i = 0; i < 6; i++) { + cXyz p(-150.0f - mMovementAmount + 120.0f - i * (55.0f + oREG_F(3)), 0.0f, 0.0f); + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y + 0x8000, shape_angle.z); + mDoMtx_stack_c::multVec(&p, &p); + p += current.pos; + mCcDCyls[i + 6].SetR(30.0f + oREG_F(0)); + mCcDCyls[i + 6].SetH(300.0f + oREG_F(1)); + mCcDCyls[i + 6].SetC(p); + dComIfG_Ccsp()->Set(&mCcDCyls[i + 6]); + } + *i_pMTx = &mModel1->getBaseTRMtx(); + setBaseMtx(); + if (mpBgW != NULL) { + mpBgW->Move(); + } + return TRUE; } -/* ############################################################################################## */ -/* 80C7576C-80C75770 00002C 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C7576C[4]; +enum DALV6SWGATE_C_MODE { + DALV6SWGATE_C_MODE_WAIT, + DALV6SWGATE_C_MODE_OPEN, + DALV6SWGATE_C_MODE_CLOSE, + DALV6SWGATE_C_MODE_BREAK, +}; /* 80C74A3C-80C74B48 000C1C 010C+00 1/1 0/0 0/0 .text moveGate__13daLv6SwGate_cFv */ void daLv6SwGate_c::moveGate() { - // NONMATCHING + typedef void (daLv6SwGate_c::*func_call)(); + const static func_call mode_proc[] = { + /* DALV6SWGATE_C_MODE_WAIT */ &daLv6SwGate_c::modeWait, + /* DALV6SWGATE_C_MODE_OPEN */ &daLv6SwGate_c::modeOpen, + /* DALV6SWGATE_C_MODE_CLOSE */ &daLv6SwGate_c::modeClose, + /* DALV6SWGATE_C_MODE_BREAK */ &daLv6SwGate_c::modeBreak, + }; + + u8 oldIsSwitch = mIsSwitch; + mIsSwitch = isSwitch(); + if (mIsSwitch != oldIsSwitch) { + if (mIsSwitch) { + init_modeOpen(); + } else { + init_modeClose(); + } + } + (this->*mode_proc[mMode])(); } /* 80C74B48-80C74B54 000D28 000C+00 3/3 0/0 0/0 .text init_modeWait__13daLv6SwGate_cFv */ void daLv6SwGate_c::init_modeWait() { - // NONMATCHING + mMode = DALV6SWGATE_C_MODE_WAIT; } /* 80C74B54-80C74B58 000D34 0004+00 1/0 0/0 0/0 .text modeWait__13daLv6SwGate_cFv */ void daLv6SwGate_c::modeWait() { - /* empty function */ + return; } /* 80C74B58-80C74B64 000D38 000C+00 1/1 0/0 0/0 .text init_modeOpen__13daLv6SwGate_cFv */ void daLv6SwGate_c::init_modeOpen() { - // NONMATCHING + mMode = DALV6SWGATE_C_MODE_OPEN; } -/* ############################################################################################## */ -/* 80C7557C-80C75580 000058 0004+00 0/1 0/0 0/0 .rodata @3992 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3992 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C7557C, &lit_3992); -#pragma pop - -/* 80C75580-80C75584 00005C 0004+00 0/2 0/0 0/0 .rodata @3993 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3993 = 5.0f; -COMPILER_STRIP_GATE(0x80C75580, &lit_3993); -#pragma pop - -/* 80C75584-80C75588 000060 0004+00 1/4 0/0 0/0 .rodata @3994 */ -SECTION_RODATA static f32 const lit_3994 = 1.0f; -COMPILER_STRIP_GATE(0x80C75584, &lit_3994); - -/* 80C75588-80C7558C 000064 0004+00 1/3 0/0 0/0 .rodata @3995 */ -SECTION_RODATA static f32 const lit_3995 = -1.0f; -COMPILER_STRIP_GATE(0x80C75588, &lit_3995); - /* 80C74B64-80C74C7C 000D44 0118+00 1/0 0/0 0/0 .text modeOpen__13daLv6SwGate_cFv */ void daLv6SwGate_c::modeOpen() { - // NONMATCHING + f32 calc = cLib_addCalc(&mMovementAmount, l_HIO.mMovementAmount, 0.1f, l_HIO.mSpeed, 5.0f); + mDoAud_seStartLevel(Z2SE_OBJ_L6_SW_GATE_OP_MV, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + if (calc == 0.0f) { + mDoAud_seStart(Z2SE_OBJ_L6_SW_GATE_OP_ST, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + init_modeWait(); + } } /* 80C74C7C-80C74C94 000E5C 0018+00 1/1 0/0 0/0 .text init_modeClose__13daLv6SwGate_cFv */ void daLv6SwGate_c::init_modeClose() { - // NONMATCHING + fopAcM_SetSpeedF(this, 0.0f); + mMode = DALV6SWGATE_C_MODE_CLOSE; } /* 80C74C94-80C74DBC 000E74 0128+00 1/0 0/0 0/0 .text modeClose__13daLv6SwGate_cFv */ void daLv6SwGate_c::modeClose() { - // NONMATCHING + int unused = cLib_chaseF(&speedF, l_HIO.mMaximumSpeed, l_HIO.mAcceleration); + f32 calc = cLib_addCalc(&mMovementAmount, 0.0f, 1.0f, fopAcM_GetSpeedF(this), 5.0f); + mDoAud_seStartLevel(Z2SE_OBJ_L6_SW_GATE_CL_MV, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + if (calc == 0.0f) { + mDoAud_seStart(Z2SE_OBJ_L6_SW_GATE_CL_ST, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + init_modeWait(); + } } /* 80C74DBC-80C74E40 000F9C 0084+00 1/1 0/0 0/0 .text init_modeBreak__13daLv6SwGate_cFv */ void daLv6SwGate_c::init_modeBreak() { - // NONMATCHING + OS_REPORT("== break! ==\n"); + mDoAud_seStart(Z2SE_OBJ_TRAP_BREAK, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mMode = DALV6SWGATE_C_MODE_BREAK; } /* 80C74E40-80C7524C 001020 040C+00 1/0 0/0 0/0 .text modeBreak__13daLv6SwGate_cFv */ void daLv6SwGate_c::modeBreak() { - // NONMATCHING + cXyz p(-150.0f - mMovementAmount, 0.0f, 0.0f); + mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::multVec(&p, &p); + p += current.pos; + dComIfGp_particle_set(0x8B79, &p, &shape_angle, 0); + dComIfGp_particle_set(0x8B7A, &p, &shape_angle, 0); + dComIfGp_particle_set(0x8B7B, &p, &shape_angle, 0); + dComIfGp_particle_set(0x8B7C, &p, &shape_angle, 0); + dComIfGp_particle_set(0x8B7D, &p, &shape_angle, 0); + p.set(-150.0f - mMovementAmount, 0.0f, 0.0f); + csXyz shapeAngle(shape_angle); + shapeAngle.y += 0x8000; + mDoMtx_stack_c::ZXYrotS(shapeAngle.x, shapeAngle.y, shapeAngle.z); + mDoMtx_stack_c::multVec(&p, &p); + p += current.pos; + dComIfGp_particle_set(0x8B79, &p, &shapeAngle, 0); + dComIfGp_particle_set(0x8B7A, &p, &shapeAngle, 0); + dComIfGp_particle_set(0x8B7B, &p, &shapeAngle, 0); + dComIfGp_particle_set(0x8B7C, &p, &shapeAngle, 0); + dComIfGp_particle_set(0x8B7D, &p, &shapeAngle, 0); + if (getSw2() != 0xff) { + fopAcM_onSwitch(this, getSw2()); + } + fopAcM_delete(this); } /* 80C7524C-80C752F8 00142C 00AC+00 1/0 0/0 0/0 .text Draw__13daLv6SwGate_cFv */ -void daLv6SwGate_c::Draw() { - // NONMATCHING +int daLv6SwGate_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel1, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mModel1); + mDoExt_modelUpdateDL(mModel2); + dComIfGd_setList(); + return TRUE; } /* 80C752F8-80C75360 0014D8 0068+00 1/0 0/0 0/0 .text Delete__13daLv6SwGate_cFv */ -void daLv6SwGate_c::Delete() { - // NONMATCHING +int daLv6SwGate_c::Delete() { + dComIfG_resDelete(&mPhase, "L6SwGate"); + if (mpBgW != NULL && mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } +#if DEBUG + l_HIO.removeHIO(this); +#endif + return TRUE; } /* 80C75360-80C7538C 001540 002C+00 1/0 0/0 0/0 .text daLv6SwGate_Draw__FP13daLv6SwGate_c */ -static void daLv6SwGate_Draw(daLv6SwGate_c* param_0) { - // NONMATCHING +static int daLv6SwGate_Draw(daLv6SwGate_c* i_this) { + return i_this->MoveBGDraw(); } /* 80C7538C-80C753AC 00156C 0020+00 1/0 0/0 0/0 .text daLv6SwGate_Execute__FP13daLv6SwGate_c */ -static void daLv6SwGate_Execute(daLv6SwGate_c* param_0) { - // NONMATCHING +static int daLv6SwGate_Execute(daLv6SwGate_c* i_this) { + return i_this->MoveBGExecute(); } /* 80C753AC-80C753CC 00158C 0020+00 1/0 0/0 0/0 .text daLv6SwGate_Delete__FP13daLv6SwGate_c */ -static void daLv6SwGate_Delete(daLv6SwGate_c* param_0) { - // NONMATCHING +static int daLv6SwGate_Delete(daLv6SwGate_c* i_this) { + fpc_ProcID id = fopAcM_GetID(i_this); + return i_this->MoveBGDelete(); } /* 80C753CC-80C753EC 0015AC 0020+00 1/0 0/0 0/0 .text daLv6SwGate_Create__FP10fopAc_ac_c */ -static void daLv6SwGate_Create(fopAc_ac_c* param_0) { - // NONMATCHING +static int daLv6SwGate_Create(fopAc_ac_c* i_this) { + daLv6SwGate_c* this_gate = (daLv6SwGate_c*)i_this; + fpc_ProcID id = fopAcM_GetID(i_this); + return this_gate->create(); } -/* 80C753EC-80C75434 0015CC 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} +/* 80C75674-80C75694 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6SwGate_Method */ +static actor_method_class l_daLv6SwGate_Method = { + (process_method_func)daLv6SwGate_Create, + (process_method_func)daLv6SwGate_Delete, + (process_method_func)daLv6SwGate_Execute, + NULL, + (process_method_func)daLv6SwGate_Draw, +}; -/* 80C75434-80C754A0 001614 006C+00 2/1 0/0 0/0 .text __dt__17daLv6SwGate_HIO_cFv */ -daLv6SwGate_HIO_c::~daLv6SwGate_HIO_c() { - // NONMATCHING -} - -/* 80C754A0-80C75510 001680 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv6SwGate_cpp */ -void __sinit_d_a_obj_lv6SwGate_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C754A0, __sinit_d_a_obj_lv6SwGate_cpp); -#pragma pop - -/* 80C7558C-80C7558C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C75694-80C756C4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6SwGate */ +extern actor_process_profile_definition g_profile_Obj_Lv6SwGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6SwGate, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daLv6SwGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 624, // mPriority + &l_daLv6SwGate_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +};