mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-04 09:08:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Unindent some namespaces

Browse Source
This commit is contained in:
LagoLunatic
2026-07-24 11:30:45 -04:00
parent 7efaae45c7
commit 26d9efe3b6
5 changed files with 3625 additions and 3617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_bomb2.cpp
+1223 -1221
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_akabe.cpp
+145 -143
View File
@@ -13,179 +13,181 @@
#include "m_Do/m_Do_mtx.h"
namespace daObjAkabe {
const char* const Act_c::M_arcname[4] = {
"Akabe",
"AkabeD",
"AkabeK",
"NBOX",
};
/* 00000078-0000009C .text solidHeapCB__Q210daObjAkabe5Act_cFP10fopAc_ac_c */
BOOL Act_c::solidHeapCB(fopAc_ac_c* i_this) {
return ((Act_c*)i_this)->create_heap();
const char* const Act_c::M_arcname[4] = {
"Akabe",
"AkabeD",
"AkabeK",
"NBOX",
};
/* 00000078-0000009C .text solidHeapCB__Q210daObjAkabe5Act_cFP10fopAc_ac_c */
BOOL Act_c::solidHeapCB(fopAc_ac_c* i_this) {
return ((Act_c*)i_this)->create_heap();
}
/* 0000009C-000001A4 .text create_heap__Q210daObjAkabe5Act_cFv */
u8 Act_c::create_heap() {
bool ret = false;
mpBgW = new dBgW();
if (mpBgW != NULL) {
static const s16 dzb[4] = { dRes_INDEX_AKABE_DZB_AKABE_e, dRes_INDEX_AKABED_DZB_AKABED_e, dRes_INDEX_AKABEK_DZB_AKABEK_e, dRes_INDEX_NBOX_DZB_NBOX_e, };
cBgD_t * bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname[mType], dzb[mType]);
JUT_ASSERT(0x82, bgw_data != NULL);
if (!mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx))
ret = true;
}
/* 0000009C-000001A4 .text create_heap__Q210daObjAkabe5Act_cFv */
u8 Act_c::create_heap() {
bool ret = false;
mpBgW = new dBgW();
if (mpBgW != NULL) {
static const s16 dzb[4] = { dRes_INDEX_AKABE_DZB_AKABE_e, dRes_INDEX_AKABED_DZB_AKABED_e, dRes_INDEX_AKABEK_DZB_AKABEK_e, dRes_INDEX_NBOX_DZB_NBOX_e, };
cBgD_t * bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname[mType], dzb[mType]);
JUT_ASSERT(0x82, bgw_data != NULL);
if (!mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx))
ret = true;
}
if (!ret) {
mpBgW = NULL;
return ret;
}
// Fakematch? This function should probably have return type bool, but the codegen towards the
// end here doesn't work unless the return type is u8.
if (!ret) {
mpBgW = NULL;
return ret;
}
/* 000001A4-00000360 .text _create__Q210daObjAkabe5Act_cFv */
cPhs_State Act_c::_create() {
cPhs_State rt = cPhs_ERROR_e;
// Fakematch? This function should probably have return type bool, but the codegen towards the
// end here doesn't work unless the return type is u8.
return ret;
}
s32 arg0 = prm_get_arg0();
if (arg0 == 1)
mType = 1;
else if (arg0 == 2)
mType = 2;
else if (arg0 == 3)
mType = 3;
else
mType = 0;
/* 000001A4-00000360 .text _create__Q210daObjAkabe5Act_cFv */
cPhs_State Act_c::_create() {
cPhs_State rt = cPhs_ERROR_e;
fopAcM_ct(this, daObjAkabe::Act_c);
s32 arg0 = prm_get_arg0();
if (arg0 == 1)
mType = 1;
else if (arg0 == 2)
mType = 2;
else if (arg0 == 3)
mType = 3;
else
mType = 0;
mbAppear = chk_appear();
if (mbAppear) {
rt = dComIfG_resLoad(&mPhs, M_arcname[mType]);
if (rt == cPhs_COMPLEATE_e) {
init_scale();
init_mtx();
fopAcM_ct(this, daObjAkabe::Act_c);
static const u32 heap_size[4] = { 0x200, 0x200, 0x200, 0x3E0, };
if (fopAcM_entrySolidHeap(this, solidHeapCB, heap_size[mType])) {
dComIfG_Bgsp()->Regist(mpBgW, this);
mpBgW->SetCrrFunc(NULL);
mpBgW->SetPriority((cBgW::PRIORITY)1);
fopAcM_SetMtx(this, mMtx);
if (mType == 3) {
fopAcM_setCullSizeBox(this, -51.0f, -1.0f, -51.0f, 51.0f, 101.0f, 51.0f);
} else {
fopAcM_setCullSizeBox(this, -51.0f, -1.0f, -1.0f, 51.0f, 101.0f, 1.0f);
}
mbAppear = chk_appear();
if (mbAppear) {
rt = dComIfG_resLoad(&mPhs, M_arcname[mType]);
if (rt == cPhs_COMPLEATE_e) {
init_scale();
init_mtx();
static const u32 heap_size[4] = { 0x200, 0x200, 0x200, 0x3E0, };
if (fopAcM_entrySolidHeap(this, solidHeapCB, heap_size[mType])) {
dComIfG_Bgsp()->Regist(mpBgW, this);
mpBgW->SetCrrFunc(NULL);
mpBgW->SetPriority((cBgW::PRIORITY)1);
fopAcM_SetMtx(this, mMtx);
if (mType == 3) {
fopAcM_setCullSizeBox(this, -51.0f, -1.0f, -51.0f, 51.0f, 101.0f, 51.0f);
} else {
rt = cPhs_ERROR_e;
fopAcM_setCullSizeBox(this, -51.0f, -1.0f, -1.0f, 51.0f, 101.0f, 1.0f);
}
} else {
rt = cPhs_ERROR_e;
}
}
return rt;
}
/* 00000360-000003F8 .text _delete__Q210daObjAkabe5Act_cFv */
bool Act_c::_delete() {
if (mbAppear) {
if (mpBgW != NULL && mpBgW->ChkUsed()) {
dComIfG_Bgsp()->Release(mpBgW);
}
return rt;
}
dComIfG_resDelete(&mPhs, M_arcname[mType]);
/* 00000360-000003F8 .text _delete__Q210daObjAkabe5Act_cFv */
bool Act_c::_delete() {
if (mbAppear) {
if (mpBgW != NULL && mpBgW->ChkUsed()) {
dComIfG_Bgsp()->Release(mpBgW);
}
dComIfG_resDelete(&mPhs, M_arcname[mType]);
}
return true;
}
/* 000003F8-00000498 .text init_scale__Q210daObjAkabe5Act_cFv */
void Act_c::init_scale() {
s32 scl = prm_get_scl();
if (scl == 1) {
scale.x *= 10.0f;
scale.y *= 10.0f;
scale.z = 1.0f;
} else if (scl == 2) {
} else if (scl == 3) {
scale *= 10.0f;
} else {
scale.z = 1.0f;
}
}
/* 00000498-00000510 .text init_mtx__Q210daObjAkabe5Act_cFv */
void Act_c::init_mtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::scaleM(scale);
mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
}
/* 00000510-000005A4 .text chk_appear__Q210daObjAkabe5Act_cFv */
bool Act_c::chk_appear() {
if (prm_get_always())
return true;
s32 swSaveNo = prm_get_swSave();
if (swSaveNo == 0xFF) {
return dComIfGs_checkCollect(0) == 0;
} else {
return !fopAcM_isSwitch(this, swSaveNo);
}
}
/* 000003F8-00000498 .text init_scale__Q210daObjAkabe5Act_cFv */
void Act_c::init_scale() {
s32 scl = prm_get_scl();
if (scl == 1) {
scale.x *= 10.0f;
scale.y *= 10.0f;
scale.z = 1.0f;
} else if (scl == 2) {
} else if (scl == 3) {
scale *= 10.0f;
} else {
scale.z = 1.0f;
}
}
/* 000005A4-000005E4 .text _execute__Q210daObjAkabe5Act_cFv */
bool Act_c::_execute() {
if (!chk_appear())
fopAcM_delete(this);
return true;
}
/* 00000498-00000510 .text init_mtx__Q210daObjAkabe5Act_cFv */
void Act_c::init_mtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::scaleM(scale);
mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
}
/* 000005E4-000005EC .text _draw__Q210daObjAkabe5Act_cFv */
bool Act_c::_draw() {
return true;
}
/* 00000510-000005A4 .text chk_appear__Q210daObjAkabe5Act_cFv */
bool Act_c::chk_appear() {
if (prm_get_always())
return true;
s32 swSaveNo = prm_get_swSave();
if (swSaveNo == 0xFF) {
return dComIfGs_checkCollect(0) == 0;
} else {
return !fopAcM_isSwitch(this, swSaveNo);
}
}
namespace {
/* 000005EC-0000060C .text Mthd_Create__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
cPhs_State Mthd_Create(void* i_this) {
return ((Act_c*)i_this)->_create();
}
/* 000005A4-000005E4 .text _execute__Q210daObjAkabe5Act_cFv */
bool Act_c::_execute() {
if (!chk_appear())
fopAcM_delete(this);
return true;
}
/* 0000060C-00000630 .text Mthd_Delete__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
BOOL Mthd_Delete(void* i_this) {
return ((Act_c*)i_this)->_delete();
}
/* 000005E4-000005EC .text _draw__Q210daObjAkabe5Act_cFv */
bool Act_c::_draw() {
return true;
}
/* 00000630-00000654 .text Mthd_Execute__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
BOOL Mthd_Execute(void* i_this) {
return ((Act_c*)i_this)->_execute();
}
namespace {
/* 000005EC-0000060C .text Mthd_Create__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
cPhs_State Mthd_Create(void* i_this) {
return ((Act_c*)i_this)->_create();
}
/* 00000654-00000678 .text Mthd_Draw__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
BOOL Mthd_Draw(void* i_this) {
return ((Act_c*)i_this)->_draw();
}
/* 0000060C-00000630 .text Mthd_Delete__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
BOOL Mthd_Delete(void* i_this) {
return ((Act_c*)i_this)->_delete();
}
/* 00000678-00000680 .text Mthd_IsDelete__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
BOOL Mthd_IsDelete(void* i_this) {
return TRUE;
}
/* 00000630-00000654 .text Mthd_Execute__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
BOOL Mthd_Execute(void* i_this) {
return ((Act_c*)i_this)->_execute();
}
/* 00000654-00000678 .text Mthd_Draw__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */
BOOL Mthd_Draw(void* i_this) {
return ((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;
}
static 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_Draw,
};
};
static 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_Draw,
};
}; // namespace
}; // namespace daObjAkabe
actor_process_profile_definition g_profile_Obj_Akabe = {
/* Layer ID */ fpcLy_CURRENT_e,
src/d/actor/d_a_obj_movebox.cpp
+1816 -1816
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_paper.cpp
+310 -308
View File
@@ -21,340 +21,342 @@
#include "m_Do/m_Do_mtx.h"
namespace daObjPaper {
namespace {
struct Attr_c {
/* 0x00 */ char* mResName;
/* 0x04 */ s32 mHeapSize;
/* 0x06 */ s16 mModelId;
/* 0x08 */ s16 mEyeOffset;
/* 0x0A */ s16 mAttentionOffset;
/* 0x0C */ s16 mCullSphereRadius;
/* 0x0E */ s16 mCullSphereYOffset;
/* 0x10 */ s8 mAttentionDist1;
/* 0x11 */ s8 mAttentionDist2;
/* 0x12 */ u8 mTevType;
/* 0x14 */ s16 mColCylinderRadius;
/* 0x16 */ s16 mColCylinderHeight;
};
static const Attr_c L_attr[] = {
{
/* mResName */ "Opaper",
/* mHeapSize */ 0x04C0,
/* mModelId */ dRes_INDEX_OPAPER_BDL_OPAPER_e,
/* mEyeOffset */ 0x00,
/* mAttentionOffset */ 0x28,
/* mCullSphereRadius */ 0x28,
/* mCullSphereYOffset */ 0x00,
/* mAttentionDist1 */ 0x1D,
/* mAttentionDist2 */ 0x1E,
/* mTevType */ 0x01,
/* mColCylinderRadius */ 0x00,
/* mColCylinderHeight */ 0x00,
},
{
/* mResName */ "Ppos",
/* mHeapSize */ DEMO_SELECT(0x1000, 0x04C0),
/* mModelId */ dRes_INDEX_PPOS_BDL_PPOS_e,
/* mEyeOffset */ 0x00,
/* mAttentionOffset */ 0x32,
/* mCullSphereRadius */ 0x3C,
/* mCullSphereYOffset */ 0x00,
/* mAttentionDist1 */ 0x1F,
/* mAttentionDist2 */ 0x20,
/* mTevType */ 0x00,
/* mColCylinderRadius */ 0x00,
/* mColCylinderHeight */ 0x00,
},
{
/* mResName */ "Piwa",
/* mHeapSize */ DEMO_SELECT(0x8000, 0x04C0),
/* mModelId */ dRes_INDEX_PIWA_BDL_PIWA_e,
/* mEyeOffset */ 0x3C,
/* mAttentionOffset */ 0x82,
/* mCullSphereRadius */ 0x50,
/* mCullSphereYOffset */ 0x3C,
/* mAttentionDist1 */ 0x1D,
/* mAttentionDist2 */ 0x1E,
/* mTevType */ 0x00,
/* mColCylinderRadius */ 0x37,
/* mColCylinderHeight */ 0x73,
}
};
inline const Attr_c & attr(Type_e type) { return L_attr[type]; }
}
const dCcD_SrcCyl Act_c::M_cyl_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
/* SrcObjAt Type */ 0,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_GrpAll_e,
/* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
/* SrcGObjAt SPrm */ 0,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
/* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 0.0f,
/* Height */ 0.0f,
}},
namespace {
struct Attr_c {
/* 0x00 */ char* mResName;
/* 0x04 */ s32 mHeapSize;
/* 0x06 */ s16 mModelId;
/* 0x08 */ s16 mEyeOffset;
/* 0x0A */ s16 mAttentionOffset;
/* 0x0C */ s16 mCullSphereRadius;
/* 0x0E */ s16 mCullSphereYOffset;
/* 0x10 */ s8 mAttentionDist1;
/* 0x11 */ s8 mAttentionDist2;
/* 0x12 */ u8 mTevType;
/* 0x14 */ s16 mColCylinderRadius;
/* 0x16 */ s16 mColCylinderHeight;
};
/* 00000078-0000009C .text solidHeapCB__Q210daObjPaper5Act_cFP10fopAc_ac_c */
int Act_c::solidHeapCB(fopAc_ac_c* i_this) {
return static_cast<Act_c*>(i_this)->create_heap();
}
/* 0000009C-00000170 .text create_heap__Q210daObjPaper5Act_cFv */
bool Act_c::create_heap() {
J3DModelData* mdl_data;
bool ret = false;
mdl_data = (J3DModelData*)dComIfG_getObjectRes(attr(mType).mResName, attr(mType).mModelId);
JUT_ASSERT(0x13E, mdl_data != NULL);
mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000022);
if (mpModel)
ret = true;
return ret;
}
/* 00000170-000004E0 .text _create__Q210daObjPaper5Act_cFv */
cPhs_State Act_c::_create() {
fopAcM_ct(this, Act_c);
mType = prm_get_type();
cPhs_State result = dComIfG_resLoad(&mPhs, attr(mType).mResName);
if (result == cPhs_COMPLEATE_e) {
if (fopAcM_entrySolidHeap(this, solidHeapCB, attr(mType).mHeapSize)) {
eyePos.y += attr(mType).mEyeOffset;
attention_info.position.y += attr(mType).mAttentionOffset;
attention_info.distances[fopAc_Attn_TYPE_TALK_e] = attr(mType).mAttentionDist1;
attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = attr(mType).mAttentionDist2;
cLib_onBit<u32>(attention_info.flags, fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e | fopAc_Attn_TALKFLAG_READ_e);
mMsgId = fpcM_ERROR_PROCESS_ID_e;
if (mType == Piwa_e) {
fopAcM_SetStatusMap(this, 0x18);
}
if (attr(mType).mColCylinderRadius != 0) {
mbHasCc = true;
mColStatus.Init(0xFF, 0xFF, this);
mCylinderCol.Set(M_cyl_src);
mCylinderCol.SetStts(&mColStatus);
mCylinderCol.SetR(attr(mType).mColCylinderRadius);
mCylinderCol.SetH(attr(mType).mColCylinderHeight);
} else {
mbHasCc = false;
}
fopAcM_setCullSizeSphere(this, 0.0f, attr(mType).mCullSphereYOffset, 0.0f, attr(mType).mCullSphereRadius);
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
init_mtx();
mode_wait_init();
} else {
result = cPhs_ERROR_e;
}
static const Attr_c L_attr[] = {
{
/* mResName */ "Opaper",
/* mHeapSize */ 0x04C0,
/* mModelId */ dRes_INDEX_OPAPER_BDL_OPAPER_e,
/* mEyeOffset */ 0x00,
/* mAttentionOffset */ 0x28,
/* mCullSphereRadius */ 0x28,
/* mCullSphereYOffset */ 0x00,
/* mAttentionDist1 */ 0x1D,
/* mAttentionDist2 */ 0x1E,
/* mTevType */ 0x01,
/* mColCylinderRadius */ 0x00,
/* mColCylinderHeight */ 0x00,
},
{
/* mResName */ "Ppos",
/* mHeapSize */ DEMO_SELECT(0x1000, 0x04C0),
/* mModelId */ dRes_INDEX_PPOS_BDL_PPOS_e,
/* mEyeOffset */ 0x00,
/* mAttentionOffset */ 0x32,
/* mCullSphereRadius */ 0x3C,
/* mCullSphereYOffset */ 0x00,
/* mAttentionDist1 */ 0x1F,
/* mAttentionDist2 */ 0x20,
/* mTevType */ 0x00,
/* mColCylinderRadius */ 0x00,
/* mColCylinderHeight */ 0x00,
},
{
/* mResName */ "Piwa",
/* mHeapSize */ DEMO_SELECT(0x8000, 0x04C0),
/* mModelId */ dRes_INDEX_PIWA_BDL_PIWA_e,
/* mEyeOffset */ 0x3C,
/* mAttentionOffset */ 0x82,
/* mCullSphereRadius */ 0x50,
/* mCullSphereYOffset */ 0x3C,
/* mAttentionDist1 */ 0x1D,
/* mAttentionDist2 */ 0x1E,
/* mTevType */ 0x00,
/* mColCylinderRadius */ 0x37,
/* mColCylinderHeight */ 0x73,
}
};
return result;
}
inline const Attr_c & attr(Type_e type) { return L_attr[type]; }
}
/* 000006F4-00000730 .text _delete__Q210daObjPaper5Act_cFv */
bool daObjPaper::Act_c::_delete() {
dComIfG_resDeleteDemo(&mPhs, attr(mType).mResName);
return TRUE;
}
const dCcD_SrcCyl Act_c::M_cyl_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
/* SrcObjAt Type */ 0,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ cCcD_TgSPrm_Set_e | cCcD_TgSPrm_GrpAll_e,
/* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
/* SrcGObjAt SPrm */ 0,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
/* SrcGObjTg SPrm */ dCcG_TgSPrm_Shield_e | dCcG_TgSPrm_NoConHit_e,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 0.0f,
/* Height */ 0.0f,
}},
};
/* 00000730-00000748 .text mode_wait_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_wait_init() {
fopAcM_OnStatus(this, fopAcStts_NOCULLEXEC_e);
mMode = ActMode_WAIT_e;
}
/* 00000078-0000009C .text solidHeapCB__Q210daObjPaper5Act_cFP10fopAc_ac_c */
int Act_c::solidHeapCB(fopAc_ac_c* i_this) {
return static_cast<Act_c*>(i_this)->create_heap();
}
/* 00000748-00000784 .text mode_wait__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_wait() {
if (eventInfo.mCommand == dEvtCmd_INTALK_e) {
mode_talk0_init();
}
else {
eventInfo.onCondition(dEvtCnd_CANTALK_e);
}
}
/* 0000009C-00000170 .text create_heap__Q210daObjPaper5Act_cFv */
bool Act_c::create_heap() {
J3DModelData* mdl_data;
bool ret = false;
/* 00000784-000007A4 .text mode_talk0_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk0_init() {
fopAcM_OffStatus(this, fopAcStts_NOCULLEXEC_e);
mMsgId = fpcM_ERROR_PROCESS_ID_e;
mMode = ActMode_TALKBEGIN_e;
}
mdl_data = (J3DModelData*)dComIfG_getObjectRes(attr(mType).mResName, attr(mType).mModelId);
/* 000007A4-00000820 .text mode_talk0__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk0() {
if (mMsgId == fpcM_ERROR_PROCESS_ID_e && dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), dCamAttnStts_00000004_e)) {
mMsgId = fopMsgM_messageSet(prm_get_msgNo(), &eyePos);
JUT_ASSERT(0x13E, mdl_data != NULL);
mode_talk1_init();
}
}
mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000022);
if (mpModel)
ret = true;
/* 00000820-0000082C .text mode_talk1_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk1_init() {
mMode = ActMode_GETMSG_e;
}
return ret;
}
/* 0000082C-00000874 .text mode_talk1__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk1() {
mpMsg = fopMsgM_SearchByID(mMsgId);
if (mpMsg) {
mode_talk2_init();
}
}
/* 00000170-000004E0 .text _create__Q210daObjPaper5Act_cFv */
cPhs_State Act_c::_create() {
fopAcM_ct(this, Act_c);
/* 00000874-00000880 .text mode_talk2_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk2_init() {
mMode = ActMode_TALKWAIT_e;
}
mType = prm_get_type();
cPhs_State result = dComIfG_resLoad(&mPhs, attr(mType).mResName);
if (result == cPhs_COMPLEATE_e) {
if (fopAcM_entrySolidHeap(this, solidHeapCB, attr(mType).mHeapSize)) {
eyePos.y += attr(mType).mEyeOffset;
attention_info.position.y += attr(mType).mAttentionOffset;
attention_info.distances[fopAc_Attn_TYPE_TALK_e] = attr(mType).mAttentionDist1;
attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = attr(mType).mAttentionDist2;
cLib_onBit<u32>(attention_info.flags, fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e | fopAc_Attn_TALKFLAG_READ_e);
/* 00000880-000008DC .text mode_talk2__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk2() {
if (mpMsg->mStatus == fopMsgStts_BOX_CLOSED_e) {
mpMsg->mStatus = fopMsgStts_MSG_DESTROYED_e;
mpMsg = NULL;
mMsgId = fpcM_ERROR_PROCESS_ID_e;
dComIfGp_event_reset();
if (mType == Piwa_e) {
fopAcM_SetStatusMap(this, 0x18);
}
if (attr(mType).mColCylinderRadius != 0) {
mbHasCc = true;
mColStatus.Init(0xFF, 0xFF, this);
mCylinderCol.Set(M_cyl_src);
mCylinderCol.SetStts(&mColStatus);
mCylinderCol.SetR(attr(mType).mColCylinderRadius);
mCylinderCol.SetH(attr(mType).mColCylinderHeight);
} else {
mbHasCc = false;
}
fopAcM_setCullSizeSphere(this, 0.0f, attr(mType).mCullSphereYOffset, 0.0f, attr(mType).mCullSphereRadius);
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
init_mtx();
mode_wait_init();
} else {
result = cPhs_ERROR_e;
}
}
/* 000008DC-00000948 .text set_mtx__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::set_mtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
return result;
}
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
/* 000006F4-00000730 .text _delete__Q210daObjPaper5Act_cFv */
bool daObjPaper::Act_c::_delete() {
dComIfG_resDeleteDemo(&mPhs, attr(mType).mResName);
return TRUE;
}
/* 00000730-00000748 .text mode_wait_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_wait_init() {
fopAcM_OnStatus(this, fopAcStts_NOCULLEXEC_e);
mMode = ActMode_WAIT_e;
}
/* 00000748-00000784 .text mode_wait__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_wait() {
if (eventInfo.mCommand == dEvtCmd_INTALK_e) {
mode_talk0_init();
}
/* 00000948-00000984 .text init_mtx__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::init_mtx() {
mpModel->setBaseScale(scale);
set_mtx();
}
/* 00000984-00000A38 .text damage_cc_proc__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::damage_cc_proc() {
u32 hitResult = mCylinderCol.ChkTgHit();
if (hitResult) {
daObj::HitSeStart(&eyePos, current.roomNo, &mCylinderCol, 0x0D);
dKy_Sound_set(current.pos, 4, fopAcM_GetID(this), 100);
daObj::HitEff_hibana(this, &mCylinderCol);
mCylinderCol.ClrTgHit();
}
mColStatus.Move();
}
typedef void (Act_c::*daObjPaper_mode_t)(void);
/* 00000A38-00000B58 .text _execute__Q210daObjPaper5Act_cFv */
bool daObjPaper::Act_c::_execute() {
static const daObjPaper_mode_t mode_proc[] = {
&Act_c::mode_wait,
&Act_c::mode_talk0,
&Act_c::mode_talk1,
&Act_c::mode_talk2,
};
if (mbHasCc) {
damage_cc_proc();
}
(this->*mode_proc[mMode])();
set_mtx();
if (mbHasCc) {
mCylinderCol.SetC(current.pos);
dComIfG_Ccsp()->Set(&mCylinderCol);
}
return true;
}
/* 00000B58-00000BD4 .text _draw__Q210daObjPaper5Act_cFv */
bool daObjPaper::Act_c::_draw() {
g_env_light.settingTevStruct(attr(mType).mTevType == 0 ? TEV_TYPE_BG0 : TEV_TYPE_ACTOR, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
return TRUE;
}
namespace {
/* 00000BD4-00000BF4 .text Mthd_Create__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static cPhs_State Mthd_Create(void* i_this) {
return static_cast<Act_c*>(i_this)->_create();
}
/* 00000BF4-00000C18 .text Mthd_Delete__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static BOOL Mthd_Delete(void* i_this) {
return static_cast<Act_c*>(i_this)->_delete();
}
/* 00000C18-00000C3C .text Mthd_Execute__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static BOOL Mthd_Execute(void* i_this) {
return static_cast<Act_c*>(i_this)->_execute();
}
/* 00000C3C-00000C60 .text Mthd_Draw__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static BOOL Mthd_Draw(void* i_this) {
return static_cast<Act_c*>(i_this)->_draw();
}
/* 00000C60-00000C68 .text Mthd_IsDelete__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static BOOL Mthd_IsDelete(void* i_this) {
return TRUE;
}
static 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_Draw,
};
else {
eventInfo.onCondition(dEvtCnd_CANTALK_e);
}
}
/* 00000784-000007A4 .text mode_talk0_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk0_init() {
fopAcM_OffStatus(this, fopAcStts_NOCULLEXEC_e);
mMsgId = fpcM_ERROR_PROCESS_ID_e;
mMode = ActMode_TALKBEGIN_e;
}
/* 000007A4-00000820 .text mode_talk0__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk0() {
if (mMsgId == fpcM_ERROR_PROCESS_ID_e && dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), dCamAttnStts_00000004_e)) {
mMsgId = fopMsgM_messageSet(prm_get_msgNo(), &eyePos);
mode_talk1_init();
}
}
/* 00000820-0000082C .text mode_talk1_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk1_init() {
mMode = ActMode_GETMSG_e;
}
/* 0000082C-00000874 .text mode_talk1__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk1() {
mpMsg = fopMsgM_SearchByID(mMsgId);
if (mpMsg) {
mode_talk2_init();
}
}
/* 00000874-00000880 .text mode_talk2_init__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk2_init() {
mMode = ActMode_TALKWAIT_e;
}
/* 00000880-000008DC .text mode_talk2__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::mode_talk2() {
if (mpMsg->mStatus == fopMsgStts_BOX_CLOSED_e) {
mpMsg->mStatus = fopMsgStts_MSG_DESTROYED_e;
mpMsg = NULL;
mMsgId = fpcM_ERROR_PROCESS_ID_e;
dComIfGp_event_reset();
mode_wait_init();
}
}
/* 000008DC-00000948 .text set_mtx__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::set_mtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 00000948-00000984 .text init_mtx__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::init_mtx() {
mpModel->setBaseScale(scale);
set_mtx();
}
/* 00000984-00000A38 .text damage_cc_proc__Q210daObjPaper5Act_cFv */
void daObjPaper::Act_c::damage_cc_proc() {
u32 hitResult = mCylinderCol.ChkTgHit();
if (hitResult) {
daObj::HitSeStart(&eyePos, current.roomNo, &mCylinderCol, 0x0D);
dKy_Sound_set(current.pos, 4, fopAcM_GetID(this), 100);
daObj::HitEff_hibana(this, &mCylinderCol);
mCylinderCol.ClrTgHit();
}
mColStatus.Move();
}
typedef void (Act_c::*daObjPaper_mode_t)(void);
/* 00000A38-00000B58 .text _execute__Q210daObjPaper5Act_cFv */
bool daObjPaper::Act_c::_execute() {
static const daObjPaper_mode_t mode_proc[] = {
&Act_c::mode_wait,
&Act_c::mode_talk0,
&Act_c::mode_talk1,
&Act_c::mode_talk2,
};
if (mbHasCc) {
damage_cc_proc();
}
(this->*mode_proc[mMode])();
set_mtx();
if (mbHasCc) {
mCylinderCol.SetC(current.pos);
dComIfG_Ccsp()->Set(&mCylinderCol);
}
return true;
}
/* 00000B58-00000BD4 .text _draw__Q210daObjPaper5Act_cFv */
bool daObjPaper::Act_c::_draw() {
g_env_light.settingTevStruct(attr(mType).mTevType == 0 ? TEV_TYPE_BG0 : TEV_TYPE_ACTOR, &current.pos, &tevStr);
g_env_light.setLightTevColorType(mpModel, &tevStr);
mDoExt_modelUpdateDL(mpModel);
return TRUE;
}
namespace {
/* 00000BD4-00000BF4 .text Mthd_Create__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static cPhs_State Mthd_Create(void* i_this) {
return static_cast<Act_c*>(i_this)->_create();
}
/* 00000BF4-00000C18 .text Mthd_Delete__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static BOOL Mthd_Delete(void* i_this) {
return static_cast<Act_c*>(i_this)->_delete();
}
/* 00000C18-00000C3C .text Mthd_Execute__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static BOOL Mthd_Execute(void* i_this) {
return static_cast<Act_c*>(i_this)->_execute();
}
/* 00000C3C-00000C60 .text Mthd_Draw__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static BOOL Mthd_Draw(void* i_this) {
return static_cast<Act_c*>(i_this)->_draw();
}
/* 00000C60-00000C68 .text Mthd_IsDelete__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */
static BOOL Mthd_IsDelete(void* i_this) {
return TRUE;
}
static 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_Draw,
};
}; // namespace
}; // namespace daObjPaper
actor_process_profile_definition g_profile_Obj_Paper = {
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 0x0007,
src/d/actor/d_a_tag_waterlevel.cpp
+131 -129
View File
@@ -10,138 +10,140 @@
#include "SSystem/SComponent/c_lib.h"
namespace daTagWaterlevel {
namespace {
struct Attr_c {
f32 field_0x00;
f32 field_0x04;
f32 field_0x08;
f32 field_0x0c;
};
static const Attr_c L_attr = {
0.005f, 0.05f, 0.015f, 0.005f,
};
inline const Attr_c & attr() { return L_attr; }
}
/* 00000078-000001D4 .text _create__Q28daTagRet5Act_cFv */
cPhs_State Act_c::_create() {
fopAcM_ct(this, Act_c);
if ((prm_get_sch() & dKy_get_schbit() & 0xFF)) {
M_now = 1.0f;
} else {
M_now = 0.0f;
}
field_0x290 = 0.0f;
mAction = 0;
return cPhs_COMPLEATE_e;
}
/* 00000128-00000130 .text _delete__Q215daTagWaterlevel5Act_cFv */
bool Act_c::_delete() {
return true;
}
/* 00000130-000001D8 .text bgm_proc__Q215daTagWaterlevel5Act_cFv */
void Act_c::bgm_proc() {
if (cLib_checkBit(get_state(), STATE_1)) {
if (get_now() > 0.95f && mAction != 1) {
mAction = 1;
mDoAud_stWaterLevelUp();
}
} else {
if (get_now() < 0.05f && mAction != 2) {
mAction = 2;
mDoAud_stWaterLevelDown();
}
}
}
/* 000001D8-00000364 .text _execute__Q215daTagWaterlevel5Act_cFv */
bool Act_c::_execute() {
f32 target;
u8 prm_sch = prm_get_sch();
u8 sch_bit = dKy_get_schbit();
cLib_offBit(M_state, STATE_2);
bool temp = prm_sch & sch_bit & 0xFF;
if (temp) {
target = 1.0f;
if (!cLib_checkBit(get_state(), STATE_1)) {
cLib_onBit(M_state, STATE_2);
cLib_onBit(M_state, STATE_1);
}
} else {
target = 0.0f;
if (cLib_checkBit(get_state(), STATE_1)) {
cLib_onBit(M_state, STATE_2);
cLib_offBit(M_state, STATE_1);
}
}
if (dComIfGp_event_runCheck() && dComIfGp_event_chkEventFlag(2)) {
if (get_now() < 0.5f) {
M_now = 0.0f;
} else {
M_now = 1.0f;
}
} else {
if (std::fabsf(target - get_now()) < attr().field_0x0c) {
M_now = target;
field_0x290 = 0.0f;
} else {
field_0x290 += attr().field_0x00;
if (field_0x290 > attr().field_0x08)
field_0x290 = attr().field_0x08;
if (field_0x290 < attr().field_0x0c)
field_0x290 = attr().field_0x0c;
cLib_addCalc(&M_now, target, attr().field_0x04, field_0x290, attr().field_0x0c);
}
}
bgm_proc();
return true;
}
/* 00000364-0000036C .text _draw__Q215daTagWaterlevel5Act_cFv */
bool Act_c::_draw() {
return true;
}
namespace {
cPhs_State Mthd_Create(void* i_this) {
return ((Act_c*)i_this)->_create();
}
BOOL Mthd_Delete(void* i_this) {
return ((Act_c*)i_this)->_delete();
}
BOOL Mthd_Execute(void* i_this) {
return ((Act_c*)i_this)->_execute();
}
BOOL Mthd_Draw(void* i_this) {
return ((Act_c*)i_this)->_draw();
}
BOOL Mthd_IsDelete(void* i_this) {
return TRUE;
}
static 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_Draw,
};
namespace {
struct Attr_c {
f32 field_0x00;
f32 field_0x04;
f32 field_0x08;
f32 field_0x0c;
};
static const Attr_c L_attr = {
0.005f, 0.05f, 0.015f, 0.005f,
};
inline const Attr_c & attr() { return L_attr; }
}
/* 00000078-000001D4 .text _create__Q28daTagRet5Act_cFv */
cPhs_State Act_c::_create() {
fopAcM_ct(this, Act_c);
if ((prm_get_sch() & dKy_get_schbit() & 0xFF)) {
M_now = 1.0f;
} else {
M_now = 0.0f;
}
field_0x290 = 0.0f;
mAction = 0;
return cPhs_COMPLEATE_e;
}
/* 00000128-00000130 .text _delete__Q215daTagWaterlevel5Act_cFv */
bool Act_c::_delete() {
return true;
}
/* 00000130-000001D8 .text bgm_proc__Q215daTagWaterlevel5Act_cFv */
void Act_c::bgm_proc() {
if (cLib_checkBit(get_state(), STATE_1)) {
if (get_now() > 0.95f && mAction != 1) {
mAction = 1;
mDoAud_stWaterLevelUp();
}
} else {
if (get_now() < 0.05f && mAction != 2) {
mAction = 2;
mDoAud_stWaterLevelDown();
}
}
}
/* 000001D8-00000364 .text _execute__Q215daTagWaterlevel5Act_cFv */
bool Act_c::_execute() {
f32 target;
u8 prm_sch = prm_get_sch();
u8 sch_bit = dKy_get_schbit();
cLib_offBit(M_state, STATE_2);
bool temp = prm_sch & sch_bit & 0xFF;
if (temp) {
target = 1.0f;
if (!cLib_checkBit(get_state(), STATE_1)) {
cLib_onBit(M_state, STATE_2);
cLib_onBit(M_state, STATE_1);
}
} else {
target = 0.0f;
if (cLib_checkBit(get_state(), STATE_1)) {
cLib_onBit(M_state, STATE_2);
cLib_offBit(M_state, STATE_1);
}
}
if (dComIfGp_event_runCheck() && dComIfGp_event_chkEventFlag(2)) {
if (get_now() < 0.5f) {
M_now = 0.0f;
} else {
M_now = 1.0f;
}
} else {
if (std::fabsf(target - get_now()) < attr().field_0x0c) {
M_now = target;
field_0x290 = 0.0f;
} else {
field_0x290 += attr().field_0x00;
if (field_0x290 > attr().field_0x08)
field_0x290 = attr().field_0x08;
if (field_0x290 < attr().field_0x0c)
field_0x290 = attr().field_0x0c;
cLib_addCalc(&M_now, target, attr().field_0x04, field_0x290, attr().field_0x0c);
}
}
bgm_proc();
return true;
}
/* 00000364-0000036C .text _draw__Q215daTagWaterlevel5Act_cFv */
bool Act_c::_draw() {
return true;
}
namespace {
cPhs_State Mthd_Create(void* i_this) {
return ((Act_c*)i_this)->_create();
}
BOOL Mthd_Delete(void* i_this) {
return ((Act_c*)i_this)->_delete();
}
BOOL Mthd_Execute(void* i_this) {
return ((Act_c*)i_this)->_execute();
}
BOOL Mthd_Draw(void* i_this) {
return ((Act_c*)i_this)->_draw();
}
BOOL Mthd_IsDelete(void* i_this) {
return TRUE;
}
static 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_Draw,
};
}; // namespace
}; // namespace daTagWaterlevel
actor_process_profile_definition g_profile_Tag_Waterlevel = {
/* Layer ID */ fpcLy_CURRENT_e,