From f0d5cd7b6a56eb042c485e61260f8aa40abf52d9 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 17 Aug 2026 23:03:22 -0400 Subject: [PATCH] Fix camera structs being swapped `camera_process_class` and `camera_class` were swapped according to TP's RTTI info. --- include/d/actor/d_a_fganon.h | 8 --- include/d/actor/d_a_ship.h | 2 +- include/d/d_camera.h | 2 +- include/d/d_com_inf_game.h | 9 +++- include/d/d_drawlist.h | 6 +-- include/f_op/f_op_camera.h | 6 +-- src/d/actor/d_a_bdk.cpp | 8 +-- src/d/actor/d_a_bgn.cpp | 4 +- src/d/actor/d_a_bk.cpp | 6 +-- src/d/actor/d_a_bmd.cpp | 6 +-- src/d/actor/d_a_bomb2.cpp | 6 +-- src/d/actor/d_a_bomb3.inc | 8 +-- src/d/actor/d_a_boomerang.cpp | 2 +- src/d/actor/d_a_bpw.cpp | 6 +-- src/d/actor/d_a_bridge.cpp | 2 +- src/d/actor/d_a_bst.cpp | 2 +- src/d/actor/d_a_btd.cpp | 4 +- src/d/actor/d_a_bwd.cpp | 4 +- src/d/actor/d_a_canon.cpp | 2 +- src/d/actor/d_a_fganon.cpp | 4 +- src/d/actor/d_a_himo2.cpp | 10 ++-- src/d/actor/d_a_kamome2.cpp | 2 +- src/d/actor/d_a_kb.cpp | 2 +- src/d/actor/d_a_kokiie.cpp | 2 +- src/d/actor/d_a_kui.cpp | 2 +- src/d/actor/d_a_kytag00.cpp | 2 +- src/d/actor/d_a_kytag05.cpp | 2 +- src/d/actor/d_a_mo2.cpp | 4 +- src/d/actor/d_a_npc_bmsw.cpp | 2 +- src/d/actor/d_a_npc_btsw.cpp | 2 +- src/d/actor/d_a_npc_kamome.cpp | 1 + src/d/actor/d_a_obj_barrel2.cpp | 2 +- src/d/actor/d_a_player_crawl.inc | 2 +- src/d/actor/d_a_player_dproc.inc | 6 +-- src/d/actor/d_a_player_main.cpp | 4 +- src/d/actor/d_a_pw.cpp | 2 +- src/d/actor/d_a_ship.cpp | 18 +++---- src/d/actor/d_a_stone.cpp | 2 +- src/d/actor/d_a_stone2.cpp | 2 +- src/d/actor/d_a_tn.cpp | 2 +- src/d/actor/d_a_vrbox2.cpp | 4 +- src/d/actor/d_a_warpfout.cpp | 1 + src/d/actor/d_a_wind_tag.cpp | 2 +- src/d/actor/d_a_ykgr.cpp | 2 +- src/d/d_camera.cpp | 84 ++++++++++++++++---------------- src/d/d_demo.cpp | 18 +++---- src/d/d_kankyo.cpp | 8 +-- src/d/d_kankyo_rain.cpp | 48 +++++++++--------- src/d/d_kankyo_wether.cpp | 2 +- src/d/d_ky_thunder.cpp | 2 +- src/d/d_kyeff.cpp | 2 +- src/d/d_meter.cpp | 1 + src/d/d_picture_box.cpp | 2 +- src/d/d_s_name.cpp | 2 +- src/d/d_scope.cpp | 2 +- src/d/d_shop.cpp | 10 ++-- src/f_op/f_op_actor_mng.cpp | 2 +- src/m_Do/m_Do_graphic.cpp | 2 +- 58 files changed, 182 insertions(+), 180 deletions(-) diff --git a/include/d/actor/d_a_fganon.h b/include/d/actor/d_a_fganon.h index 9de39a76b..74ea64e7c 100644 --- a/include/d/actor/d_a_fganon.h +++ b/include/d/actor/d_a_fganon.h @@ -6,14 +6,6 @@ #include "d/d_bg_s_acch.h" #include "d/d_particle.h" -class camera_class; -class mant_class; -class daBoko_c; -class daPy_py_c; -class mDoExt_McaMorf; -class mDoExt_brkAnm; -class mDoExt_btkAnm; - class fganon_class { public: /* 0x000 */ fopEn_enemy_c actor; diff --git a/include/d/actor/d_a_ship.h b/include/d/actor/d_a_ship.h index 00c9a5ea7..07cadb430 100644 --- a/include/d/actor/d_a_ship.h +++ b/include/d/actor/d_a_ship.h @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_phase.h" #include "f_op/f_op_msg.h" -class camera_class; +class camera_process_class; class daGrid_c; class daTornado_c; class daPy_FLG1; diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 22243b3ef..f0dba5d0b 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -13,8 +13,8 @@ #include "d/d_spline_path.h" #include "global.h" -class camera_class; class camera_process_class; +class camera_class; class dBgS_LinChk; class dBgS_CamGndChk; class d2DBSplinePath; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 81fa3ece5..d19970697 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -2220,8 +2220,13 @@ void dComIfGp_setNextStage(const char* i_stageName, s16 i_point, s8 i_roomNo, s8 dStage_Ship_dt_c* dComIfGp_getShip(int i_roomNo, int param_1); bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle); -inline camera_class* dComIfGp_getCamera(int idx) { return g_dComIfG_gameInfo.play.getCamera(idx); } -inline f32 dComIfGp_getCamZoomForcus(int idx) { return g_dComIfG_gameInfo.play.getCamZoomForcus(idx); } +inline camera_process_class* dComIfGp_getCamera(int idx) { + return (camera_process_class*)g_dComIfG_gameInfo.play.getCamera(idx); +} + +inline f32 dComIfGp_getCamZoomForcus(int idx) { + return g_dComIfG_gameInfo.play.getCamZoomForcus(idx); +} inline const char* dComIfGp_getStartStageName() { return g_dComIfG_gameInfo.play.getStartStageName(); diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 61806f656..48a3de5ea 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -443,7 +443,7 @@ public: struct view_port_class; struct view_class; -class camera_class; +class camera_process_class; struct dDlst_alphaModelData_c { public: @@ -639,7 +639,7 @@ public: void setWindow(dDlst_window_c* pWindow) { mpWindow = pWindow; } void setViewport(view_port_class* pViewPort) { mpViewPort = pViewPort; } view_port_class* getViewport() { return mpViewPort; } - void setView(view_class* pView) { mpCamera = (camera_class*)pView; } + void setView(view_class* pView) { mpCamera = (camera_process_class*)pView; } view_class* getView() { return (view_class*)mpCamera; } static void offWipe() { mWipe = false; } @@ -690,7 +690,7 @@ public: /* 0x00228 */ dDlst_base_c** mp2DXluEnd; /* 0x0022C */ dDlst_window_c* mpWindow; /* 0x00230 */ view_port_class* mpViewPort; - /* 0x00234 */ camera_class* mpCamera; // should be view_class* + /* 0x00234 */ camera_process_class* mpCamera; // should be view_class* /* 0x00238 */ u8 field_0x00238[0x00244 - 0x00238]; /* 0x00244 */ dDlst_alphaModel_c* mpAlphaModel; /* 0x00248 */ dDlst_alphaModel_c* mpSpotModel; diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h index 61eaabb56..92fc82189 100644 --- a/include/f_op/f_op_camera.h +++ b/include/f_op/f_op_camera.h @@ -6,7 +6,7 @@ typedef struct leafdraw_method_class leafdraw_method_class; -class camera_process_class : public view_class { +class camera_class : public view_class { public: /* 0x210 */ create_tag_class draw_tag; /* 0x224 */ leafdraw_method_class* mpMtd; @@ -18,9 +18,9 @@ public: /* 0x230 */ csXyz mAngle; /* 0x238 */ int field_0x238; }; // size = 0x23C -STATIC_ASSERT(sizeof(camera_process_class) == 0x23C); +STATIC_ASSERT(sizeof(camera_class) == 0x23C); -class camera_class : public camera_process_class { +class camera_process_class : public camera_class { public: /* 0x23C */ request_of_phase_process_class phase_request; /* 0x244 */ dCamera_c mCamera; diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 1d7501873..365debda0 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -1274,7 +1274,7 @@ static void kuti_attack(bdk_class* i_this) { static void wind_set(bdk_class* i_this, cXyz* param2) { fopAc_ac_c* actor = &i_this->actor; fopAc_ac_c* player; - camera_class* camera; + camera_process_class* camera; cXyz vec1; cXyz vec2; @@ -1296,7 +1296,7 @@ static void wind_set(bdk_class* i_this, cXyz* param2) { } } } - camera = static_cast(dComIfGp_getCamera(0)); + camera = static_cast(dComIfGp_getCamera(0)); vec2 = actor->eyePos - camera->mLookat.mEye; wind_se_pos = actor->eyePos + (camera->mLookat.mEye - actor->eyePos) * 0.8f; mDoAud_seStart(JA_SE_CM_DK_WIND, &wind_se_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); @@ -2773,7 +2773,7 @@ static void demo_camera(bdk_class* i_this) { fopAc_ac_c* actor = &i_this->actor; fopAc_ac_c* player_actor = (fopAc_ac_c*)dComIfGp_getPlayer(0); daPy_py_c* player = (daPy_py_c*)player_actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); csXyz local_14C; csXyz local_154; @@ -3119,7 +3119,7 @@ static void demo_camera(bdk_class* i_this) { camera->mCamera.Stop(); camera->mCamera.SetTrimSize(2); - camera_class* pCamera = dComIfGp_getCamera(0); + camera_process_class* pCamera = dComIfGp_getCamera(0); i_this->m25A8 = pCamera->mLookat.mEye; local_104.x = pCamera->mLookat.mEye.x - i_this->m1150.x; local_104.z = pCamera->mLookat.mEye.z - i_this->m1150.z; diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index 9dbf6ef27..663fcedb2 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -531,7 +531,7 @@ static void part_draw(bgn_class* i_this, part_s* param_2) { param_2->mPartTevStr.mFogColor.b = uVar6 & 0xFF; param_2->mPartTevStr.mFogStartZ = param_2->mPartTevStr.mFogStartZ + param_2->m0CC; } - camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(0); local_38 = param_2->m224 - camera->mLookat.mEye; if (local_38.abs() > l_HIO.m008 * param_2->m0F4) { g_env_light.setLightTevColorType(model, ¶m_2->mPartTevStr); @@ -3045,7 +3045,7 @@ static void demo_camera(bgn_class* i_this) { cXyz camera_center; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (i_this->mCSMode) { case 0: break; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index 4ffba8576..ad05be160 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -3820,7 +3820,7 @@ static void waki_set(bk_class* i_this) { } daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(0); cXyz sp2C; u8 sp38[0x100]; @@ -3912,12 +3912,12 @@ static void demo_camera(bk_class* i_this) { fopAc_ac_c* actor = i_this; fopAc_ac_c* player_actor = dComIfGp_getPlayer(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s8 r28 = true; cXyz sp8C; cXyz sp80; - camera_class* r3; + camera_process_class* r3; switch (i_this->m1234) { case 0: break; diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index fc9bdf79f..8b60a4ee4 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -1156,7 +1156,7 @@ void demo_camera(bmd_class* i_this) { fopAc_ac_c* player_actor = dComIfGp_getPlayer(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (i_this->mB74) { case 0: @@ -1174,7 +1174,7 @@ void demo_camera(bmd_class* i_this) { #endif } i_this->mB74++; - camera_class* camera2 = dComIfGp_getCamera(0); + camera_process_class* camera2 = dComIfGp_getCamera(0); i_this->mB7C = camera2->mLookat.mEye; i_this->mB88 = camera2->mLookat.mCenter; local_44 = player_actor->current.pos - i_this->mB7C; @@ -1427,7 +1427,7 @@ void demo_camera(bmd_class* i_this) { break; } i_this->mB74++; - camera_class* camera2 = dComIfGp_getCamera(0); + camera_process_class* camera2 = dComIfGp_getCamera(0); i_this->mB7C = camera2->mLookat.mEye; i_this->mB88 = camera2->mLookat.mCenter; camera->mCamera.Stop(); diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 9639486d9..02d29d6f9 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -118,7 +118,7 @@ bool Env_c::is_end() const { /* 800DD4B0-800DD670 .text proc__Q27daBomb25Env_cFRC4cXyz */ void Env_c::proc(const cXyz& param_1) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 temp2 = 0.0f; mPntLight.mPower = field_0x50 * 1500.0f; @@ -480,7 +480,7 @@ void Act_c::cc_set() { } void Act_c::camera_lockoff() const { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.ForceLockOff(fopAcM_GetID((Act_c*)this)); } @@ -683,7 +683,7 @@ void Act_c::eff_explode() { if(!field_0x742) { field_0x742 = 1; - camera_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); csXyz rot; rot.x = -cam->mAngle.x; rot.y = cam->mAngle.y + 0x8000; diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index 965b32a3f..dfb74b6cf 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -677,7 +677,7 @@ void daBomb_c::setRoomInfo() { /* 800DAA60-800DAB28 .text makeFireEffect__8daBomb_cFR4cXyzR5csXyz */ void daBomb_c::makeFireEffect(cXyz& pos, csXyz& rotation) { - camera_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz scale; scale.setall(0.3f); @@ -765,7 +765,7 @@ void daBomb_c::eff_explode_cheap(const csXyz* rotation) { /* 800DAF94-800DB024 .text eff_explode__8daBomb_cFv */ void daBomb_c::eff_explode() { - camera_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* cam = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); csXyz rot; rot.x = -cam->mAngle.x; rot.y = cam->mAngle.y + 0x8000; @@ -781,7 +781,7 @@ void daBomb_c::eff_explode() { /* 800DB024-800DB630 .text procExplode_init__8daBomb_cFv */ BOOL daBomb_c::procExplode_init() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.ForceLockOff(fopAcM_GetID(this)); BOOL temp; @@ -891,7 +891,7 @@ BOOL daBomb_c::procExplode_init() { /* 800DB630-800DB880 .text procExplode__8daBomb_cFv */ bool daBomb_c::procExplode() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 f31; f32 temp2; temp2 = 0.0f; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 371b5dd68..ee1c469ae 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -546,7 +546,7 @@ BOOL daBoomerang_c::procWait() { resetLockActor(); } else { if (pPlayer->checkBoomerangRock()) { - camera_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz eyePos = *fopCamM_GetEye_p(pCamera); cXyz topPos = pPlayer->getLineTopPos(); mCps.OnAtNoTgHitInfSet(); diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 73fc26769..6249b91d5 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -696,7 +696,7 @@ void noroi_check(bpw_class* i_this) { i_this->mSomeCountdownTimers[3] = DEMO_SELECT(REG11_F(17) + 0x14, 0x14); s32 r31 = ACTOR_TYPE_BODY; csXyz local_28 = actor->shape_angle; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); i_this->mFire1DousaPos = player2->getHeadTopPos(); dComIfGp_particle_set(dPa_name::ID_IT_JN_PIYOHIT00, &i_this->mFire1DousaPos); r31 |= ACTOR_TYPE_TORITUKI; @@ -2073,7 +2073,7 @@ void action_bunri_dousa(bpw_class* i_this) { f32 f2; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = (camera_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (i_this->mActionState) { case ACTION_STATE_SEPARATE_BUNRI_DOUSA_INIT: { for (s32 i = 0; i < 10; i++) { @@ -2966,7 +2966,7 @@ void action_start_demo(bpw_class* i_this) { f32 fVar1; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (i_this->mActionState) { case 200: actor->scale.setall(0.0f); diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index 3ae97ae35..30e949425 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/src/d/actor/d_a_bridge.cpp @@ -847,7 +847,7 @@ static BOOL daBridge_Execute(bridge_class* i_this) { /* Nonmatching - regswap */ fopAc_ac_c* a_player = static_cast(dComIfGp_getPlayer(0)); daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); - camera_class* pCam = dComIfGp_getCamera(0); + camera_process_class* pCam = dComIfGp_getCamera(0); s32 i; cXyz eyeDir = i_this->actor.current.pos - pCam->mLookat.mEye; diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index 2b557ffa9..ec8f167f8 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -2035,7 +2035,7 @@ void demo_camera(bst_class* i_this) { cXyz spB0; // offset cXyz spA4; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s8 bVar2 = true; switch (i_this->m2E9A) { diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index e540d35ea..d2eddc43d 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -1927,7 +1927,7 @@ static void sibuki_move(btd_class* i_this) { static void demo_camera(btd_class* i_this) { fopAc_ac_c* actor = &i_this->actor; f32 fVar2; - camera_class* camera2; + camera_process_class* camera2; cXyz local_38; cXyz local_44; cXyz local_b0; @@ -1936,7 +1936,7 @@ static void demo_camera(btd_class* i_this) { fopAc_ac_c* const player_actor = dComIfGp_getPlayer(0); daPy_py_c* player = (daPy_py_c*)player_actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); i_this->m6E1A++; i_this->m6E18++; switch (i_this->m6E16) { diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index b76a2bd46..fc8fe6998 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -1437,7 +1437,7 @@ static void demo_camera(bwd_class* i_this) { f32 fVar1; f32 fVar2; s16 sVar3; - camera_class* camera2; + camera_process_class* camera2; fopAc_ac_c* pfVar7; cXyz local_98; cXyz local_a4; @@ -1447,7 +1447,7 @@ static void demo_camera(bwd_class* i_this) { fopAc_ac_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); daPy_py_c* player2 = (daPy_py_c*)player; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (i_this->m3C1E) { case 0: break; diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index c5ecee11e..6935f785f 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/src/d/actor/d_a_canon.cpp @@ -201,7 +201,7 @@ void daCanon_c::breakAllObj() { /* 00000820-00000A8C .text makeFireEffect__9daCanon_cFR4cXyzR5csXyzi */ void daCanon_c::makeFireEffect(cXyz& arg1, csXyz& arg2, int arg3) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp2C(0.75f, 0.75f, 0.75f); csXyz sp18; sp18.x = -fopCamM_GetAngleX(camera); diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 1dc983352..cf696999f 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -1645,8 +1645,8 @@ s32 move(fganon_class* i_this) { /* 00006560-00007434 .text demo_camera__FP12fganon_class */ void demo_camera(fganon_class* i_this) { - camera_class* camera; - camera_class* camera2; + camera_process_class* camera; + camera_process_class* camera2; fopEn_enemy_c* a_this; fopAc_ac_c* player_actor; daPy_py_c* player; diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 55ac3a4e1..9c0227793 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -556,7 +556,7 @@ static fopAc_ac_c* search_target(himo2_class* i_this, cXyz param_2) { f4 = std::sqrtf(SQUARE(sp30.x) + SQUARE(sp30.z)); if (f4 < f31) { cXyz sp24; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); sp24.x = param_2.x - camera->mLookat.mEye.x; sp24.y = param_2.y - camera->mLookat.mEye.y; sp24.z = param_2.z - camera->mLookat.mEye.z; @@ -736,8 +736,8 @@ static void new_himo2_move(himo2_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; fopAc_ac_c* player_actor; daPy_py_c* player; - camera_class* camera; // r29 - camera_class* camera2; // r23 + camera_process_class* camera; // r29 + camera_process_class* camera2; // r23 dAttention_c* attention; // r23 u32 r30; bool r27; @@ -775,7 +775,7 @@ static void new_himo2_move(himo2_class* i_this) { player_actor = dComIfGp_getPlayer(0); player = (daPy_py_c*)player_actor; - camera = (camera_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera = (camera_process_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp100 = i_this->m02EC[0]; cXyz spF4 = i_this->m02EC[1]; // unused cXyz spE8; // unused @@ -875,7 +875,7 @@ static void new_himo2_move(himo2_class* i_this) { i_this->m029E = 0; i_this->m02A0 = REG0_S(9) + 10; i_this->m02A2 = 3; - camera2 = (camera_class*)dComIfGp_getCamera(0); + camera2 = (camera_process_class*)dComIfGp_getCamera(0); f28 = i_this->m2524.x - camera2->mLookat.mEye.x; f27 = i_this->m2524.y - camera2->mLookat.mEye.y; f26_3 = i_this->m2524.z - camera2->mLookat.mEye.z; diff --git a/src/d/actor/d_a_kamome2.cpp b/src/d/actor/d_a_kamome2.cpp index 8f8ebf3ea..896d19dd9 100644 --- a/src/d/actor/d_a_kamome2.cpp +++ b/src/d/actor/d_a_kamome2.cpp @@ -167,7 +167,7 @@ static void key_move(kamome2_class* i_this) { static BOOL daKamome2_Execute(kamome2_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); i_this->m2A8++; if (l_HIO.m05 == 0) { diff --git a/src/d/actor/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp index 30b61ec91..72db2fc25 100644 --- a/src/d/actor/d_a_kb.cpp +++ b/src/d/actor/d_a_kb.cpp @@ -1806,7 +1806,7 @@ void esa_demo_move(kb_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; daPy_py_c* pPlayer = daPy_getPlayerActorClass(); - camera_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dBgS_LinChk linChk; switch(i_this->m420) { diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index b4fd506ae..5896507aa 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/src/d/actor/d_a_kokiie.cpp @@ -216,7 +216,7 @@ BOOL himo_create(kokiie_class* i_this) { /* 00000A18-00000E98 .text demo_camera__FP12kokiie_class */ void demo_camera(kokiie_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp5C; cXyz sp50; diff --git a/src/d/actor/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp index 139d357cc..0ad27f5a5 100644 --- a/src/d/actor/d_a_kui.cpp +++ b/src/d/actor/d_a_kui.cpp @@ -130,7 +130,7 @@ static BOOL daKui_Draw(kui_class* i_this) { /* 00000540-00000920 .text demo_camera__FP9kui_class */ static void demo_camera(kui_class* i_this) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s8 bVar2 = true; switch ((s8)i_this->field_0x2E8) { diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 1ce3a3627..eeea3809f 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -16,7 +16,7 @@ cXyz get_check_pos(kytag00_class* i_this) { fopAc_ac_c* actor = &i_this->actor; cXyz ret; - camera_class * pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class * pCamera = (camera_process_class*)dComIfGp_getCamera(0); fopAc_ac_c * pPlayer = dComIfGp_getPlayer(0); f32 cameraDist = actor->current.pos.abs(pCamera->mLookat.mEye); diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 9c930e396..7ca2be46f 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -39,7 +39,7 @@ static BOOL daKytag05_Execute(kytag05_class* a_this) { 150, }; - camera_process_class *camera = dComIfGp_getCamera(0); + camera_class *camera = dComIfGp_getCamera(0); fopAc_ac_c *player = dComIfGp_getPlayer(0); f32 windPow = dKyw_get_wind_pow(); f32 blend = 1.0f; diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index e19c59f62..f1648d1b8 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -2775,7 +2775,7 @@ static void carry_drop(mo2_class* i_this) { static void e3_demo(mo2_class* i_this) { fopAc_ac_c* actor = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = (camera_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); i_this->m05B4 = 5; i_this->mDamageReaction.m4D0 = fopAcM_searchPlayerAngleY(actor); @@ -3264,7 +3264,7 @@ static u8 damage_check(mo2_class* i_this) { /* 0000A3FC-0000A788 .text mo2_demo_camera__FP9mo2_class */ static void mo2_demo_camera(mo2_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - camera_class* camera2; + camera_process_class* camera2; dCam_getCamera(); dCamera_c* camera = dCam_getBody(); diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp index 97d4632c8..4ac321dfb 100644 --- a/src/d/actor/d_a_npc_bmsw.cpp +++ b/src/d/actor/d_a_npc_bmsw.cpp @@ -1635,7 +1635,7 @@ void SwMail_c::draw(dKy_tevstr_c* tevStr) { /* 00004C04-00004D0C .text Move__7SwCam_cFv */ void SwCam_c::Move() { if (field_0x1E != 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz center = camera_center_data[field_0x1D][field_0x1C + 1]; cLib_addCalcPos(&field_0x00, center, 0.25f, 10.0f, 1.0f); diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index 66c079833..0dd94fa86 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -1423,7 +1423,7 @@ void SwMail2_c::draw(dKy_tevstr_c* tevStr) { /* 00004680-00004788 .text Move__8SwCam2_cFv */ void SwCam2_c::Move() { if (field_0x1E != 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz center = camera_center_data[field_0x1D][field_0x1C + 1]; cLib_addCalcPos(&field_0x00, center, 0.25f, 10.0f, 1.0f); diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 80c9d3deb..18c2c1798 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -15,6 +15,7 @@ #include "d/d_npc.h" #include "d/d_snap.h" #include "d/d_camera.h" +#include "f_op/f_op_camera.h" class daNpc_kam_HIO1_c { public: diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index f40968ae8..6ebfc8115 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -725,7 +725,7 @@ void daObjBarrel2::Act_c::eff_explode() { fopAcM_seStart(this, JA_SE_OBJ_BARREL_BOMB, 0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); csXyz sp18; sp18.x = -fopCamM_GetAngleX(camera); sp18.y = fopCamM_GetAngleY(camera) - -0x8000; diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc index 7e526a5fa..bff14ecb7 100644 --- a/src/d/actor/d_a_player_crawl.inc +++ b/src/d/actor/d_a_player_crawl.inc @@ -37,7 +37,7 @@ f32 daPy_lk_c::getCrawlMoveSpeed() { /* 80138868-801389D0 .text setCrawlMoveDirectionArrow__9daPy_lk_cFv */ void daPy_lk_c::setCrawlMoveDirectionArrow() { u8 direction = 0; - camera_class* cam = dComIfGp_getCamera(mCameraInfoIdx); + camera_process_class* cam = dComIfGp_getCamera(mCameraInfoIdx); BOOL bVar = cLib_distanceAngleS(fopCamM_GetAngleY(cam), shape_angle.y) > 0x4000; if (mProcVar6.m3570 & 4) { if (!bVar) { diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index 8f374ce15..4eedbb83e 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -700,7 +700,7 @@ BOOL daPy_lk_c::dProcGetItem_init() { } else { mProcVar2.m34D4 = -1; } - camera_class* cam = dComIfGp_getCamera(mCameraInfoIdx); + camera_process_class* cam = dComIfGp_getCamera(mCameraInfoIdx); mProcVar3.m34D6 = shape_angle.y - fopCamM_GetAngleY(cam); current.angle.y = shape_angle.y; m3628 = fpcM_ERROR_PROCESS_ID_e; @@ -724,7 +724,7 @@ BOOL daPy_lk_c::dProcGetItem() { return true; } if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() < 10.0f) { - camera_class* cam = dComIfGp_getCamera(mCameraInfoIdx); + camera_process_class* cam = dComIfGp_getCamera(mCameraInfoIdx); mProcVar3.m34D6 = shape_angle.y - fopCamM_GetAngleY(cam); } daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(this); @@ -2083,7 +2083,7 @@ BOOL daPy_lk_c::dProcGetDance_init() { mNormalSpeed = 0.0f; setSingleMoveAnime(ANM_TAKTDGE, 1.0f, 0.0f, -1, 3.0f); mProcVar2.m34D4 = 0; - camera_class* cam = dComIfGp_getCamera(mCameraInfoIdx); + camera_process_class* cam = dComIfGp_getCamera(mCameraInfoIdx); mProcVar3.m34D6 = shape_angle.y - fopCamM_GetAngleY(cam); current.angle.y = shape_angle.y; m3628 = fpcM_ERROR_PROCESS_ID_e; diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 6c50198e2..8f395b5fa 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -1058,7 +1058,7 @@ void daPy_lk_c::setOutPower(f32 param_1, s16 param_2, int param_3) { /* 801056E4-80105814 .text checkSightLine__9daPy_lk_cFfP4cXyz */ BOOL daPy_lk_c::checkSightLine(f32 param_1, cXyz* param_2) { - camera_class* cam = dComIfGp_getCamera(mCameraInfoIdx); + camera_process_class* cam = dComIfGp_getCamera(mCameraInfoIdx); cXyz* pcVar2 = fopCamM_GetEye_p(cam); cXyz local_44 = (*fopCamM_GetCenter_p(cam) - *pcVar2); *param_2 = (local_44.normalize() * param_1) + *pcVar2; @@ -2710,7 +2710,7 @@ BOOL daPy_lk_c::setBodyAngleToCamera() { } #endif } else { - camera_class* cam = dComIfGp_getCamera(mCameraInfoIdx); + camera_process_class* cam = dComIfGp_getCamera(mCameraInfoIdx); shape_angle.y = cam->mAngle.y; current.angle.y = shape_angle.y; mBodyAngle.x = cam->mAngle.x; diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index db9671049..e8ad2afa6 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -173,7 +173,7 @@ void first_mode_change(pw_class*) { void action_dousa(pw_class* i_this) { /* Nonmatching */ daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz camfwd; switch (i_this->mMode) { case 0: diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 9e1791a82..1ca446065 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -2548,7 +2548,7 @@ BOOL daShip_c::procTurn_init() { seStart(JA_SE_SHIP_LOOK_FORWARD, &eyePos); mProc = &daShip_c::procTurn; m038E = 0; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stop(); cXyz cameraPos = camera->mCamera.Eye() - camera->mCamera.Center(); cameraPos.normalize(); @@ -2568,7 +2568,7 @@ BOOL daShip_c::procTurn() { cXyz local_b8; cXyz local_ac; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); local_c4 = current.pos - camera->mCamera.Center(); fVar5 = local_c4.abs(); local_ac = camera->mCamera.Center() + (current.pos - m045C); @@ -2621,7 +2621,7 @@ BOOL daShip_c::procTurn() { /* 00006C78-00006DE0 .text procTornadoUp_init__8daShip_cFv */ BOOL daShip_c::procTornadoUp_init() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); onStateFlg((daSHIP_SFLG)(daSFLG_FLY_e | daSFLG_UNK1000_e)); mCurMode = 12; mProc = &daShip_c::procTornadoUp; @@ -2658,7 +2658,7 @@ BOOL daShip_c::procTornadoUp() { shape_angle.y += 0x1C25; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz local_3c(tornado->current.pos.x, current.pos.y, tornado->current.pos.z); camera->mCamera.Set(local_3c, camera->mCamera.Eye()); @@ -2684,7 +2684,7 @@ BOOL daShip_c::procStartModeWarp_init() { setPartOffAnime(); } m03A6 = 0x1C25; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stop(); cXyz local_38(current.pos.x, m03F4 + 1500.0f, current.pos.z + 2000.0f); camera->mCamera.Set(current.pos, local_38); @@ -2704,7 +2704,7 @@ BOOL daShip_c::procStartModeWarp() { cXyz local_30; daTornado_c* tornado = (daTornado_c*)fopAcM_SearchByID(mTactWarpID); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); shape_angle.y += m03A6; current.angle.y = shape_angle.y; if (tornado) { @@ -2864,7 +2864,7 @@ BOOL daShip_c::procWhirlDown_init() { speed.y = 0.0f; onStateFlg(daSFLG_FLY_e); onStateFlg(daSFLG_UNK1000_e); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stop(); cXyz local_38(mWhirlActor->current.pos.x, mWhirlActor->current.pos.y + 2500.0f, mWhirlActor->current.pos.z + 4000.0f); camera->mCamera.Set(mWhirlActor->current.pos, local_38); @@ -2909,7 +2909,7 @@ BOOL daShip_c::procStartModeThrow_init() { setPartOffAnime(); } m03A6 = l_HIO.throw_return_angle_speed; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stop(); cXyz local_38(current.pos.x + cM_scos(current.angle.y) * 300.0f, m03F4 + 150.0f, @@ -2926,7 +2926,7 @@ BOOL daShip_c::procStartModeThrow() { GXColor amb; GXColor diff; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); shape_angle.y += m03A6; camera->mCamera.Set(current.pos, camera->mCamera.Eye()); if (m037A == 0) { diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index e97b0322b..0968dc1b5 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -910,7 +910,7 @@ void Act_c::set_senv(int arg1, int arg2) const { /* 00003124-0000315C .text cam_lockoff__Q27daStone5Act_cCFv */ void Act_c::cam_lockoff() const { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); camera->mCamera.ForceLockOff(base.base.mBsPcId); } diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index 5dc641adc..9d6506f4e 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -479,7 +479,7 @@ void Act_c::set_senv(int arg1, int arg2) const { /* 00001B7C-00001BB4 .text cam_lockoff__Q28daStone25Act_cCFv */ void Act_c::cam_lockoff() const { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); camera->mCamera.ForceLockOff(base.base.mBsPcId); } diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index 50354536a..19a9820db 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -2564,7 +2564,7 @@ static void demo_camera(tn_class* i_this) { camera->SetTrimSize(1); i_this->m14F8 = 0x33; - camera_class* r3 = dComIfGp_getCamera(0); + camera_process_class* r3 = dComIfGp_getCamera(0); i_this->mCameraEyePos = r3->mLookat.mEye; i_this->mCenterPos = r3->mLookat.mCenter; i_this->m1514 = 55.0f; diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index ad541afbc..29965a825 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -88,7 +88,7 @@ static J3DZModeInfo l_zmodeInfo = { GX_FALSE, GX_LEQUAL, GX_FALSE }; /* 8015EC30-8015F368 .text daVrbox2_color_set__FP12vrbox2_class */ BOOL daVrbox2_color_set(vrbox2_class* i_this) { - camera_class * pCamera; + camera_process_class * pCamera; cXyz eyePosXZ; cXyz centerPosXZ; cXyz lookDirXZ; @@ -110,7 +110,7 @@ BOOL daVrbox2_color_set(vrbox2_class* i_this) { return TRUE; } - pCamera = (camera_class*)dComIfGp_getCamera(0); + pCamera = (camera_process_class*)dComIfGp_getCamera(0); windVec = dKyw_get_wind_vec(); windPow = dKyw_get_wind_pow(); windNrmVec = *windVec; diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp index 3b46748ef..0887317ec 100644 --- a/src/d/actor/d_a_warpfout.cpp +++ b/src/d/actor/d_a_warpfout.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_warpfout.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" +#include "f_op/f_op_camera.h" static daWarpfout_c::EventActionInitFunc event_init_tbl[] = { &daWarpfout_c::initWarp1, &daWarpfout_c::initWarp2, &daWarpfout_c::initWarp3, diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index c9b361d20..142e0a32d 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -259,7 +259,7 @@ void daWindTag_c::set_wind_se_sub(u32, cXyz* pos) { /* 00001044-000011CC .text set_wind_se__Q29daWindTag11daWindTag_cFv */ void daWindTag_c::set_wind_se() { f32 radius = scale.x * mData[mType * 2]; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); lookat_class* lookat = &camera->mLookat; cM3dGCps cps; diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 82742ae89..9c6db6687 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -224,7 +224,7 @@ static BOOL daYkgrExecute(void* v_this) { } void daYkgr_c::set_mtx() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); current.pos = *fopCamM_GetEye_p(camera); current.angle.y = fopCamM_GetAngleY(camera); current.angle.x = fopCamM_GetAngleX(camera); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 830d9745a..62829ebbe 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -5315,22 +5315,22 @@ bool dCamera_c::ScopeViewMsgModeOff() { /* 8017BD90-8017BD9C .text dCam_isManual__FP12camera_class */ bool dCam_isManual(camera_class* i_this) { - return i_this->mCamera.chkFlag(0x20); + return ((camera_process_class*)i_this)->mCamera.chkFlag(0x20); } /* 8017BD9C-8017BDC0 .text dCam_getAngleY__FP12camera_class */ s16 dCam_getAngleY(camera_class* i_this) { - return i_this->mCamera.mDirection.U().Inv(); + return ((camera_process_class*)i_this)->mCamera.mDirection.U().Inv(); } /* 8017BDC0-8017BDC8 .text dCam_getAngleX__FP12camera_class */ s16 dCam_getAngleX(camera_class* i_this) { - return i_this->mCamera.mDirection.V(); + return ((camera_process_class*)i_this)->mCamera.mDirection.V(); } /* 8017BDC8-8017BDEC .text dCam_getControledAngleY__FP12camera_class */ s16 dCam_getControledAngleY(camera_class* i_this) { - return i_this->mCamera.U2(); + return ((camera_process_class*)i_this)->mCamera.U2(); } /* 8017BDEC-8017BDFC .text dCam_getCamera__Fv */ @@ -5340,13 +5340,15 @@ camera_class* dCam_getCamera() { /* 8017BDFC-8017BE20 .text dCam_getBody__Fv */ dCamera_c* dCam_getBody() { - return &dCam_getCamera()->mCamera; + camera_process_class* camera = (camera_process_class*)dCam_getCamera(); + return &camera->mCamera; } /* 8017BE20-8017BEB0 .text preparation__FP20camera_process_class */ static void preparation(camera_process_class* i_this) { + camera_process_class* process = i_this; camera_class* a_this = (camera_class*)i_this; - dCamera_c* camera = &a_this->mCamera; + dCamera_c* camera = &i_this->mCamera; int camera_id = get_camera_id(a_this); @@ -5355,7 +5357,7 @@ static void preparation(camera_process_class* i_this) { f32 aspect = (4.0f/3.0f) * fapGmHIO_getAspectRatio(); camera->SetWindow(viewport->mWidth, viewport->mHeight); - fopCamM_SetAspect(a_this, aspect); + fopCamM_SetAspect(i_this, aspect); dComIfGp_offCameraAttentionStatus(camera_id, dCamAttnStts_00000001_e | dCamAttnStts_SUBJECT_e | dCamAttnStts_00000020_e); } @@ -5390,18 +5392,19 @@ static void view_setup(camera_process_class* i_this) { /* 8017BFAC-8017C29C .text store__FP20camera_process_class */ static void store(camera_process_class* i_this) { /* Nonmatching */ - camera_class* a_this = (camera_class*)i_this; - dCamera_c* body = &((camera_class*)i_this)->mCamera; + camera_process_class* process = (camera_process_class*)i_this; + camera_class* camera = (camera_class*)i_this; + dCamera_c* body = &((camera_process_class*)i_this)->mCamera; - int camera_id = get_camera_id(a_this); + int camera_id = get_camera_id(camera); dStage_dt_c* stage = &dComIfGp_getStage(); - cXyz oldCenter = *fopCamM_GetCenter_p(a_this); - cXyz oldEye = *fopCamM_GetEye_p(a_this); - cXyz oldUp = *fopCamM_GetUp_p(a_this); - cSAngle bank = fopCamM_GetBank(a_this); - f32 fovy = fopCamM_GetFovy(a_this); + cXyz oldCenter = *fopCamM_GetCenter_p(camera); + cXyz oldEye = *fopCamM_GetEye_p(camera); + cXyz oldUp = *fopCamM_GetUp_p(camera); + cSAngle bank = fopCamM_GetBank(camera); + f32 fovy = fopCamM_GetFovy(camera); dDemo_camera_c* demoCamera = dComIfGp_demo_getCamera(); @@ -5436,52 +5439,50 @@ static void store(camera_process_class* i_this) { } } - fopCamM_SetCenter(a_this, oldCenter.x, oldCenter.y, oldCenter.z); - fopCamM_SetEye(a_this, oldEye.x, oldEye.y, oldEye.z); - fopCamM_SetUp(a_this, oldUp.x, oldUp.y, oldUp.z); - fopCamM_SetBank(a_this, bank); - fopCamM_SetFovy(a_this, fovy); + fopCamM_SetCenter(camera, oldCenter.x, oldCenter.y, oldCenter.z); + fopCamM_SetEye(camera, oldEye.x, oldEye.y, oldEye.z); + fopCamM_SetUp(camera, oldUp.x, oldUp.y, oldUp.z); + fopCamM_SetBank(camera, bank); + fopCamM_SetFovy(camera, fovy); if (dComIfGp_checkCameraAttentionStatus(camera_id, dCamAttnStts_TELESCOPE_LOOK_e)) { - fopCamM_SetNear(a_this, 30.0f); + fopCamM_SetNear(camera, 30.0f); } else { if (stage) { - fopCamM_SetNear(a_this, dComIfGp_getStageStagInfo()->mNearPlane); + fopCamM_SetNear(camera, dComIfGp_getStageStagInfo()->mNearPlane); } } if (stage) { - fopCamM_SetFar(a_this, dComIfGp_getStageStagInfo()->mFarPlane); + fopCamM_SetFar(camera, dComIfGp_getStageStagInfo()->mFarPlane); } - fopCamM_SetAngleY(a_this, body->mDirection.U().Inv()); - fopCamM_SetAngleX(a_this, body->mDirection.V()); + fopCamM_SetAngleY(camera, body->mDirection.U().Inv()); + fopCamM_SetAngleX(camera, body->mDirection.V()); return; } /* 8017C29C-8017C350 .text camera_execute__FP20camera_process_class */ static int camera_execute(camera_process_class* i_this) { - camera_class* a_this = (camera_class*)i_this; - preparation(i_this); if (dComIfGp_demo_getCamera()) { - a_this->mCamera.ResetView(); + i_this->mCamera.ResetView(); } if (!dComIfGp_evmng_cameraPlay()) { mDoGph_gInf_c::onAutoForcus(); } - if (a_this->mCamera.Active() && !a_this->mCamera.Pause()) { - a_this->mCamera.Run(); + if (i_this->mCamera.Active() && !i_this->mCamera.Pause()) { + i_this->mCamera.Run(); } else { - a_this->mCamera.NotRun(); + i_this->mCamera.NotRun(); } - a_this->mCamera.CalcTrimSize(); + i_this->mCamera.CalcTrimSize(); store(i_this); @@ -5493,7 +5494,7 @@ static int camera_execute(camera_process_class* i_this) { /* 8017C350-8017C72C .text camera_draw__FP20camera_process_class */ static bool camera_draw(camera_process_class* i_this) { camera_class* a_this = (camera_class*)i_this; - dCamera_c* body = &((camera_class*)i_this)->mCamera; + dCamera_c* body = &((camera_process_class*)i_this)->mCamera; dDlst_window_c* window = get_window(a_this); view_port_class* viewport = window->getViewPort(); @@ -5576,8 +5577,8 @@ static cPhs_State init_phase1(camera_class* i_this) { /* 8017C7E4-8017C980 .text init_phase2__FP12camera_class */ static cPhs_State init_phase2(camera_class* i_this) { - camera_process_class* a_this = (camera_process_class*)i_this; - dCamera_c* body = &i_this->mCamera; + camera_process_class* camera = (camera_process_class*)i_this; + dCamera_c* body = &camera->mCamera; int camera_id = get_camera_id(i_this); fopAc_ac_c* player = (fopAc_ac_c*)get_player_actor(i_this); @@ -5610,9 +5611,9 @@ static cPhs_State init_phase2(camera_class* i_this) { fopCamM_SetCenter(i_this, player->current.pos.x, player->current.pos.y, player->current.pos.z); fopCamM_SetBank(i_this, 0); - store(i_this); + store(camera); - view_setup(i_this); + view_setup(camera); return cPhs_NEXT_e; } @@ -5625,13 +5626,14 @@ static cPhs_State camera_create(camera_class* i_this) { (request_of_phase_process_fn)NULL, }; - return dComLbG_PhaseHandler(&i_this->phase_request, l_method, i_this); + camera_process_class* camera = (camera_process_class*)i_this; + return dComLbG_PhaseHandler(&camera->phase_request, l_method, i_this); } /* 8017C9B0-8017C9DC .text camera_delete__FP20camera_process_class */ static bool camera_delete(camera_process_class* i_this) { /* Nonmatching - fakematch, instruction swap */ - dCamera_c* camera = &((camera_class*)i_this)->mCamera; + dCamera_c* camera = &i_this->mCamera; camera->~dCamera_c(); return TRUE; } @@ -5696,7 +5698,7 @@ camera_process_profile_definition g_profile_CAMERA = { /* List Prio */ fpcPi_CURRENT_e, /* Proc Name */ fpcNm_CAMERA_e, /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(camera_class), + /* Size */ sizeof(camera_process_class), /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopVw_Method, @@ -5717,7 +5719,7 @@ camera_process_profile_definition g_profile_CAMERA2 = { /* List Prio */ fpcPi_CURRENT_e, /* Proc Name */ fpcNm_CAMERA2_e, /* Proc SubMtd */ &g_fpcLf_Method.base, - /* Size */ sizeof(camera_class), + /* Size */ sizeof(camera_process_class), /* Size Other */ 0, /* Parameters */ 0, /* Leaf SubMtd */ &g_fopVw_Method, diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index f3ca0a87c..233b50efc 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -267,7 +267,7 @@ void dDemo_actor_c::JSGSetTextureAnimationFrame(f32 v) { } /* 80069D10-80069D44 .text getView__Fv */ -camera_class* getView() { +camera_process_class* getView() { if (dComIfGp_getWindowNum() == 0) return NULL; @@ -276,7 +276,7 @@ camera_class* getView() { /* 80069D44-80069D78 .text JSGGetProjectionNear__14dDemo_camera_cCFv */ f32 dDemo_camera_c::JSGGetProjectionNear() const { - camera_class* view = getView(); + camera_process_class* view = getView(); if (view == NULL) return 0.0f; return view->mNear; @@ -290,7 +290,7 @@ void dDemo_camera_c::JSGSetProjectionNear(f32 v) { /* 80069D8C-80069DC0 .text JSGGetProjectionFar__14dDemo_camera_cCFv */ f32 dDemo_camera_c::JSGGetProjectionFar() const { - camera_class* view = getView(); + camera_process_class* view = getView(); if (view == NULL) return 1.0f; return view->mFar; @@ -304,7 +304,7 @@ void dDemo_camera_c::JSGSetProjectionFar(f32 v) { /* 80069DD4-80069E08 .text JSGGetProjectionFovy__14dDemo_camera_cCFv */ f32 dDemo_camera_c::JSGGetProjectionFovy() const { - camera_class* view = getView(); + camera_process_class* view = getView(); if (view == NULL) return 60.0f; return view->mFovy; @@ -318,7 +318,7 @@ void dDemo_camera_c::JSGSetProjectionFovy(f32 v) { /* 80069E1C-80069E50 .text JSGGetProjectionAspect__14dDemo_camera_cCFv */ f32 dDemo_camera_c::JSGGetProjectionAspect() const { - camera_class* view = getView(); + camera_process_class* view = getView(); if (view == NULL) return (4.0f/3.0f); return view->mAspect; @@ -332,7 +332,7 @@ void dDemo_camera_c::JSGSetProjectionAspect(f32 v) { /* 80069E64-80069EC0 .text JSGGetViewPosition__14dDemo_camera_cCFP3Vec */ void dDemo_camera_c::JSGGetViewPosition(Vec* dst) const { - camera_class* view = getView(); + camera_process_class* view = getView(); if (view == NULL) { dst->x = 0.0f; dst->y = 0.0f; @@ -349,7 +349,7 @@ void dDemo_camera_c::JSGSetViewPosition(const Vec& v) { /* 80069EE8-80069F48 .text JSGGetViewUpVector__14dDemo_camera_cCFP3Vec */ void dDemo_camera_c::JSGGetViewUpVector(Vec* dst) const { - camera_class* view = getView(); + camera_process_class* view = getView(); if (view == NULL) { dst->x = 0.0f; dst->y = 1.0f; @@ -366,7 +366,7 @@ void dDemo_camera_c::JSGSetViewUpVector(const Vec& v) { /* 80069F70-80069FD0 .text JSGGetViewTargetPosition__14dDemo_camera_cCFP3Vec */ void dDemo_camera_c::JSGGetViewTargetPosition(Vec* dst) const { - camera_class* view = getView(); + camera_process_class* view = getView(); if (view == NULL) { dst->x = 0.0f; dst->y = 0.0f; @@ -383,7 +383,7 @@ void dDemo_camera_c::JSGSetViewTargetPosition(const Vec& v) { /* 80069FF8-8006A050 .text JSGGetViewRoll__14dDemo_camera_cCFv */ f32 dDemo_camera_c::JSGGetViewRoll() const { - camera_class* view = getView(); + camera_process_class* view = getView(); if (view == NULL) return 0.0f; return cM_sht2d(view->mBank); diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 9dff92312..759280098 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -580,7 +580,7 @@ void dScnKy_env_light_c::SetSchbit() { /* 80190ACC-80190C0C .text setSunpos__18dScnKy_env_light_cFv */ void dScnKy_env_light_c::setSunpos() { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz sp8; f32 var_f1; @@ -2470,7 +2470,7 @@ void dKy_setLight_init() { /* 80194BDC-8019514C .text dKy_setLight__Fv */ void dKy_setLight() { dScnKy_env_light_c& envLight = dKy_getEnvlight(); - camera_class* pCamera = dComIfGp_getCamera(0); + camera_process_class* pCamera = dComIfGp_getCamera(0); fopAc_ac_c* pPlayer = dComIfGp_getPlayer(0); cXyz camfwd; MtxP viewMtx = j3dSys.getViewMtx(); @@ -2906,7 +2906,7 @@ void dKy_Itemgetcol_chg_off() { /* 80195F84-80196284 .text dKy_Itemgetcol_chg_move__Fv */ void dKy_Itemgetcol_chg_move() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); dScnKy_env_light_c& envLight = dKy_getEnvlight(); fopAc_ac_c* player = dComIfGp_getPlayer(0); @@ -3178,7 +3178,7 @@ void dKy_Sound_init() { /* 801967F4-801969A8 .text dKy_Sound_set__F4cXyziUii */ void dKy_Sound_set(cXyz pos, int p2, fpc_ProcID p3, int p4) { - camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(0); BOOL ret = FALSE; f32 newDist = pos.abs(camera->mLookat.mEye); diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 96d3dea0a..2012c230a 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -106,7 +106,7 @@ void dKyr_set_btitex(GXTexObj* i_obj, ResTIMG* i_img) { /* 8008AE54-8008B44C .text dKyr_kamome_move__Fv */ void dKyr_kamome_move() { WINDEFF_SET* pWind = dKy_getEnvlight().mpWind; - camera_class* pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* pCamera = (camera_process_class*)dComIfGp_getCamera(0); dKyw_get_wind_vec(); @@ -240,7 +240,7 @@ void dKyr_wind_move() { /* Nonmatching */ dScnKy_env_light_c& envLight = dKy_getEnvlight(); WINDEFF_SET* pWind = envLight.mpWind; - camera_class* pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* pCamera = (camera_process_class*)dComIfGp_getCamera(0); cXyz* pWindVec = dKyw_get_wind_vec(); f32 windPow = dKyw_get_wind_pow(); fopAc_ac_c* pPlayer = dComIfGp_getPlayer(0); @@ -470,7 +470,7 @@ void dKyr_wind_move() { void dKyr_lenzflare_move() { dKankyo_sun_Packet* pSunPkt = g_env_light.mpSunPacket; dKankyo_sunlenz_Packet* pLenzPkt = g_env_light.mpSunlenzPacket; - camera_class* pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* pCamera = (camera_process_class*)dComIfGp_getCamera(0); if (pSunPkt->mVisibility < 0.0001f) return; @@ -522,10 +522,10 @@ BOOL dKyr_moon_arrival_check() { /* 8008C8B8-8008CF68 .text dKyr_sun_move__Fv */ void dKyr_sun_move() { - camera_class* pCamera; + camera_process_class* pCamera; dKankyo_sun_Packet* pSunPkt = dKy_getEnvlight().mpSunPacket; dKankyo_sunlenz_Packet* pLenzPkt = dKy_getEnvlight().mpSunlenzPacket; - pCamera = (camera_class*)dComIfGp_getCamera(0); + pCamera = (camera_process_class*)dComIfGp_getCamera(0); f32 pulsePos; f32 staringAtSunAmount = 0.0f; @@ -690,7 +690,7 @@ void dKyr_sun_move() { /* 8008CF68-8008D0B4 .text dKyr_rain_init__Fv */ void dKyr_rain_init() { - camera_class * pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class * pCamera = (camera_process_class*)dComIfGp_getCamera(0); g_env_light.mpRainPacket->mpTxSnow01 = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_I8_TX_SNOW01_e); g_env_light.mpRainPacket->mpTxRingAHalf = (u8*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_TXA_RING_A_32HAFE_e); g_env_light.mpRainPacket->mCamEyePos = pCamera->mLookat.mEye; @@ -717,7 +717,7 @@ void rain_bg_chk(dKankyo_rain_Packet* pPkt, int idx) { /* 8008D0DC-8008D53C .text overhead_bg_chk__Fv */ bool overhead_bg_chk() { - camera_class* pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* pCamera = (camera_process_class*)dComIfGp_getCamera(0); bool ret = false; dBgS_ObjGndChk_All gndChk; @@ -739,7 +739,7 @@ bool overhead_bg_chk() { /* 8008D638-8008DAF0 .text forward_overhead_bg_chk__FP4cXyzf */ bool forward_overhead_bg_chk(cXyz* pPos, f32 dist) { - camera_class* pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* pCamera = (camera_process_class*)dComIfGp_getCamera(0); bool ret = false; dBgS_ObjGndChk_All gndChk; @@ -769,10 +769,10 @@ bool forward_overhead_bg_chk(cXyz* pPos, f32 dist) { /* 8008DAF0-8008E79C .text dKyr_rain_move__Fv */ void dKyr_rain_move() { dKankyo_rain_Packet* rain_packet; - camera_class* camera; + camera_process_class* camera; rain_packet = g_env_light.mpRainPacket; - camera = (camera_class*)dComIfGp_getCamera(0); + camera = (camera_process_class*)dComIfGp_getCamera(0); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz spFC; cXyz spF0; @@ -1063,7 +1063,7 @@ void dKyr_housi_move() { /* Nonmatching */ dKankyo_housi_Packet* housi_packet = g_env_light.mpHousiPacket; HOUSI_EFF* effect; - camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(0); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz sp84; @@ -1229,7 +1229,7 @@ void dKyr_housi_move() { /* 8008F0BC-8008F23C .text dKyr_snow_init__Fv */ void dKyr_snow_init() { - camera_class* pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* pCamera = (camera_process_class*)dComIfGp_getCamera(0); g_env_light.mpSnowPacket = new(0x20) dKankyo_snow_Packet(); if (g_env_light.mpSnowPacket != NULL) { if (strcmp(dComIfGp_getStartStageName(), "Adanmae") != 0) { @@ -1290,7 +1290,7 @@ void wave_move() { fopAc_ac_c* pPlayer; cXyz* windVecP; dKankyo_wave_Packet* pPkt; - camera_class* pCamera; + camera_process_class* pCamera; f32 seaLevel; cXyz newPos2; cXyz eyevect; @@ -1314,7 +1314,7 @@ void wave_move() { fili_p = NULL; pPkt = g_env_light.mpWavePacket; - pCamera = (camera_class*)dComIfGp_getCamera(0); + pCamera = (camera_process_class*)dComIfGp_getCamera(0); pPlayer = dComIfGp_getPlayer(0); roomNo = dComIfGp_roomControl_getStayNo(); @@ -1529,7 +1529,7 @@ void wave_move() { void cloud_shadow_move() { /* Nonmatching */ dKankyo_cloud_Packet* pPkt = dKy_getEnvlight().mpMoyaPacket; - camera_class* pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* pCamera = (camera_process_class*)dComIfGp_getCamera(0); Mtx camMtx; cXyz windVecPow = dKyw_get_wind_vecpow(); cXyz center; @@ -1782,7 +1782,7 @@ void dKy_wave_chan_init() { /* 80094144-8009428C .text snap_sunmoon_proc__FP4cXyzi */ void snap_sunmoon_proc(cXyz* pPos, int type) { dSnap_Obj snapObj; - camera_class * pCamera = dComIfGp_getCamera(0); + camera_process_class * pCamera = dComIfGp_getCamera(0); if (dComIfGp_checkPlayerStatus1(0, daPyStts1_PICTO_BOX_AIM_e)) { cXyz pos; @@ -1812,7 +1812,7 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* pPos, GXColor& reg0, u8** pImg) { /* Nonmatching */ dKankyo_sun_Packet* pSunPkt; dKankyo_sunlenz_Packet* pSunlenzPkt; - camera_class* pCamera; + camera_process_class* pCamera; cXyz pos[4]; cXyz sunPos; cXyz moonPos2; @@ -2123,7 +2123,7 @@ void dKyr_drawLenzflare(Mtx drawMtx, cXyz* pPos, GXColor& color, u8** pImg) { /* Nonmatching */ dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunlenzPacket; dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket; - camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(0); Mtx camMtx; Mtx rotMtx; @@ -2451,7 +2451,7 @@ void dKyr_drawLenzflare(Mtx drawMtx, cXyz* pPos, GXColor& color, u8** pImg) { void dKyr_drawRain(Mtx drawMtx, u8** pImg) { /* Nonmatching */ dKankyo_rain_Packet* pPkt = g_env_light.mpRainPacket; - camera_class* pCamera = dComIfGp_getCamera(0); + camera_process_class* pCamera = dComIfGp_getCamera(0); Mtx camMtx; cXyz pos[4]; @@ -2608,7 +2608,7 @@ void dKyr_drawRain(Mtx drawMtx, u8** pImg) { /* 8009682C-80096D18 .text dKyr_drawSibuki__FPA4_fPPUc */ void dKyr_drawSibuki(Mtx drawMtx, u8** pImg) { - camera_class *pCamera = dComIfGp_getCamera(0); + camera_process_class *pCamera = dComIfGp_getCamera(0); dKankyo_rain_Packet * pPkt = g_env_light.mpRainPacket; if (g_env_light.mSnowCount == 0 && dComIfGd_getView() != NULL) { @@ -3066,7 +3066,7 @@ void dKyr_drawStar(Mtx drawMtx, u8** pImg) { /* Nonmatching */ dScnKy_env_light_c* envlight = &dKy_getEnvlight(); dKankyo_star_Packet* star_packet = g_env_light.mpStarPacket; - camera_class* camera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(0); static u32 rot = 0; @@ -3281,7 +3281,7 @@ void dKyr_drawStar(Mtx drawMtx, u8** pImg) { void drawWave(Mtx drawMtx, u8** pImg) { /* Nonmatching */ dKankyo_wave_Packet* pPkt; - camera_class* pCamera; + camera_process_class* pCamera; GXTexObj texObj; Mtx camMtx; Mtx rotMtx; @@ -3433,7 +3433,7 @@ void drawWave(Mtx drawMtx, u8** pImg) { /* 8009A5D4-8009AB88 .text drawCloudShadow__FPA4_fPPUc */ void drawCloudShadow(Mtx drawMtx, u8** pImg) { dScnKy_env_light_c& envLight = dKy_getEnvlight(); - camera_class *pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class *pCamera = (camera_process_class*)dComIfGp_getCamera(0); dKankyo_cloud_Packet* pPkt = g_env_light.mpMoyaPacket; static f32 rot = 0.0f; GXTexObj texObj; @@ -3589,7 +3589,7 @@ void dKyr_thunder_init() { /* 8009B9D8-8009BDEC .text dKyr_thunder_move__Fv */ void dKyr_thunder_move() { EF_THUNDER * pThunder = &g_env_light.mThunderEff; - camera_class * pCamera = dComIfGp_getCamera(0); + camera_process_class * pCamera = dComIfGp_getCamera(0); switch (pThunder->mState) { case 0: diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 6c65810d5..3178efa85 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -762,7 +762,7 @@ void wether_move_moya() { /* 800891A8-80089698 .text wether_move_vrkumo__Fv */ void wether_move_vrkumo() { - camera_process_class* camera_p = dComIfGp_getCamera(0); + camera_class* camera_p = dComIfGp_getCamera(0); static cXyz r09o(-180000.0f, 750.0f, -200000.0f); if (strcmp(dComIfGp_getStartStageName(), "Name") != 0) { diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 6229364ca..faddf5aee 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -110,7 +110,7 @@ static cPhs_State dThunder_Create(kankyo_class* i_ky) { /* 80198BC4-801990CC .text create__10dThunder_cFv */ cPhs_State dThunder_c::create() { dScnKy_env_light_c& envLight = dKy_getEnvlight(); - camera_class *pCamera = (camera_class*)dComIfGp_getCamera(0); + camera_process_class *pCamera = (camera_process_class*)dComIfGp_getCamera(0); new (this) dThunder_c(); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BDL_YTHDR00_e); diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 49d1c4010..f8efefaa1 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -49,7 +49,7 @@ void menu_vrbox_set() { stage_vrbox_info_class* vrbox0; stage_vrbox_info_class* vrbox1; - camera_class * pCamera = dComIfGp_getCamera(0); + camera_process_class * pCamera = dComIfGp_getCamera(0); pCamera->mLookat.mEye.x = 9377.0f; pCamera->mLookat.mEye.y = 0.0f; diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index 92d554446..1551bf1c5 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -21,6 +21,7 @@ #include "d/actor/d_a_player_main.h" #include "d/d_s_play.h" #include "f_op/f_op_overlap_mng.h" +#include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_hostIO.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_picture_box.cpp b/src/d/d_picture_box.cpp index 0b6534452..0c1277f37 100644 --- a/src/d/d_picture_box.cpp +++ b/src/d/d_picture_box.cpp @@ -988,7 +988,7 @@ void dJle_Pb_c::shutterChange() { /* 80228650-80228788 .text moveCamera__9dJle_Pb_cFv */ void dJle_Pb_c::moveCamera() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (mModeSubState == PB_SUB_CONFIRM_e) { camera->mCamera.Stay(); diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 2bdc40d06..2d11a790c 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -145,7 +145,7 @@ cPhs_State dScnName_c::create() { g_snHIO.mNo = mDoHIO_root.m_subroot.createChild("名前登録シーン", &g_snHIO); dComIfGp_setWindowNum(1); dComIfGp_setWindow(0, 0.0f, 0.0f, mDoMch_render_c::getFbWidth(), mDoMch_render_c::getEfbHeight(), 0.0f, 1.0f, 0, 2); - g_dComIfG_gameInfo.play.mCameraInfo[0].mpCamera = (camera_class*)&field_0x1d4; + dComIfGp_setCamera(0, (camera_class*)&field_0x1d4); field_0x29c = 5.0f; field_0x2a0 = 160000.0f; field_0x2a4 = 60.0f; diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index dc11f3213..2fd6ba210 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -1116,7 +1116,7 @@ void dScp_moveProc(sub_scp_class* i_Scp) { /* 8023A9AC-8023AAD0 .text dScp_demoProc__FP13sub_scp_class */ void dScp_demoProc(sub_scp_class* i_Scp) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); f32 max = g_meterHIO.mScopeWipeMaxScale; if (dComIfGp_getScopeMesgStatus() != fopMsgStts_SCOPE_WAIT_e) { diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index 52eec53fa..7082486cc 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -911,7 +911,7 @@ BOOL ShopCam_action_c::shop_cam_action_init() { /* 8005F088-8005F220 .text shop_cam_action__16ShopCam_action_cFv */ int ShopCam_action_c::shop_cam_action() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stay(); camera->mCamera.SetTrimSize(1); cXyz r1_2C; @@ -958,7 +958,7 @@ BOOL ShopCam_action_c::rsh_talk_cam_action_init(fopAc_ac_c* param_1, cXyz param_ /* 8005F370-8005F41C .text rsh_talk_cam_action__16ShopCam_action_cFv */ int ShopCam_action_c::rsh_talk_cam_action() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stay(); camera->mCamera.SetTrimSize(1); camera->mCamera.Set(m18, m24, m30, 0); @@ -980,7 +980,7 @@ BOOL ShopCam_action_c::ds_normal_cam_action_init() { /* 8005F494-8005F570 .text ds_normal_cam_action__16ShopCam_action_cFv */ int ShopCam_action_c::ds_normal_cam_action() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stay(); camera->mCamera.SetTrimSize(1); @@ -994,7 +994,7 @@ int ShopCam_action_c::ds_normal_cam_action() { /* 8005F570-8005F5C0 .text Save__16ShopCam_action_cFv */ void ShopCam_action_c::Save() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera) { mOrigCenter = *fopCamM_GetCenter_p(camera); mOrigEye = *fopCamM_GetEye_p(camera); @@ -1004,7 +1004,7 @@ void ShopCam_action_c::Save() { /* 8005F5C0-8005F6C4 .text Reset__16ShopCam_action_cFv */ void ShopCam_action_c::Reset() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mOrigCenter, mOrigEye, mOrigFovy, 0); camera->mCamera.Stay(); camera->mCamera.Reset(mOrigCenter, mOrigEye, mOrigFovy, 0); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 730c82a5d..54eca2bdd 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1379,7 +1379,7 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_this) { /* 80027ED8-800281D8 .text fopAcM_viewCutoffCheck__FP10fopAc_ac_cf */ BOOL fopAcM_viewCutoffCheck(fopAc_ac_c* actor, f32 param_2) { if (param_2 > 0.0f) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz delta = (camera->mLookat.mEye - actor->eyePos); if (delta.abs() > param_2) { dBgS_LinChk linChk; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 0082b8af9..f6feafb31 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -1612,7 +1612,7 @@ bool mDoGph_Painter() { if (dComIfGp_getWindowNum() != 0) { dDlst_window_c* window = dComIfGp_getWindow(0); s32 cameraID = window->getCameraID(); - camera_class* camera = (camera_class*)dComIfGp_getCamera(cameraID); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(cameraID); if (camera != NULL) { dComIfGd_imageDrawShadow(camera->mViewMtx);