diff --git a/configure.py b/configure.py index 210dc3f14d..12860d0c1b 100755 --- a/configure.py +++ b/configure.py @@ -524,18 +524,31 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict } # Helper function for REL script objects -def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]: - return { - "lib": lib_name, - "mw_version": MWVersion(config.version), - "cflags": [*cflags_rel], - "progress_category": "game", - "objects": objects, - } +def Rel(lib_name: str, objects: List[Object], isInDol=False) -> Dict[str, Any]: + if (config.version == "ShieldD") and isInDol: + # For Shield Debug version, some RELs were moved into the DOL + return { + "lib": lib_name, + "mw_version": MWVersion(config.version), + "cflags": [*cflags_framework, "-D__FORCE_REL_IN_DOL__=1"], + "progress_category": "game", + "objects": objects, + } + else: + return { + "lib": lib_name, + "mw_version": MWVersion(config.version), + "cflags": [*cflags_rel], + "progress_category": "game", + "objects": objects, + } # Helper function for actor RELs -def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[str, Any]: - return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags, scratch_preset_id=70)]) +def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[], isInDol=False) -> Dict[str, Any]: + if isInDol: + return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags, scratch_preset_id=70)], True) + else: + return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags, scratch_preset_id=70)]) # Helper function for JSystem libraries @@ -2228,7 +2241,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_tag_allmato"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_camera"), # debug extra weak fns ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chkpoint"), # debug weak func order - ActorRel(MatchingFor(ALL_GCN), "d_a_tag_event"), # TODO: this is part of Rframework in ShieldD + ActorRel(MatchingFor(ALL_GCN), "d_a_tag_event", [], True), # TODO: this is part of Rframework in ShieldD ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evt"), # debug extra weak fns ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtarea"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtmsg"), # debug weak func order @@ -2236,7 +2249,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_tag_kmsg"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lantern"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mist"), # debug weak func order - ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg"), # TODO: this is part of Rframework in ShieldD + ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg", [], True), # TODO: this is part of Rframework in ShieldD ActorRel(MatchingFor(ALL_GCN), "d_a_tag_push"), # debug weak func order ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_telop"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tbox"), @@ -2257,7 +2270,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_suspend"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_attention"), ActorRel(MatchingFor(ALL_GCN), "d_a_alldie"), - ActorRel(MatchingFor(ALL_GCN), "d_a_andsw2"), + ActorRel(MatchingFor(ALL_GCN), "d_a_andsw2", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_bd"), ActorRel(MatchingFor(ALL_GCN), "d_a_canoe"), ActorRel(MatchingFor(ALL_GCN), "d_a_cstaF"), @@ -2271,7 +2284,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_e_rd"), ActorRel(MatchingFor(ALL_GCN), "d_a_econt"), ActorRel(MatchingFor(ALL_GCN), "d_a_fr"), - ActorRel(MatchingFor(ALL_GCN), "d_a_grass"), + ActorRel(MatchingFor(ALL_GCN), "d_a_grass", [], True), ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_kytag05"), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag10"), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag11"), @@ -2316,9 +2329,9 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_obj_swpush5"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_yobikusa"), ActorRel(MatchingFor(ALL_GCN), "d_a_scene_exit2"), - ActorRel(MatchingFor(ALL_GCN), "d_a_shop_item"), + ActorRel(MatchingFor(ALL_GCN), "d_a_shop_item", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_sq"), - ActorRel(MatchingFor(ALL_GCN), "d_a_swc00"), + ActorRel(MatchingFor(ALL_GCN), "d_a_swc00", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_CstaSw"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ajnot"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_attack_item"), # debug weak func order @@ -2464,7 +2477,7 @@ config.libs = [ ActorRel(Equivalent, "d_a_hozelda"), # weak func order (J3DMtxCalcNoAnm) ActorRel(MatchingFor(ALL_GCN), "d_a_izumi_gate"), ActorRel(MatchingFor(ALL_GCN), "d_a_kago"), - ActorRel(MatchingFor(ALL_GCN), "d_a_kytag01"), + ActorRel(MatchingFor(ALL_GCN), "d_a_kytag01", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag02"), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag03"), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag06"), @@ -2534,7 +2547,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_npc_lf"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_lud"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_midp"), - ActorRel(MatchingFor(ALL_GCN, ALL_SHIELD), "d_a_npc_mk"), + ActorRel(MatchingFor(ALL_GCN, ALL_SHIELD), "d_a_npc_mk", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moi"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moir"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_myna2"), @@ -2682,7 +2695,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_obj_iceblock"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_iceleaf"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_ihasi"), - ActorRel(MatchingFor(ALL_GCN), "d_a_obj_ikada"), + ActorRel(MatchingFor(ALL_GCN), "d_a_obj_ikada", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_inobone"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_ita"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_itamato"), @@ -2954,7 +2967,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_tag_yami"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_talk"), ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tboxSw"), - ActorRel(MatchingFor(ALL_GCN), "d_a_title"), + ActorRel(MatchingFor(ALL_GCN), "d_a_title", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_warp_bug"), ] diff --git a/include/d/actor/d_a_title.h b/include/d/actor/d_a_title.h index 2e498c8d2e..465fe689c1 100644 --- a/include/d/actor/d_a_title.h +++ b/include/d/actor/d_a_title.h @@ -25,7 +25,6 @@ class CPaneMgrAlpha; */ class daTitle_c : public fopAc_ac_c { public: - //daTitle_c() {} int CreateHeap(); int create(); static int createHeapCallBack(fopAc_ac_c*); @@ -47,6 +46,10 @@ public: int Draw(); int Delete(); + #if VERSION == VERSION_SHIELD_DEBUG + void KeyWaitPosMove(); + #endif + private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ JKRHeap* mpHeap; @@ -60,11 +63,11 @@ private: /* 0x5E4 */ dDlst_daTitle_c mTitle; /* 0x5EC */ JUTFont* mpFont; /* 0x5F0 */ u8 field_0x5f0[8]; - /* 0x5F8 */ u8 field_0x5f8; + /* 0x5F8 */ u8 mIsDispLogo; /* 0x5F9 */ u8 field_0x5f9; /* 0x5FA */ u8 field_0x5fa; /* 0x5FB */ u8 mProcID; - /* 0x5FC */ u8 field_0x5fc; + /* 0x5FC */ u8 mWaitTimer; /* 0x600 */ CPaneMgrAlpha* field_0x600; /* 0x604 */ u8 field_0x604; }; // Size: 0x608 diff --git a/include/d/d_bg_parts.h b/include/d/d_bg_parts.h index adfb97d2b9..a8dba41165 100644 --- a/include/d/d_bg_parts.h +++ b/include/d/d_bg_parts.h @@ -189,7 +189,7 @@ public: }; dBgp_c(); - ~dBgp_c(); + ~dBgp_c() {} void create(s8, void*); int remove(); diff --git a/include/d/d_bright_check.h b/include/d/d_bright_check.h index d3f48ce9a7..d8686944e6 100644 --- a/include/d/d_bright_check.h +++ b/include/d/d_bright_check.h @@ -31,6 +31,12 @@ public: void modeMove(); void _draw(); + void draw() { + _draw(); + } + + u8 isEnd() { return mCompleteCheck; } + /* 0x04 */ JKRArchive* mArchive; /* 0x08 */ dDlst_BrightCheck_c mBrightCheck; /* 0x18 */ u8 mMode; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index d8556e2fde..18165eb628 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -213,6 +213,7 @@ public: }; class camera_class; +class camera_process_class; class dComIfG_camera_info_class { public: dComIfG_camera_info_class() {} @@ -949,12 +950,7 @@ public: class dComIfG_inf_c { public: - dComIfG_inf_c() { this->ct(); } - ~dComIfG_inf_c() {} - void ct(); - static void createBaseCsr(); - -#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG +#if PLATFORM_WII || PLATFORM_SHIELD class baseCsr_c : public mDoGph_gInf_c::csr_c { public: class navi_c { @@ -987,6 +983,9 @@ public: static void particleExecute(); static navi_c* getNavi() { return m_navi; } + dDlst_blo_c* getCsr() { return &field_0x8; } + void onNavi() { field_0x13d = 1; } + /* 0x008 */ dDlst_blo_c field_0x8; /* 0x130 */ dDlst_blo_c::anm_c anm; /* 0x13C */ u8 field_0x13c; @@ -1007,6 +1006,18 @@ public: }; #endif + dComIfG_inf_c() { this->ct(); } + ~dComIfG_inf_c() {} + void ct(); + +#if PLATFORM_WII || PLATFORM_SHIELD + static void createBaseCsr(); + + static baseCsr_c* getBaseCsr() { + return m_baseCsr; + } +#endif + /* 0x00000 */ dSv_info_c info; /* 0x00F38 */ dComIfG_play_c play; /* 0x05F64 */ dDlst_list_c drawlist; @@ -1027,7 +1038,7 @@ public: #endif static __d_timer_info_c dComIfG_mTimerInfo; - #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG + #if PLATFORM_WII || PLATFORM_SHIELD static baseCsr_c* m_baseCsr; #endif }; // Size: 0x1DE10 @@ -3319,8 +3330,8 @@ inline void dComIfGp_setWindow(u8 i, f32 param_1, f32 param_2, f32 param_3, f32 camID, mode); } -inline camera_class* dComIfGp_getCamera(int idx) { - return g_dComIfG_gameInfo.play.getCamera(idx); +inline camera_process_class* dComIfGp_getCamera(int idx) { + return (camera_process_class*)g_dComIfG_gameInfo.play.getCamera(idx); } inline void dComIfGp_setCamera(int i, camera_class* cam) { diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index c287b16ce9..04369d346d 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -67,6 +67,8 @@ public: } + void setBlackColor(u64 i_tag, JUtility::TColor i_color); + class anm_c { public: inline anm_c() { @@ -325,7 +327,7 @@ public: private: /* 0x00 */ view_port_class mViewport; /* 0x28 */ s8 mCameraID; - /* 0x29 */ s8 mMode; + /* 0x29 */ u8 mMode; }; STATIC_ASSERT(sizeof(dDlst_window_c) == 0x2C); diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h index db10b927e2..8cf8aa7dbc 100644 --- a/include/d/d_file_select.h +++ b/include/d/d_file_select.h @@ -452,10 +452,14 @@ public: void errorMsgCheck(); #endif - bool getFadeFlag() { return mFadeFlag; } + void draw() { + _draw(); + } + + u8 getFadeFlag() { return mFadeFlag; } int isDataNew(u8 i) { return mIsDataNew[i]; } int isSelectEnd() { return mIsSelectEnd; } - u8 getSelectNum() { return mSelectNum; } + int getSelectNum() { return mSelectNum; } void setUseType(u8 type) { mUseType = type; } /* 0x0004 */ u8 field_0x04[4]; @@ -663,7 +667,7 @@ public: /* 0x03B2 */ u16 field_0x03b2; /* 0x03B4 */ s32 field_0x03b4; /* 0x03B8 */ SaveDataBuf mSaveData[SAVEDATA_NUM]; - /* 0x2374 */ bool mFadeFlag; + /* 0x2374 */ u8 mFadeFlag; /* 0x2375 */ bool mHasDrawn; #if PLATFORM_GCN diff --git a/include/d/d_menu_collect.h b/include/d/d_menu_collect.h index 127ae7ee2b..01ee32f6d4 100644 --- a/include/d/d_menu_collect.h +++ b/include/d/d_menu_collect.h @@ -209,6 +209,10 @@ public: virtual ~dMenu_Collect3D_c(); + static void setViewPortOffsetY(f32 i_offset) { + mViewOffsetY = i_offset; + } + static f32 mViewOffsetY; private: diff --git a/include/d/d_s_name.h b/include/d/d_s_name.h index 0c55f40930..73d3d703be 100644 --- a/include/d/d_s_name.h +++ b/include/d/d_s_name.h @@ -4,66 +4,37 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_scene.h" -class dSn_HIO_c { +#include "d/d_file_select.h" +#include "d/d_bright_check.h" + +class dSn_HIO_c : public JORReflexible { public: dSn_HIO_c(); virtual ~dSn_HIO_c() {} - /* 0x4 */ s8 field_0x4; + void genMessage(JORMContext*); + + /* 0x4 */ s8 id; /* 0x5 */ u8 mFileSelWaitTime; }; -class dScnName_camera_c : public camera_process_class { +class dScnName_camera_c : public camera_class { public: dScnName_camera_c() { field_0x22f = 84; } virtual ~dScnName_camera_c() {} }; -// remove later and use header instead -class dFile_select_c { -public: - dFile_select_c(JKRArchive*); - virtual ~dFile_select_c(); - void _create(); - void _move(); - void _draw(); - - bool getFadeFlag() { return mFadeFlag; } - int isDataNew(u8 i) { return mDataNew[i]; } - int isSelectEnd() { return mSelectEnd; } - u8 getSelectNum() { return mSelectNum; } - void setUseType(u8 type) { mUseType = type; } - -private: - u8 field_0x4[0x254]; - /* 0x0258 */ u8 mDataNew[3]; - /* 0x025B */ u8 field_0x25b[0x265 - 0x25b]; - /* 0x0265 */ u8 mSelectNum; - /* 0x0266 */ u8 field_0x266[0x270 - 0x266]; - /* 0x0270 */ bool mSelectEnd; - /* 0x0271 */ u8 field_0x271[0x3b0 - 0x271]; - /* 0x03B0 */ u8 mUseType; - /* 0x03B1 */ u8 field_0x3b1[0x2374 - 0x3b1]; - /* 0x2374 */ bool mFadeFlag; - /* 0x2375 */ u8 field_0x2375[0x237c - 0x2375]; -}; - -// remove later and use header instead -class dBrightCheck_c { -public: - dBrightCheck_c(JKRArchive*); - virtual ~dBrightCheck_c(); - void _move(); - void _draw(); - - bool isEnd() { return mEnd; } - - u8 field_0x4[0x15]; - /* 0x19 */ bool mEnd; -}; - class dScnName_c : public scene_class { public: + enum dScnName_PROC { + dScnName_PROC_FileSelectOpen, + dScnName_PROC_FileSelectMain, + dScnName_PROC_FileSelectClose, + dScnName_PROC_BrightCheckOpen, + dScnName_PROC_BrightCheck, + dScnName_PROC_ChangeGameScene, + }; + dScnName_c() {} s32 create(); @@ -88,15 +59,15 @@ private: #if VERSION == VERSION_GCN_PAL u8 field_0x1c4_pal[0x28]; #endif - /* 0x1C4 */ request_of_phase_process_class field_0x1c4; + /* 0x1C4 */ request_of_phase_process_class phase; /* 0x1CC */ JKRExpHeap* mHeap; /* 0x1D0 */ JKRExpHeap* field_0x1d0; /* 0x1D4 */ dScnName_camera_c mCamera; /* 0x414 */ dFile_select_c* dFs_c; /* 0x418 */ dBrightCheck_c* mBrightCheck; - /* 0x41C */ u8 field_0x41c; - /* 0x41D */ u8 field_0x41d; - /* 0x41E */ u8 field_0x41e; + /* 0x41C */ u8 mDrawProc; + /* 0x41D */ u8 mProc; + /* 0x41E */ u8 mWaitTimer; /* 0x41F */ u8 field_0x41f; /* 0x420 */ u8 field_0x420; }; diff --git a/include/d/d_s_room.h b/include/d/d_s_room.h index d261bda101..cc50b3cad7 100644 --- a/include/d/d_s_room.h +++ b/include/d/d_s_room.h @@ -7,12 +7,12 @@ class dStage_roomDt_c; class room_of_scene_class : public scene_class { public: - /* 0x1C4 */ request_of_phase_process_class field_0x1c4; - /* 0x1CC */ void* mpDzrRes; - /* 0x1D0 */ dStage_roomDt_c* mpRoomDt; + /* 0x1C4 */ request_of_phase_process_class phase; + /* 0x1CC */ void* roomInfo; + /* 0x1D0 */ dStage_roomDt_c* roomDt; /* 0x1D4 */ s8 field_0x1d4; /* 0x1D5 */ u8 field_0x1d5; - /* 0x1D6 */ u8 field_0x1d6[2]; + /* 0x1D6 */ u8 unk_0x1d6[0x1D8 - 0x1D6]; /* 0x1D8 */ u8 field_0x1d8; }; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index a4b72182bb..d18be4f09f 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1084,20 +1084,32 @@ public: /* 0x04 */ void** m_dzs; }; - struct nameData { - /* 0x0 */ s8 m_num; - /* 0x1 */ char m_names[32][10]; // ? + /** + * dStage_bankName (made up name) + * - Represent's Stage resource "name.bin" + */ + struct dStage_bankName { + /* 0x0 */ u8 m_num; // number of name entries + /* 0x1 */ char m_names[1][10]; // variable number of name entries (up to 32 max), each 10 characters long }; - struct bankDataEntry { - u8 field_0x0; - u8 mLayerNo; - u8 field_0x2[0x20]; + /** + * dStage_bankDataEntry (made up name) + * - Entry that goes into dStage_bankData + */ + struct dStage_bankDataEntry { + u8 roomNo; // required room ID for the bank + u8 layerNo; // required layer for the bank + u8 nameIDs[32]; // indexes into dStage_bankName m_names list. 0xFF used for unused entries }; - struct bankData { + /** + * dStage_bankData (made up name) + * - Represent's Stage resource "bank.bin" + */ + struct dStage_bankData { /* 0x0 */ u8 m_num; - /* 0x1 */ bankDataEntry m_entries[32]; // ? + /* 0x1 */ dStage_bankDataEntry m_entries[1]; // variable number of entries }; dStage_roomControl_c() {} @@ -1124,8 +1136,8 @@ public: static int getNextStayNo() { return mNextStayNo; } static BOOL GetTimePass() { return m_time_pass; } static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; } - static nameData* getArcBankName() { return mArcBankName; } - static bankData* getArcBankData() { return mArcBankData; } + static dStage_bankName* getArcBankName() { return mArcBankName; } + static dStage_bankData* getArcBankData() { return mArcBankData; } static void createRoomDzs(u8 i_num) { m_roomDzs.create(i_num); } static void removeRoomDzs() { m_roomDzs.remove(); } static void* addRoomDzs(u8 i_num, u8 roomNo) { return m_roomDzs.add(i_num, roomNo); } @@ -1214,7 +1226,9 @@ public: static void onNoChangeRoom() { mNoChangeRoom = true; } #if DEBUG - static void setBgp(int, void*); + static void setBgp(int i_roomNo, void* i_bgp) { + mBgp[i_roomNo] = i_bgp; + } #endif static const int MEMORY_BLOCK_MAX = 19; @@ -1224,8 +1238,8 @@ public: static dStage_roomStatus_c mStatus[0x40]; static char mDemoArcName[10]; static fpc_ProcID mProcID; - static nameData* mArcBankName; - static bankData* mArcBankData; + static dStage_bankName* mArcBankName; + static dStage_bankData* mArcBankData; static roomDzs_c m_roomDzs; static s8 mStayNo; static s8 mOldStayNo; diff --git a/include/d/dolzel_rel.h b/include/d/dolzel_rel.h index 6e08fbd66e..c925632315 100644 --- a/include/d/dolzel_rel.h +++ b/include/d/dolzel_rel.h @@ -1,10 +1,20 @@ #ifndef DOLZEL_REL_H #define DOLZEL_REL_H -#if __MWERKS__ && !defined(DECOMPCTX) -#include "d/dolzel_rel.mch" +// Shield versions move some RELs into the DOL, so need a way to switch which +// precompiled headers are being used depending on some variable +#if __FORCE_REL_IN_DOL__ + #if __MWERKS__ && !defined(DECOMPCTX) + #include "d/dolzel.mch" + #else + #include "d/dolzel.pch" + #endif #else -#include "d/dolzel_rel.pch" + #if __MWERKS__ && !defined(DECOMPCTX) + #include "d/dolzel_rel.mch" + #else + #include "d/dolzel_rel.pch" + #endif #endif #endif // DOLZEL_REL_H diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index c722784386..b2c98305c6 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -10,8 +10,9 @@ struct fopCamM_prm_class { /* 0x00 */ fopAcM_prmBase_class base; }; // Size: 0x18 -class camera_process_class : public view_class { +class camera_class { public: + /* 0x000 */ view_class view; /* 0x210 */ create_tag_class create_tag; /* 0x224 */ leafdraw_method_class* submethod; /* 0x228 */ u8 field_0x228[4]; @@ -23,7 +24,7 @@ public: /* 0x238 */ int field_0x238; }; -class camera_class : public camera_process_class { +class camera_process_class : public camera_class { public: /* 0x23C */ int field_0x23c; /* 0x240 */ request_of_phase_process_class phase_request; @@ -39,35 +40,35 @@ inline void fopCamM_SetAngleY(camera_class* i_camera, s16 angle) { } inline void fopCamM_SetNear(camera_class* i_this, f32 near) { - i_this->near = near; + i_this->view.near = near; } inline void fopCamM_SetFar(camera_class* i_this, f32 far) { - i_this->far = far; + i_this->view.far = far; } inline void fopCamM_SetFovy(camera_class* i_this, f32 fovy) { - i_this->fovy = fovy; + i_this->view.fovy = fovy; } inline void fopCamM_SetAspect(camera_class* i_this, f32 aspect) { - i_this->aspect = aspect; + i_this->view.aspect = aspect; } inline void fopCamM_SetEye(camera_class* i_this, f32 x, f32 y, f32 z) { - i_this->lookat.eye.set(x, y, z); + i_this->view.lookat.eye.set(x, y, z); } inline void fopCamM_SetCenter(camera_class* i_this, f32 x, f32 y, f32 z) { - i_this->lookat.center.set(x, y, z); + i_this->view.lookat.center.set(x, y, z); } inline void fopCamM_SetUp(camera_class* i_this, f32 x, f32 y, f32 z) { - i_this->lookat.up.set(x, y, z); + i_this->view.lookat.up.set(x, y, z); } inline void fopCamM_SetBank(camera_class* i_this, s16 bank) { - i_this->bank = bank; + i_this->view.bank = bank; } inline void fopCamM_SetPrm1(camera_class* i_this, int prm1) { @@ -95,23 +96,23 @@ inline s16 fopCamM_GetAngleZ(camera_class* i_camera) { } inline f32 fopCamM_GetFovy(camera_class* i_camera) { - return i_camera->fovy; + return i_camera->view.fovy; } inline cXyz* fopCamM_GetEye_p(camera_class* i_camera) { - return &i_camera->lookat.eye; + return &i_camera->view.lookat.eye; } inline cXyz* fopCamM_GetCenter_p(camera_class* i_camera) { - return &i_camera->lookat.center; + return &i_camera->view.lookat.center; } inline cXyz* fopCamM_GetUp_p(camera_class* i_camera) { - return &i_camera->lookat.up; + return &i_camera->view.lookat.up; } inline s16 fopCamM_GetBank(camera_class* i_camera) { - return i_camera->bank; + return i_camera->view.bank; } fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append); diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index ed8b6dece9..a811f7fb7f 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -99,7 +99,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_Obj_BkDoor, "d_a_obj_bkdoor"}, {PROC_Obj_Cboard, "d_a_obj_cboard"}, {PROC_Obj_MGate, "d_a_obj_mgate"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_Obj_Ikada, "d_a_obj_ikada"}, #endif {PROC_Obj_Ice_l, "d_a_obj_ice_l"}, @@ -540,7 +540,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_Obj_LifeContainer, "d_a_obj_life_container"}, {PROC_Obj_Shield, "d_a_obj_shield"}, {PROC_Demo_Item, "d_a_demo_item"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_ShopItem, "d_a_shop_item"}, #endif {PROC_Obj_Drop, "d_a_obj_drop"}, @@ -549,7 +549,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_TAG_CSW, "d_a_tag_csw"}, {PROC_TAG_QS, "d_a_tag_qs"}, {PROC_HOZELDA, "d_a_hozelda"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_SWC00, "d_a_swc00"}, #endif {PROC_KNOB20, "d_a_door_knob00"}, @@ -563,7 +563,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_Tag_ChgRestart, "d_a_tag_chgrestart"}, {PROC_Tag_Restart, "d_a_tag_setrestart"}, {PROC_ANDSW, "d_a_andsw"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_ANDSW2, "d_a_andsw2"}, #endif {PROC_MYNA, "d_a_myna"}, @@ -684,12 +684,12 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_NPC_CHIN, "d_a_npc_chin"}, {PROC_NPC_INS, "d_a_npc_ins"}, {PROC_NPC_SHOP0, "d_a_npc_shop0"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_NPC_MK, "d_a_npc_mk"}, #endif {PROC_NPC_P2, "d_a_npc_p2"}, {PROC_KYTAG00, "d_a_kytag00"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_KYTAG01, "d_a_kytag01"}, #endif {PROC_KYTAG02, "d_a_kytag02"}, @@ -729,13 +729,13 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_DEMO00, "d_a_demo00"}, {PROC_TAG_CAMERA, "d_a_tag_camera"}, {PROC_TAG_CHKPOINT, "d_a_tag_chkpoint"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_TAG_EVENT, "d_a_tag_event"}, #endif {PROC_TAG_EVT, "d_a_tag_evt"}, {PROC_TAG_TELOP, "d_a_tag_telop"}, {PROC_TAG_HOWL, "d_a_tag_howl"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_TAG_MSG, "d_a_tag_msg"}, #endif {PROC_TAG_LANTERN, "d_a_tag_lantern"}, @@ -748,7 +748,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_BG_OBJ, "d_a_bg_obj"}, {PROC_MIRROR, "d_a_mirror"}, {PROC_MOVIE_PLAYER, "d_a_movie_player"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_TITLE, "d_a_title"}, #endif {PROC_FR, "d_a_fr"}, @@ -793,7 +793,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_Obj_Timer, "d_a_obj_timer"}, {PROC_SCENE_EXIT, "d_a_scene_exit"}, {PROC_SUSPEND, "d_a_suspend"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_GRASS, "d_a_grass"}, #endif {-1, NULL}, diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 5408b1eb9d..046c7313e5 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -69,8 +69,8 @@ void daDr_c::wait() { current.angle.y = 0; field_0x654++; } else if (field_0x654 != -1) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); if (eventInfo.checkCommandDemoAccrpt()) { camera->mCamera.Stop(); @@ -86,15 +86,15 @@ void daDr_c::wait() { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCamEye = camera0->lookat.eye; - mDemoCamCenter = camera0->lookat.center; + mDemoCamEye = camera0->view.lookat.eye; + mDemoCamCenter = camera0->view.lookat.center; } } } void daDr_c::pl_walk() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp4C; @@ -167,8 +167,8 @@ void daDr_c::pl_turn() { } void daDr_c::bridge_destroy() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = daPy_getPlayerActorClass(); if (field_0x654 == 0) { @@ -216,7 +216,7 @@ void daDr_c::bridge_destroy() { } void daDr_c::bridge_destroy2() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dComIfGp_getCamera(0); daPy_getPlayerActorClass(); diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index f6051370b1..e707f4d554 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -85,8 +85,8 @@ void daL7ODR_c::wait() { if (field_0x888 == 0) { field_0x888++; } else if (field_0x888 != -1) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); if (eventInfo.checkCommandDemoAccrpt()) { dComIfGs_onZoneSwitch(Z2SE_DPD_SCREEN_OUT, fopAcM_GetRoomNo(this)); @@ -99,15 +99,15 @@ void daL7ODR_c::wait() { if (check_start()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCamEye = camera0->lookat.eye; - mDemoCamCenter = camera0->lookat.center; + mDemoCamEye = camera0->view.lookat.eye; + mDemoCamCenter = camera0->view.lookat.center; } } } void daL7ODR_c::pl_walk() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = daPy_getPlayerActorClass(); if (field_0x888 == 0) { @@ -264,8 +264,8 @@ void daL7ODR_c::dr_wait() { } void daL7ODR_c::dr_fly() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp264(0.0f, 0.0f, 0.0f); diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index cf2f1b4719..66ffb5484d 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -13962,7 +13962,7 @@ void daAlink_c::resetBasAnime() { } BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { - camera_class* camera = dComIfGp_getCamera(field_0x317c); + camera_process_class* camera = dComIfGp_getCamera(field_0x317c); cXyz* line_start_pos = fopCamM_GetEye_p(camera); cXyz sp3C; cXyz sp30(mHeldItemRootPos); diff --git a/src/d/actor/d_a_alink_kandelaar.inc b/src/d/actor/d_a_alink_kandelaar.inc index d2769b7f24..6eab009594 100644 --- a/src/d/actor/d_a_alink_kandelaar.inc +++ b/src/d/actor/d_a_alink_kandelaar.inc @@ -182,7 +182,7 @@ void daAlink_c::preKandelaarDraw() { cXyz proj; mDoLib_project(&mKandelaarFlamePos, &proj); - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); f32 trimHeight; if (camera_p != NULL) { trimHeight = camera_p->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 17ef77cdf0..4b4af6a06f 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -1195,8 +1195,8 @@ static void fish_set(b_bq_class* i_this) { static void demo_camera(b_bq_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); fopAc_ac_c* tentacle = fopAcM_SearchByID(i_this->mTentacleIDs[i_this->field_0x123c]); e_mb_class* monkeybomb = (e_mb_class*)fopAcM_SearchByID(i_this->mMonkeyBombID); @@ -1420,8 +1420,8 @@ static void demo_camera(b_bq_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); - i_this->mDemoCamEye = camera0->lookat.eye; - i_this->mDemoCamCenter = camera0->lookat.center; + i_this->mDemoCamEye = camera0->view.lookat.eye; + i_this->mDemoCamCenter = camera0->view.lookat.center; dComIfGp_getEvent()->startCheckSkipEdge(a_this); // fallthrough diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index 0a9d6c7a9a..b47801849d 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -1384,7 +1384,7 @@ void daB_DR_c::executeFlyWait() { void daB_DR_c::executeTailHit() { 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)); cXyz mae; cXyz ato; @@ -3025,14 +3025,14 @@ void daB_DR_c::executePillarWait() { } bool daB_DR_c::startDemoCheck() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCamEye = camera0->lookat.eye; - mDemoCamCenter = camera0->lookat.center; + mDemoCamEye = camera0->view.lookat.eye; + mDemoCamCenter = camera0->view.lookat.center; return false; } else { camera->mCamera.Stop(); @@ -3043,7 +3043,7 @@ bool daB_DR_c::startDemoCheck() { } void daB_DR_c::executeDamageDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz unused; cXyz unused2; @@ -3238,7 +3238,7 @@ void daB_DR_c::executeDamageDemo() { } void daB_DR_c::executeMiddleDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz unused; cXyz unused2; @@ -3269,7 +3269,7 @@ void daB_DR_c::executeMiddleDemo() { } void daB_DR_c::executeDead() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz unused; cXyz unused2; @@ -3351,7 +3351,7 @@ void daB_DR_c::executeBullet() { } void daB_DR_c::executeParts() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz mae; cXyz ato; @@ -3399,7 +3399,7 @@ void daB_DR_c::executeParts() { mTimer[0] = 50; ANGLE_ADD(current.angle.x, cM_rndFX(16384.0f)); - mae = camera->lookat.center - current.pos; + mae = camera->view.lookat.center - current.pos; current.angle.y = mae.atan2sX_Z(); ANGLE_ADD(current.angle.y, cM_rndFX(16384.0f)); @@ -3813,7 +3813,7 @@ void daB_DR_c::down_cc_set() { void daB_DR_c::demo_skip(int) { fopAc_ac_c* parent; if (cDmr_SkipInfo == 0 && fopAcM_SearchByID(parentActorID, &parent) && parent != NULL) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); Z2GetAudioMgr()->subBgmStop(); dKy_getEnvlight()->wether = 1; diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index b501877178..8701a1f261 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -70,7 +70,7 @@ static int daB_DRE_Delete(daB_DRE_c* i_this) { } bool daB_DRE_c::CameraSet() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* cam_body = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { @@ -92,12 +92,12 @@ bool daB_DRE_c::CameraSet() { } void daB_DRE_c::SetStopingCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0); } void daB_DRE_c::SetStopCam(cXyz i_center, f32 param_1, f32 i_eyeY, s16 i_offsetAngle) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz eye_pos(0.0f, i_eyeY, param_1); mCamCenter.set(i_center.x, i_center.y, i_center.z); @@ -127,7 +127,7 @@ void daB_DRE_c::SetCMoveCam(cXyz i_target, f32 i_scale, f32 i_step) { void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offsetAngle, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset(0.0f, param_2, param_1); cXyz target(0.0f, 0.0f, 0.0f); @@ -140,7 +140,7 @@ void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offs void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offsetAngle, f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz target(0.0f, param_2, param_1); cLib_offsetPos(&target, ¶m_0, i_offsetAngle, &target); @@ -151,7 +151,7 @@ void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offs } void daB_DRE_c::SetMoveCam(f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cLib_addCalcPos(&mCamCenter, mCamCenterTarget, i_scale, i_step, 0.0f); cLib_addCalcPos(&mCamEye, mCamEyeTarget, i_scale, i_step, 0.0f); @@ -160,7 +160,7 @@ void daB_DRE_c::SetMoveCam(f32 i_scale, f32 i_step) { } void daB_DRE_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCamCenter, mCamEye); camera->mCamera.Start(); diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index d817769ded..4fc5d127eb 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -1116,7 +1116,7 @@ bool daB_DS_c::mCutTypeCheck() { } bool daB_DS_c::startDemoCheck() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (daPy_py_c::checkNowWolf()) { return false; @@ -1159,7 +1159,7 @@ bool daB_DS_c::doYoMessage() { } void daB_DS_c::executeOpeningDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* pla = daPy_getPlayerActorClass(); dBgS_GndChk gnd_chk; @@ -1856,7 +1856,7 @@ void daB_DS_c::damageSet() { } void daB_DS_c::damageHitCamera() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset, pos; mDoMtx_YrotS(*calc_mtx, field_0x7d0); @@ -1947,7 +1947,7 @@ void daB_DS_c::executeDamage() { static u16 eff_spHit_id[2] = {0x8BD9, 0x8BDA}; static u16 eff_LastSmoke_id[4] = {0x8C25, 0x8C26, 0x8C27, 0x8C28}; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* pla = daPy_getPlayerActorClass(); csXyz angle = shape_angle; cXyz sp1BC, sp1B0; @@ -2547,7 +2547,7 @@ void daB_DS_c::executeBreathSearch() { } void daB_DS_c::executeBattle2OpeningDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* pla = daPy_getPlayerActorClass(); cXyz vec, center, eye, unused; center.zero(); @@ -2958,11 +2958,11 @@ void daB_DS_c::mSetFirstPos() { } bool daB_DS_c::mChkScreenIn() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz vec1, vec2; - vec2 = camera->lookat.eye - camera->lookat.center; - vec1 = camera->lookat.eye - current.pos; + vec2 = camera->view.lookat.eye - camera->view.lookat.center; + vec1 = camera->view.lookat.eye - current.pos; return abs((s16)(vec1.atan2sX_Z() - vec2.atan2sX_Z())) < 0x3000; } @@ -3253,7 +3253,7 @@ void daB_DS_c::executeBattle2Tired() { } void daB_DS_c::executeBattle2Damage() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* pla = daPy_getPlayerActorClass(); JPABaseEmitter* emitter; @@ -3633,7 +3633,7 @@ void daB_DS_c::executeBattle2Dead() { }; static u16 eff_Demo_sasi_id[2] = {0x8BF8, 0x8BF9}; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); csXyz particle_angle = shape_angle; cXyz mae, ato; cXyz particle_scale(1.5f, 1.5f, 1.5f); diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index dc37eae4e8..212225ece2 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -592,7 +592,7 @@ int daB_GG_c::DemoSkipCallBack(void* i_process, int param_1) { } bool daB_GG_c::CameraSet() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* cam_body = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { @@ -612,12 +612,12 @@ bool daB_GG_c::CameraSet() { } void daB_GG_c::SetStopingCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0); } void daB_GG_c::SetStopCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp38(0.0f, param_2, param_1); cXyz sp2C(0.0f, 0.0f, 0.0f); @@ -635,7 +635,7 @@ void daB_GG_c::SetStopCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3) { void daB_GG_c::SetMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3, f32 param_4, f32 param_5) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp38(0.0f, param_2, param_1); cXyz sp2C(0.0f, 0.0f, 0.0f); field_0x60c = param_0; @@ -652,7 +652,7 @@ void daB_GG_c::SetMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3, f } void daB_GG_c::SetMoveCam1(f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cLib_addCalcPos(&mCamCenterTarget, field_0x60c, i_scale, i_step, 0.0f); cLib_addCalcPos(&mCamEyeTarget, field_0x618, i_scale, i_step, 0.0f); @@ -663,7 +663,7 @@ void daB_GG_c::SetMoveCam1(f32 i_scale, f32 i_step) { } void daB_GG_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCamCenter, mCamEye); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -689,7 +689,7 @@ void daB_GG_c::St_CamAction() { cXyz sp4C(0.0f, 0.0f, -300.0f); cXyz sp40; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (mCamMode) { case 0: diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 4f911c8a90..99a0f3bd73 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -1010,8 +1010,8 @@ static void cam_spd_set(b_gm_class* i_this) { static void demo_camera(b_gm_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* sp20 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* sp20 = dComIfGp_getCamera(0); cXyz spC8; cXyz spBC; cXyz spB0; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index ee80e287f2..76cbb32249 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -2869,8 +2869,8 @@ static void cam_spd_set(b_gnd_class* i_this) { static void demo_camera(b_gnd_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c *)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID); dScnKy_env_light_c* kankyo = dKy_getEnvlight(); diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index f08b4bc9a6..a050b672ca 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -2489,7 +2489,7 @@ void daB_MGN_c::executeFall() { void daB_MGN_c::demo_skip(int param_1) { UNUSED(param_1); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); mBlurRate = 0.0f; @@ -2529,7 +2529,7 @@ int daB_MGN_c::DemoSkipCallBack(void* i_this, int param_1) { } void daB_MGN_c::executeOpening() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); J3DModelData* modelData = mpMgnModelMorf->getModel()->getModelData(); @@ -2821,7 +2821,7 @@ void daB_MGN_c::executeOpening() { } void daB_MGN_c::executeDeath() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp60; cXyz sp54; diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 8b4c5eedb6..41c2bdddbf 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -286,7 +286,7 @@ static int daB_OB_Draw(b_ob_class* i_this) { for (int i = 0; i < 19; i++) { if (!i_this->mBodyParts[i].mHide) { - if ((i_this->mBodyParts[i].mPos - camera->lookat.eye).abs() > + if ((i_this->mBodyParts[i].mPos - camera->view.lookat.eye).abs() > i_this->mBodyParts[i].mSize * (JREG_F(17) + 500.0f)) { g_env_light.setLightTevColorType_MAJI(i_this->mBodyParts[i].mpMorf->getModel(), @@ -1946,7 +1946,7 @@ static void fish_move(b_ob_class* i_this) { a_this->attention_info.position.y += 50.0f; if (i_this->mDemoAction == 21 || i_this->mDemoAction == 22) { - sp84 = dComIfGp_getCamera(0)->lookat.eye - sp90; + sp84 = dComIfGp_getCamera(0)->view.lookat.eye - sp90; } else { sp84 = player->eyePos - sp90; } @@ -1996,8 +1996,8 @@ static void* s_hasidel_sub(void* i_this, void* i_data) { static void demo_camera(b_ob_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); cXyz sp58; cXyz sp64; @@ -2027,8 +2027,8 @@ static void demo_camera(b_ob_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(46, 0, 0, 0); - i_this->mDemoCamEye = camera0->lookat.eye; - i_this->mDemoCamCenter = camera0->lookat.center; + i_this->mDemoCamEye = camera0->view.lookat.eye; + i_this->mDemoCamCenter = camera0->view.lookat.center; sp58 = i_this->mDemoCamEye - tentacle->current.pos; i_this->field_0x5ce0 = cM_atan2s(sp58.x, sp58.z); diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 82e0f3d844..137195e838 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -1631,7 +1631,7 @@ static void* s_obj_sub(void* i_actor, void* i_data) { } void daB_TN_c::demo_skip(int param_1) { - camera_class* cameraClass = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* cameraClass = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); if (param_1 == 0) { @@ -1675,7 +1675,7 @@ int daB_TN_c::DemoSkipCallBack(void* i_this, int param_1) { void daB_TN_c::executeRoomDemo() { daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp24 = player->current.pos; cXyz sp30; @@ -1825,7 +1825,7 @@ void daB_TN_c::executeRoomDemo() { void daB_TN_c::executeOpening() { cXyz sp7c, sp34; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAcM_searchPlayerDistance(this); @@ -2678,7 +2678,7 @@ void daB_TN_c::executeDamageH() { void daB_TN_c::executeChangeDemo() { cXyz sp28, sp34, sp40; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (mActionMode2) { case ACTION2_0_e: @@ -4178,7 +4178,7 @@ void daB_TN_c::executeYoroke() { void daB_TN_c::executeEnding() { daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp1c, sp28; switch (mActionMode2) { diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index c837457a8d..e358f7786c 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -757,7 +757,7 @@ int daB_YO_c::doYoMessage() { } void daB_YO_c::executeOpening() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz cam_pos, player_pos, ystone_pos; daPy_py_c* player = daPy_getPlayerActorClass(); obj_ystone_class* ystone; @@ -1509,7 +1509,7 @@ void daB_YO_c::executeChase() { } void daB_YO_c::executeSeriousDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz pos; switch (mMode) { @@ -2104,7 +2104,7 @@ void daB_YO_c::executeAttackBody() { } void daB_YO_c::executeDemoRevival() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (mMode) { case 0: @@ -2277,7 +2277,7 @@ void daB_YO_c::executeDamage() { void daB_YO_c::executeDeath() { daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz pos1; cXyz pos2 = current.pos; pos2.y += 300.0f; diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index b38aa09b98..4a95154130 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -1324,7 +1324,7 @@ void daB_ZANT_c::executeConfuse() { } void daB_ZANT_c::executeOpening() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp34(0.0f, 0.0f, 0.0f); diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 76ecb88607..3126058935 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -213,9 +213,9 @@ static int land_check(bd_class* i_this) { } fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz sp30; - sp30 = camera->lookat.center - camera->lookat.eye; + sp30 = camera->view.lookat.center - camera->view.lookat.eye; s16 spA = cM_atan2s(sp30.x, sp30.z); if (strcmp(dComIfGp_getStartStageName(), "F_SP103") == 0) { @@ -238,15 +238,15 @@ static int land_check(bd_class* i_this) { if (temp_r1[j] != 0) { continue; } - sp30.x = land_pos[j].x - camera->lookat.eye.x; - sp30.z = land_pos[j].z - camera->lookat.eye.z; + sp30.x = land_pos[j].x - camera->view.lookat.eye.x; + sp30.z = land_pos[j].z - camera->view.lookat.eye.z; s16 sVar2 = cM_atan2s(sp30.x, sp30.z) - spA; if (sVar2 >= 0x2000 || sVar2 <= -0x2000) { continue; } - sp30.x = camera->lookat.eye.x - land_pos[j].x; - sp30.z = camera->lookat.eye.z - land_pos[j].z; + sp30.x = camera->view.lookat.eye.x - land_pos[j].x; + sp30.z = camera->view.lookat.eye.z - land_pos[j].z; f32 temp_f1 = JMAFastSqrt((sp30.x * sp30.x) + (sp30.z * sp30.z)); if (!(temp_f1 >= 600.0f) || !(temp_f1 < var_f31)) { diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 825ace2314..ddc1184212 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -284,7 +284,7 @@ int daBg_c::draw() { int sp38 = 0; dDlst_window_c* sp34 = dComIfGp_getWindow(0); - camera_class* sp30 = dComIfGp_getCamera(sp34->getCameraID()); + camera_process_class* sp30 = dComIfGp_getCamera(sp34->getCameraID()); dComIfGd_setListBG(); mDoLib_clipper::changeFar(1000000.0f); diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 85e416298a..7d05a714ae 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -993,7 +993,7 @@ int daBoomerang_c::procWait() { field_0x6d8 = lock_line_actor; } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); f32 cps_size; if (field_0x6d8 != NULL) { cps_size = 30.0f; @@ -1261,7 +1261,7 @@ int daBoomerang_c::execute() { field_0x962--; } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 cam_angleY = fopCamM_GetAngleY(camera); s16 cam_angleX = fopCamM_GetAngleX(camera); diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 6a1f0a126b..812d52c878 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -799,7 +799,7 @@ void daCstatue_c::setDemo() { cXyz eyePos; cXyz centerPos; if (eventInfo.checkCommandDemoAccrpt()) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAcM_onSwitch(this, mParam1); if (mDemoMode == daCstatue_DemoMode_0) { camera->mCamera.Stop(); diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index f668842d7f..947767da63 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -543,8 +543,8 @@ static void bee_control(e_bee_class* i_this) { bee->mNoDraw = false; if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { - vec3.x = bee->mPos.x - camera->lookat.eye.x; - vec3.z = bee->mPos.z - camera->lookat.eye.z; + vec3.x = bee->mPos.x - camera->view.lookat.eye.x; + vec3.z = bee->mPos.z - camera->view.lookat.eye.z; if (JMAFastSqrt(vec3.x * vec3.x + vec3.z * vec3.z) > NREG_F(0) + 2500.0f) { bee->mNoDraw = true; } diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index 9c8320c188..dbce499069 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -430,7 +430,7 @@ void daE_BG_c::executeAttack() { s16 unkShort1; cXyz unkXyz1; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz playerPos = daPy_getPlayerActorClass()->current.pos; @@ -1099,7 +1099,7 @@ void daE_BG_c::action() { mCreatureSound.setLinkSearch(isAttacking); if (mActionMode != 0 && mActionMode != 3) { dBgS_LinChk linChk; - linChk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + linChk.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&linChk)) { attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; } else { diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index 9ae161b968..ccd68a9083 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -90,7 +90,7 @@ void daE_DF_c::SetAnm(int i_index, int i_attr, f32 i_morf, f32 i_rate) { } void daE_DF_c::CameraSet(f32 i_posz) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz center = current.pos; center.y += 100.0f; @@ -121,7 +121,7 @@ void daE_DF_c::CameraSet(f32 i_posz) { } bool daE_DF_c::DemoStart() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* body = dCam_getBody(); if (eventInfo.checkCommandDemoAccrpt() == 0) { @@ -140,7 +140,7 @@ bool daE_DF_c::DemoStart() { } void daE_DF_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCenterPos, mEyePos); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 7b52cf0f37..a5a0014a3e 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -1417,7 +1417,7 @@ void daE_DT_c::executeBombDamage() { void daE_DT_c::executeDeath() { cXyz player_pos(0.0f, 0.0f, 450.0f); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset, disappear_pos; daPy_py_c* player = daPy_getPlayerActorClass(); @@ -1941,7 +1941,7 @@ void daE_DT_c::calcCamera() { dBgS_LinChk lin_chk; cXyz start, end, offset_pos, offset; cXyz player_pos = daPy_getPlayerActorClass()->current.pos; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz cam_center, vec, cam_eye; s16 angle; diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 959d733b95..ca5a982bfa 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -1152,8 +1152,8 @@ static int demo_stop; static void demo_camera(e_fm_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); cXyz spEC; cXyz spE0; @@ -1280,8 +1280,8 @@ static void demo_camera(e_fm_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); i_this->mDemoCamFovy = 50.0f; - i_this->mDemoCamEye = camera0->lookat.eye; - i_this->mDemoCamCenter = camera0->lookat.center; + i_this->mDemoCamEye = camera0->view.lookat.eye; + i_this->mDemoCamCenter = camera0->view.lookat.center; i_this->field_0x778 = 0.0f; camera->mCamera.SetTrimSize(3); dComIfGp_getEvent()->startCheckSkipEdge(actor); diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index bb1305d96e..a1995a663b 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1105,8 +1105,8 @@ static void cam_3d_morf(e_gb_class* i_this, f32 param_2) { static void demo_camera(e_gb_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera2 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera2 = dComIfGp_getCamera(0); fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); cXyz work, pos, sp34, sp40; diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index ba9816f8c5..4221e24b56 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -488,7 +488,7 @@ void daE_GE_c::executeAttack() { mDoMtx_stack_c::copy(daPy_getLinkPlayerActorClass()->getModelJointMtx(0)); mDoMtx_stack_c::multVecZero(&position); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 distAngleS = cLib_distanceAngleS(fopCamM_GetAngleY(camera), fopAcM_searchPlayerAngleY(this)); diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index cfdcd94442..387e8619b3 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -816,7 +816,7 @@ void daE_GI_c::action() { if (attention_info.flags & fopAc_AttnFlag_BATTLE_e) { dBgS_LinChk linecheck; - linecheck.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + linecheck.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&linecheck)) { attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; } diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index 724c4ff83e..ac352decea 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -1639,8 +1639,8 @@ static void cam_3d_morf(e_gob_class* i_this, f32 param_1) { static void demo_camera(e_gob_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); cXyz sp94; cXyz sp88; cXyz cam_eye; diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 114ca27387..cdb00ae7b7 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -230,7 +230,7 @@ int daE_HP_c::draw() { mDoMtx_stack_c::multVec(&unkXyz1, &field_0x75c); mDoMtx_stack_c::transS(field_0x75c); - unkXyz1 = dComIfGp_getCamera(0)->lookat.eye - field_0x75c; + unkXyz1 = dComIfGp_getCamera(0)->view.lookat.eye - field_0x75c; mDoMtx_stack_c::YrotM(unkXyz1.atan2sX_Z()); mDoMtx_stack_c::XrotM((s16)unkXyz1.atan2sY_XZ()); mDoMtx_stack_c::scaleM(l_HIO.modelSize, l_HIO.modelSize, l_HIO.modelSize); diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 1630397e1a..6ecd3313e7 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -822,8 +822,8 @@ static BOOL ball_bg_check(e_hzelda_class* i_this) { static void demo_camera(e_hzelda_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* unused = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* unused = dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz offset; diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index a5a3bf869c..9fc1c620d4 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -1254,7 +1254,7 @@ static void demo_camera_start(e_mk_class* i_this) { fopAc_ac_c* deku_baba_p[2]; fopAc_ac_c* boomerang_p; boomerang_p = fopAcM_SearchByID(i_this->boomerangId); - camera_class* camera1 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera1 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera2 = (camera_class*)dComIfGp_getCamera(0); cXyz work, offset, offset_2, unused; @@ -1279,8 +1279,8 @@ static void demo_camera_start(e_mk_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); Z2GetAudioMgr()->bgmStreamPrepare(0x200000D); - i_this->camEye = camera2->lookat.eye; - i_this->camCenter = camera2->lookat.center; + i_this->camEye = camera2->view.lookat.eye; + i_this->camCenter = camera2->view.lookat.center; i_this->camEyeTarget.set(-271.0f, 4559.0f, -7241.0f); i_this->camCenterTarget.set(-70.0f, 4378.0f, -6233.0f); @@ -1551,7 +1551,7 @@ static void demo_camera_end(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); fopAc_ac_c* boomerang_p = (fopAc_ac_c*)fopAcM_SearchByID(i_this->boomerangId); - camera_class* camera = (camera_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz work, pos, unused_1, unused_2; switch (i_this->demoSubMode) { @@ -1973,7 +1973,7 @@ static void demo_camera_r04(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; daPy_py_c* player = (daPy_py_c *)dComIfGp_getPlayer(0); fopAc_ac_c* boomerang_p = fopAcM_SearchByID(i_this->boomerangId); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz work, pos, unused, unused2; npc_ks_class* monkey_p = (npc_ks_class*)fpcM_Search(s_ks_sub, i_this); @@ -2239,7 +2239,7 @@ static void demo_camera_r04(e_mk_class* i_this) { static void demo_camera_bohit(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; 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)); cXyz work, unused_1, unused_2, unused_3; switch (i_this->demoSubMode) { @@ -2292,7 +2292,7 @@ static void demo_camera_bohit(e_mk_class* i_this) { static void demo_camera(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz unused_1, unused_2; switch (i_this->demoMode) { diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 37d3ad8d95..d3988cec46 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -785,7 +785,7 @@ static void* shot_b_sub(void* i_actor, void* i_data) { } static void demo_camera(e_nest_class* i_this) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s8 end_demo = false; switch (i_this->mDemoStage) { diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index b1f7d965f4..3f7d418ee6 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -1944,7 +1944,7 @@ void daE_OC_c::executeDemoMaster() { cXyz my_vec_1(16200.0f, 2850.0f, 7000.0f); my_vec_1 += my_vec_0; mPrevShapeAngle = shape_angle.y; - camera_class* p_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* p_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (mOcState) { case 0: mHide = false; @@ -2585,7 +2585,7 @@ int daE_OC_c::execute() { if (field_0x6c8) { --field_0x6c8; if (field_0x6c8 == 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); mPlayerPos = daPy_getPlayerActorClass()->current.pos; mPlayerPos.y += 500.0f; field_0x704 = 55.0f; diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 3d766b8e3e..01440f62ab 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -84,13 +84,13 @@ static BOOL other_bg_check(daE_PH_c* i_this, fopAc_ac_c* i_other) { } void daE_PH_c::SetStopingCam() { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_p->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } void daE_PH_c::SetStopCam(cXyz i_center, f32 i_offsetZ, f32 i_offsetY, s16 i_offsetAngle) { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset(0.0f, i_offsetY, i_offsetZ); cXyz eye_offset(0.0f, 0.0f, 0.0f); @@ -110,7 +110,7 @@ void daE_PH_c::SetCMoveCam(cXyz i_target, f32 i_scale, f32 i_maxStep) { } void daE_PH_c::SetReleaseCam() { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_p->mCamera.Reset(mCamCenter, mCamEye); camera_p->mCamera.Start(); diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 39c86f914a..4d3cae2e62 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -392,7 +392,7 @@ void daE_PM_c::SetGakkiEffect() { } bool daE_PM_c::CameraSet() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camera_body = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { @@ -414,12 +414,12 @@ bool daE_PM_c::CameraSet() { } void daE_PM_c::SetStopingCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } void daE_PM_c::SetStopCam(cXyz i_center, f32 i_offsetXZ, f32 i_offsetY, s16 i_angle) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset(0.0f, i_offsetY, i_offsetXZ); cXyz eye(0.0f, 0.0f, 0.0f); mCamCenter.set(i_center.x, i_center.y, i_center.z); @@ -433,7 +433,7 @@ void daE_PM_c::SetStopCam(cXyz i_center, f32 i_offsetXZ, f32 i_offsetY, s16 i_an } void daE_PM_c::SetMoveCam2(f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cLib_addCalcPos(&mCamCenterTarget2, mCamCenterTarget, i_scale * 2.0f, i_step * 2.0f, 0.0f); cLib_addCalcPos(&mCamCenter, mCamCenterTarget2, i_scale, i_step, 0.0f); cLib_addCalcPos(&mCamEyeTarget2, mCamEyeTarget, i_scale * 2.0f, 160.0f, 0.0f); @@ -442,14 +442,14 @@ void daE_PM_c::SetMoveCam2(f32 i_scale, f32 i_step) { } void daE_PM_c::SetMoveCam(f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cLib_addCalcPos(&mCamCenter, mCamCenterTarget, i_scale, i_step, 0.0f); cLib_addCalcPos(&mCamEye, mCamEyeTarget, i_scale, 100.0f, 0.0f); camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } void daE_PM_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCamCenter, mCamEye); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -458,7 +458,7 @@ void daE_PM_c::SetReleaseCam() { void daE_PM_c::Ap_StartAction() { cXyz offset; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz player_pos(-10728.0f, s_LinkPos->y, 17052.0f); cXyz player_offset(0.0f, 0.0f, 0.0f); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -2671,7 +2671,7 @@ void daE_PM_c::setLampBaseMtx() { } mDoMtx_stack_c::transS(vec2.x, vec2.y, vec2.z); - vec1 = dComIfGp_getCamera(0)->lookat.eye - vec2; + vec1 = dComIfGp_getCamera(0)->view.lookat.eye - vec2; mDoMtx_stack_c::YrotM(cM_atan2s(vec1.x, vec1.z)); mDoMtx_stack_c::XrotM(-cM_atan2s(vec1.y, JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z))); mDoMtx_stack_c::scaleM(l_HIO.mGlowEffectScale, l_HIO.mGlowEffectScale, l_HIO.mGlowEffectScale); diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 9a13c7e182..c4790c355e 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -220,8 +220,8 @@ static void e_po_opening(e_po_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; fopAc_ac_c* player_p = dComIfGp_getPlayer(0); - camera_class* camera1 = - static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); + camera_process_class* camera1 = + static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); camera_class* camera2 = static_cast(dComIfGp_getCamera(0)); cXyz temp_vec; @@ -839,8 +839,8 @@ static void e_po_dead(e_po_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera_player = - static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); + camera_process_class* camera_player = + static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); camera_class* camera = static_cast(dComIfGp_getCamera(0)); dBgS_LinChk lin_chk; cXyz scale(1.0f, 1.0f, 1.0f); @@ -1326,8 +1326,8 @@ static void e_po_limbering(e_po_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; fopAc_ac_c* player_p = dComIfGp_getPlayer(0); - camera_class* camera_player = - static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); + camera_process_class* camera_player = + static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); camera_class* camera = static_cast(dComIfGp_getCamera(0)); switch (i_this->mType) { @@ -1703,8 +1703,8 @@ static void e_po_holl_demo(e_po_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera_player = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera_player = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz scale(1.0f, 1.0f, 1.0f); u32 param = 7; @@ -2741,7 +2741,7 @@ static int daE_PO_Execute(e_po_class* i_this) { if (i_this->field_0x800) { MTXTrans(mDoMtx_stack_c::now, i_this->field_0x794.x, i_this->field_0x794.y, i_this->field_0x794.z); - local_4c = dComIfGp_getCamera(0)->lookat.eye - i_this->field_0x794; + local_4c = dComIfGp_getCamera(0)->view.lookat.eye - i_this->field_0x794; mDoMtx_stack_c::YrotM((int)local_4c.atan2sX_Z()); mDoMtx_stack_c::XrotM((int)local_4c.atan2sY_XZ()); mDoMtx_stack_c::scaleM(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize); diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index bb5e1c6688..3801be9c80 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -454,8 +454,8 @@ void daE_PZ_c::executeOpeningDemo() { cXyz(15.0f, 285.0f, -760.0f), }; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz sp120; @@ -479,8 +479,8 @@ void daE_PZ_c::executeOpeningDemo() { if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCameraEye = camera0->lookat.eye; - mDemoCameraCenter = camera0->lookat.center; + mDemoCameraEye = camera0->view.lookat.eye; + mDemoCameraCenter = camera0->view.lookat.center; break; } @@ -1550,8 +1550,8 @@ void daE_PZ_c::executeDamage() { } void daE_PZ_c::executeDead() { - camera_class* sp1C = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* sp18 = dComIfGp_getCamera(0); + camera_process_class* sp1C = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* sp18 = dComIfGp_getCamera(0); fopAc_ac_c* sp14 = dComIfGp_getPlayer(0); cXyz sp68; cXyz sp5C; @@ -1577,8 +1577,8 @@ void daE_PZ_c::executeDead() { if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCameraEye = sp18->lookat.eye; - mDemoCameraCenter = sp18->lookat.center; + mDemoCameraEye = sp18->view.lookat.eye; + mDemoCameraCenter = sp18->view.lookat.center; speedF = 0.0f; mCylCollider.ClrTgHit(); diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 884ed1759d..257067c169 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -5829,7 +5829,7 @@ static void cam_spd_set(e_rd_class* i_this) { static void demo_camera(e_rd_class* i_this) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; daPy_py_c* pla = (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)); camera_class* camera0 = (camera_class*) dComIfGp_getCamera(0); daNPC_TK_c* taka = (daNPC_TK_c*) fopAcM_SearchByName(PROC_NPC_TK); fopAc_ac_c* actor = taka; @@ -5917,7 +5917,7 @@ static void demo_camera(e_rd_class* i_this) { i_this->demo_cam_center = enemy->current.pos; i_this->demo_cam_center.y = (enemy->eyePos.y - 80.0f) + 60.0f + TREG_F(5); - i_this->demo_cam_eye = camera0->lookat.eye; + i_this->demo_cam_eye = camera0->view.lookat.eye; enemy->current.angle.y = i_this->angleY; i_this->field_0x1300 = 2000.0f; // fallthrough @@ -5970,8 +5970,8 @@ static void demo_camera(e_rd_class* i_this) { i_this->demo_cam_zoom = 55.0f; camera->mCamera.SetTrimSize(3); - i_this->demo_cam_center = camera0->lookat.center; - i_this->demo_cam_eye = camera0->lookat.eye; + i_this->demo_cam_center = camera0->view.lookat.center; + i_this->demo_cam_eye = camera0->view.lookat.eye; i_this->field_0x12cc.set(-7875.0f, 2125.0f, 7895.0f); i_this->field_0x12c0.set(-7527.0f, 2084.0f, 7552.0f); cam_spd_set(i_this); @@ -6584,7 +6584,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { if (i == 0) { mae.set(38.0f, 0.0f, 0.0f); MtxPosition(&mae, &ato); - mae = camera->lookat.eye - ato; + mae = camera->view.lookat.eye - ato; y = cM_atan2s(mae.x, mae.z); x = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 6f60344479..48a0872833 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1088,7 +1088,7 @@ static void cam_spd_set(e_rdb_class* i_this) { static void demo_camera(e_rdb_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy; 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)); cXyz sp28, sp34, sp40, sp4c; s8 sVar1 = 0; diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 05971e055f..3f37e1c119 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -3793,8 +3793,8 @@ static void* s_adel_sub(void* i_proc, void* i_this) { static void demo_camera(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz vec1, vec2, vec3, vec4, vec5; u8 unused_u8 = 1; (void) unused_u8; @@ -3817,8 +3817,8 @@ static void demo_camera(e_rdy_class* i_this) { player_camera->mCamera.SetTrimSize(3); daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(0x38, 0, 0, 0); - i_this->mCamEye = camera->lookat.eye; - i_this->mCamCenter = camera->lookat.center; + i_this->mCamEye = camera->view.lookat.eye; + i_this->mCamCenter = camera->view.lookat.center; s16 sang_y_diff = a_karg->shape_angle.y - player->shape_angle.y; if (sang_y_diff > 0) { i_this->field_0x13d4 = -0x4000; @@ -4504,7 +4504,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) { if (i == 0) { vec1.set(38.0f, 0.0f, 0.0f); MtxPosition(&vec1, &vec2); - vec1 = camera->lookat.eye - vec2; + vec1 = camera->view.lookat.eye - vec2; ang_y = cM_atan2s(vec1.x, vec1.z); ang_x = -cM_atan2s(vec1.y, JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z)); scale = vec1.abs() * (0.001f + JREG_F(8)); diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index f91adc3e2e..0d28f23cda 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -1596,8 +1596,8 @@ static void ke_set(e_s1_class* i_this) { static void demo_camera(e_s1_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* spC = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* spC = dComIfGp_getCamera(0); cXyz spC4; cXyz spD0; diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index 22e73cfb0b..a989779dfb 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -1364,7 +1364,7 @@ static void anm_se_set(e_sf_class* i_this) { static void demo_camera(e_sf_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dComIfGp_getCamera(0); cXyz sp30, sp3c, sp48, sp54; s8 sVar1 = 0; diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index b05c57eef8..397f067d20 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1003,7 +1003,7 @@ static int daE_SH_Execute(e_sh_class* i_this) { MTXCopy(model->getAnmMtx(13), *calc_mtx); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); s16 rotX; s16 rotY; @@ -1014,7 +1014,7 @@ static int daE_SH_Execute(e_sh_class* i_this) { if (i == 0) { unkXyz1.set(15.0f + TREG_F(0), 3.5f + TREG_F(1), TREG_F(2)); MtxPosition(&unkXyz1, &unkXyz2); - unkXyz1 = camera->lookat.eye - unkXyz2; + unkXyz1 = camera->view.lookat.eye - unkXyz2; rotY = cM_atan2s(unkXyz1.x, unkXyz1.z); rotX = -cM_atan2s(unkXyz1.y, JMAFastSqrt(unkXyz1.x * unkXyz1.x + unkXyz1.z * unkXyz1.z)); diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 51e7972f24..3e05e7ad61 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -1373,7 +1373,7 @@ bool daE_SM_c::CheckViewArea() { } bool daE_SM_c::CameraSet() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); bool rv; @@ -1396,7 +1396,7 @@ bool daE_SM_c::CameraSet() { } void daE_SM_c::SetStopCam(cXyz param_1, f32 param_2, f32 param_3, s16 param_4) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp28(0.0f, param_3, param_2); cXyz eye(0.0f, 0.0f, 0.0f); @@ -1414,12 +1414,12 @@ void daE_SM_c::SetCMoveCam(cXyz param_1, f32 i_scale, f32 i_maxStep) { } void daE_SM_c::SetStopingCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mFovy, 0); } void daE_SM_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mDemoCamCenter, mDemoCamEye); camera->mCamera.Start(); diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index e1bd691a5d..c81be26d70 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -1358,15 +1358,15 @@ static int daE_SM2_Execute(e_sm2_class* i_this) { if (i_this->field_0x83e != 0) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz start; cXyz end; i_this->field_0x83e--; - start.x = camera->lookat.eye.x; - start.y = camera->lookat.eye.y; - start.z = camera->lookat.eye.z; + start.x = camera->view.lookat.eye.x; + start.y = camera->view.lookat.eye.y; + start.z = camera->view.lookat.eye.z; end = actor->current.pos; end.y += 20.0f; diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 62b0ada490..b1b861e86a 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -1158,7 +1158,7 @@ static void* s_child_sub(void* i_actor, void* i_data) { } void daE_SW_c::executeMaster() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); attention_info.flags = 0; @@ -2106,7 +2106,7 @@ bool daE_SW_c::d_chaseCheck() { } } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 sVar1 = cLib_distanceAngleS(fopCamM_GetAngleY(camera), field_0x6cc); if (bVar1 || (sVar1 > 0x6000 && (abs((s16)(current.angle.y - field_0x6cc)) < 0x2000 || diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index cb9caf6fa0..d030dd7565 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -683,8 +683,8 @@ static void cam_3d_morf(e_th_class* i_this, f32 param_1) { static void demo_camera(e_th_class* i_this) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); cXyz sp8C; cXyz sp80; cXyz sp74; diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index a8ad219025..1c26e5c721 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -1078,7 +1078,7 @@ void daE_TT_c::action() { mSound.setLinkSearch(linkSearch); if (mAction != ACTION_DEATH && !fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) { dBgS_LinChk linChk; - linChk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + linChk.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&linChk)) { attention_info.flags = 0; } else { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 64029be198..a660d5bead 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -1441,7 +1441,7 @@ void daE_VA_c::executeDemoOpWait() { } void daE_VA_c::executeDemoOp() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp2C; cXyz sp38; f32 old; @@ -2917,7 +2917,7 @@ void daE_VA_c::executeOpaciFadeAway() { } void daE_VA_c::executeOpaciDeath() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp24; cXyz sp30; diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index ca93e3a89d..e011101282 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -292,8 +292,8 @@ static void demo_camera(e_warpappear_class* i_this) { }; daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daHorse_c* horse = (daHorse_c*)dComIfGp_getHorseActor(); cXyz sp48, sp54; diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 587f091acf..bf0ea1ddaa 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -3706,8 +3706,8 @@ static void cam_3d_morf(e_wb_class* i_this, f32 i_scale) { static void demo_camera(e_wb_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; - camera_class* local_184 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* local_188 = dComIfGp_getCamera(0); + camera_process_class* local_184 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* local_188 = dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); daHorse_c* horse; e_rd_class* local_194; diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 4385f5e916..2ca44c2c19 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -650,7 +650,7 @@ static cXyz create_pos[15] = { }; void daE_WW_c::executeMaster() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp48 = daPy_getPlayerActorClass()->current.pos; f32 temp_f30 = sp48.absXZ(current.pos); cXyz sp3C; @@ -1055,7 +1055,7 @@ void daE_WW_c::executeAttack() { bool daE_WW_c::checkAttackStart() { if (field_0x734 == 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 temp_r28 = (fopCamM_GetAngleY(camera) + 0x8000) - fopAcM_searchPlayerAngleY(this); cXyz sp14 = daPy_getPlayerActorClass()->current.pos; @@ -1880,7 +1880,7 @@ void daE_WW_c::action() { if (field_0x75d) { dBgS_LinChk lin_chk; - lin_chk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + lin_chk.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 38e63b4fa4..e77595aae9 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3137,7 +3137,7 @@ void daE_YM_c::action() { offWolfNoLock(); if (mType == 1 && fopAcM_CheckCondition(this, 4) == 0) { dBgS_LinChk lin_chk; - lin_chk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + lin_chk.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { onWolfNoLock(); } diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 70142c8597..74c4743c4f 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -1316,7 +1316,7 @@ void daE_YMB_c::executeGuard() { } void daE_YMB_c::executeSwim() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 camAngleY = (s16) fopCamM_GetAngleY(camera); s16 cam_ply_ang_diff = camAngleY - fopAcM_searchPlayerAngleY(this); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -2062,7 +2062,7 @@ void daE_YMB_c::setCreateDrop() { } void daE_YMB_c::executeDeath() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp24, pos; @@ -2207,7 +2207,7 @@ void daE_YMB_c::demo_skip(int param_1) { break; } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mDemoCamCenter, mDemoCamEye); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -2230,7 +2230,7 @@ void daE_YMB_c::calcLakeDemoPlayerPos() { } void daE_YMB_c::executeLakeDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp24; @@ -2391,7 +2391,7 @@ void daE_YMB_c::executeLakeDemo() { } void daE_YMB_c::executeStartDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp28, sp34; @@ -2591,7 +2591,7 @@ bool daE_YMB_c::checkStartBattleDemo() { } void daE_YMB_c::executeBattleDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp1c(player->current.pos); cXyz sp28, sp34; diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 099d07ce37..ea97676244 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -316,14 +316,14 @@ static void* s_BallSearch_Tag(void* i_actor, void* i_data) { } bool daE_ZH_c::startDemoCheck() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera2 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera2 = dComIfGp_getCamera(0); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(dEvtCnd_CANDEMO_e); - mDemoCamEye = camera2->lookat.eye; - mDemoCamCenter = camera2->lookat.center; + mDemoCamEye = camera2->view.lookat.eye; + mDemoCamCenter = camera2->view.lookat.center; return false; } @@ -745,7 +745,7 @@ void daE_ZH_c::damage_check() { } void daE_ZH_c::executeStartDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp48; f32 fVar1, fVar2; @@ -832,7 +832,7 @@ void daE_ZH_c::executeWait() { void daE_ZH_c::executeBallWait() { dBgS_LinChk lin_chk; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz spa4, spb0; switch (mMoveMode) { @@ -963,7 +963,7 @@ void daE_ZH_c::executeBallWait() { } void daE_ZH_c::executeOpenStart() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp28, sp34; field_0xb40.OnCoSPrmBit(0x40); @@ -1563,7 +1563,7 @@ void daE_ZH_c::executeCatchFlyMove() { } void daE_ZH_c::executeReturnDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp1c, sp28; s16 sVar1; diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 433a9030b1..fd6f20f3eb 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -2201,7 +2201,7 @@ void daHorse_c::setMatrix() { } void daHorse_c::setDashEffect(u32* i_emitterID) { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz* eye_p = fopCamM_GetEye_p(camera_p); if (eye_p->abs(current.pos) > 1200.0f) { diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index de8cd355c4..0fe3243d04 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -3346,7 +3346,7 @@ void daKago_c::setDamageEffect() { void daKago_c::setDashBlurEffect(int param_0) { UNUSED(param_0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz cameraEye = dCam_getBody()->Eye(); cXyz cameraEyeOffset; cXyz local_78; diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 00416444ed..1bebf6216c 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -16,12 +16,12 @@ static cXyz get_check_pos(kytag00_class* i_this) { cXyz pos; if (player_p != NULL) { - f32 dist_to_cameye = a_this->current.pos.abs(camera_p->lookat.eye); + f32 dist_to_cameye = a_this->current.pos.abs(camera_p->view.lookat.eye); f32 dist_to_player = a_this->current.pos.abs(player_p->current.pos); pos = player_p->current.pos; if (dComIfGp_event_runCheck() && dist_to_cameye < dist_to_player) { - pos = camera_p->lookat.eye; + pos = camera_p->view.lookat.eye; } } else { pos.set(0.0f, 0.0f, 0.0f); diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 2025f6acf1..05f55eb5c5 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -18,12 +18,12 @@ static cXyz get_check_pos(kytag01_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz pos; - f32 dist_to_cameye = a_this->current.pos.abs(camera->lookat.eye); + f32 dist_to_cameye = a_this->current.pos.abs(camera->view.lookat.eye); f32 dist_to_player = a_this->current.pos.abs(player->current.pos); if (dComIfGp_event_runCheck()) { if (dist_to_cameye < dist_to_player) { - pos = camera->lookat.eye; + pos = camera->view.lookat.eye; } else { pos = player->current.pos; } @@ -70,13 +70,13 @@ static void mist_tag_move(kytag01_class* i_this) { var_f31 *= i_this->field_0x594; - spBC = camera->lookat.center; - spBC.y = camera->lookat.eye.y; + spBC = camera->view.lookat.center; + spBC.y = camera->view.lookat.eye.y; - dKyr_get_vectle_calc(&camera->lookat.eye, &spBC, &sp98); - sp80.y = camera->lookat.eye.y; + dKyr_get_vectle_calc(&camera->view.lookat.eye, &spBC, &sp98); + sp80.y = camera->view.lookat.eye.y; - dKyr_get_vectle_calc(&camera->lookat.eye, &sp80, &spA4); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &sp80, &spA4); s16 var_r29_2 = cM_atan2s(sp98.x, sp98.z); s16 var_r26 = cM_atan2s(spA4.x, spA4.z); @@ -111,7 +111,7 @@ static int daKytag01_Draw(kytag01_class* i_this) { static int daKytag01_Execute(kytag01_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); fopAc_ac_c* player = dComIfGp_getPlayer(0); if ((a_this->argument & 0xFF) == 2) { diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index b1a5c745ea..9c07bf1239 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -105,7 +105,7 @@ static dPath* set_path_info(fopAc_ac_c* i_actor) { } static void getSound_pos(fopAc_ac_c* i_actor) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz eye = camera->mCamera.Eye(); cXyz sp28; @@ -161,8 +161,8 @@ static void odour_move(kytag03_class* i_this) { if (path != NULL) { int sp40; int sp38; - var_r27 = get_Extent_pos_start_get(i_this, path, &camera->lookat.eye, 1000.0f, &sp40); - var_r25 = get_Extent_pos_end_get(i_this, path, &camera->lookat.eye, 1000.0f, &sp38); + var_r27 = get_Extent_pos_start_get(i_this, path, &camera->view.lookat.eye, 1000.0f, &sp40); + var_r25 = get_Extent_pos_end_get(i_this, path, &camera->view.lookat.eye, 1000.0f, &sp38); s16 spA; s16 sp8; @@ -214,7 +214,7 @@ static void odour_move(kytag03_class* i_this) { temp_f22 *= temp_f22; var_f23 *= i_this->field_0x57c; - f32 var_f1_4 = camera->lookat.eye.abs(sp94); + f32 var_f1_4 = camera->view.lookat.eye.abs(sp94); if (var_f23 > 0.0f && var_f1_4 < 4000.0f) { csXyz spFC; cXyz spB8; diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index f1b6f691b4..b246ce93e5 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -13,7 +13,7 @@ static int daKytag04_Draw(kytag04_class* i_this) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); Mtx sp40; cXyz sp50; cXyz sp5C; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index b4e1b87131..45b52b9999 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -513,7 +513,7 @@ static void daKytag06_type_07_Execute(kytag06_class* i_this) { cXyz spX; f32 current_time = dComIfGs_getTime(); dScnKy_env_light_c* env_light = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (i_this->field_0x574 == 0) { if (current_time > 285.0f || current_time < 82.5f) { @@ -573,7 +573,7 @@ static void daKytag06_type_07_Execute(kytag06_class* i_this) { daKytag06_type_07_wether_Execute(i_this); if (camera != NULL) { - if (camera->lookat.eye.y > 0.0f) { + if (camera->view.lookat.eye.y > 0.0f) { dKy_BossLight_set(&spX, &color, i_this->mWindPower * 2.0f, 0); g_env_light.bg_amb_col[3].r = (u8)(i_this->mWindPower * 230.0f + 25.0f); g_env_light.bg_amb_col[3].g = (u8)(i_this->mWindPower * 215.0f + 30.0f); @@ -711,9 +711,9 @@ static void daKytag06_type_10_Execute(kytag06_class* i_this) { } dKyw_evt_wind_set_go(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); - cXyz eye(camera->lookat.eye); + cXyz eye(camera->view.lookat.eye); if (camera != NULL) { if (((eye.x > 2079.0f && eye.x < 3013.0f && eye.y < 864.0f && eye.z > -6000.0f && @@ -865,12 +865,12 @@ static int daKytag06_Execute(kytag06_class* i_this) { switch (i_this->mType) { case 1: { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (i_this->mpPath != NULL) { int target1 = 0; int target2 = 0; - dPnt* pnt = near_rail_get(i_this, &camera->lookat.eye); + dPnt* pnt = near_rail_get(i_this, &camera->view.lookat.eye); if (pnt != NULL && pnt->mArg0 != 0xFF) { dKy_change_colpat(pnt->mArg0); diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index 57db98a16e..b0d7d55023 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -64,7 +64,7 @@ static dPath* get_Extent_pos_end_get(kytag10_class* i_this, dPath* i_path, cXyz* } static void sparks_move(kytag10_class* i_this) { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz ratio_pos_1; cXyz ratio_pos_2; @@ -76,11 +76,11 @@ static void sparks_move(kytag10_class* i_this) { if (path_p != NULL) { int start_point_idx; - dPath* path_start = get_Extent_pos_start_get(i_this, path_p, &camera_p->lookat.eye, + dPath* path_start = get_Extent_pos_start_get(i_this, path_p, &camera_p->view.lookat.eye, 1000.0f, &start_point_idx); int end_point_idx; - dPath* path_end = get_Extent_pos_end_get(i_this, path_p, &camera_p->lookat.eye, 1000.0f, + dPath* path_end = get_Extent_pos_end_get(i_this, path_p, &camera_p->view.lookat.eye, 1000.0f, &end_point_idx); s16 spD6; diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index a320e1b875..d6e90889b7 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -67,7 +67,7 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { } } - snow_packet->field_0x6d74 = camera->lookat.eye; + snow_packet->field_0x6d74 = camera->view.lookat.eye; sp110.x = sp110.y = sp110.z = 0.0f; cXyz* temp_r27 = dKyw_get_wind_vec(); @@ -87,9 +87,9 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { dKyr_get_vectle_calc(&sp158, &a_this->current.pos, &sp64); cXyz sp170; - sp88.x = camera->lookat.center.x - camera->lookat.eye.x; + sp88.x = camera->view.lookat.center.x - camera->view.lookat.eye.x; sp88.y = 0.0; - sp88.z = camera->lookat.center.z - camera->lookat.eye.z; + sp88.z = camera->view.lookat.center.z - camera->view.lookat.eye.z; vectle_calc(&sp88, &sp170); snow_packet->field_0x6d84 = cM3d_VectorProduct2d(0.0f, 0.0f, -sp11c.x, -sp11c.z, sp170.x, sp170.z); @@ -170,11 +170,11 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { var_f29 = 0.0f; } - if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f) { + if (camera->view.lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f) { var_f28 = temp_f30; } - if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mBasePos) < 500.0f) { + if (camera->view.lookat.eye.abs(snow_packet->mSnowEff[i].mBasePos) < 500.0f) { var_f29 = temp_f30; } diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index cd3ff1ef19..02801d4b98 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -321,8 +321,8 @@ static int daFshop_Draw(fshop_class* i_this) { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); for (int i = 0; i < 48; i++) { - f32 fVar4 = i_this->mLure[i].field_0x00.x - camera->lookat.eye.x; - f32 fVar5 = i_this->mLure[i].field_0x00.z - camera->lookat.eye.z; + f32 fVar4 = i_this->mLure[i].field_0x00.x - camera->view.lookat.eye.x; + f32 fVar5 = i_this->mLure[i].field_0x00.z - camera->view.lookat.eye.z; if (SQUARE(fVar4) + SQUARE(fVar5) > KREG_F(11) + 1200.0f) { g_env_light.setLightTevColorType_MAJI(i_this->mLure[i].model, &actor->tevStr); mDoExt_modelUpdateDL(i_this->mLure[i].model); @@ -1037,7 +1037,7 @@ static int daFshop_Execute(fshop_class* i_this) { mDoMtx_stack_c::scaleM(actor->scale.x, actor->scale.x, actor->scale.x); mDoMtx_stack_c::transM(0.0f, (190.0f + hREG_F(11)) * actor->scale.x, 0.0f); - local_cc = pmVar11->lookat.eye - actor->current.pos; + local_cc = pmVar11->view.lookat.eye - actor->current.pos; mDoMtx_stack_c::YrotM(cM_atan2s(local_cc.x, local_cc.z)); mDoMtx_stack_c::XrotM(-cM_atan2s(local_cc.y, JMAFastSqrt((local_cc.x * local_cc.x + local_cc.z * local_cc.z)))); i_this->ballModel->setBaseTRMtx(mDoMtx_stack_c::get()); diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index c849337c1e..830f5a9553 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -221,9 +221,9 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) { } else { if (dComIfGp_checkPlayerStatus0(0, 0x2000)) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(0); - f32 dx = player->current.pos.x - camera->lookat.eye.x; - f32 dz = player->current.pos.z - camera->lookat.eye.z; + camera_process_class* camera = dComIfGp_getCamera(0); + f32 dx = player->current.pos.x - camera->view.lookat.eye.x; + f32 dz = player->current.pos.z - camera->view.lookat.eye.z; if ((SQUARE(dx) + SQUARE(dz)) < 5000.0f) { return 1; @@ -1085,9 +1085,9 @@ static void lure_onboat(dmg_rod_class* i_this) { i_this->timers[1] = 10; i_this->field_0x14f8 = 0; - camera_class* camera = dComIfGp_getCamera(0); - f32 x_delta = camera->lookat.center.x - camera->lookat.eye.x; - f32 z_delta = camera->lookat.center.z - camera->lookat.eye.z; + camera_process_class* camera = dComIfGp_getCamera(0); + f32 x_delta = camera->view.lookat.center.x - camera->view.lookat.eye.x; + f32 z_delta = camera->view.lookat.center.z - camera->view.lookat.eye.z; i_this->field_0x1418 = cM_atan2s(x_delta, z_delta); daAlink_getAlinkActorClass()->setCanoeFishingWaitAngle(i_this->field_0x1418); @@ -1267,7 +1267,7 @@ static int lure_standby(dmg_rod_class* i_this) { i_this->action = ACTION_LURE_ONBOAT; i_this->play_cam_mode = 0; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(i_this->play_cam_center, i_this->play_cam_eye, i_this->play_cam_fovy, 0); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -1301,7 +1301,7 @@ static void lure_cast(dmg_rod_class* i_this) { i_this->action = ACTION_LURE_ONBOAT; i_this->play_cam_mode = 0; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(i_this->play_cam_center, i_this->play_cam_eye, i_this->play_cam_fovy, 0); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -2301,7 +2301,7 @@ static void lure_action(dmg_rod_class* i_this) { i_this->play_cam_mode = 20; i_this->play_cam_timer = 0; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); i_this->action = ACTION_LURE_BARE; @@ -2690,7 +2690,7 @@ static void lure_catch(dmg_rod_class* i_this) { i_this->field_0x1418 = daAlink_getAlinkActorClass()->shape_angle.y; i_this->camera_morf_rate = 0.0f; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); daAlink_getAlinkActorClass()->onFishingKeep(); data_80450C9B = 2; @@ -2778,7 +2778,7 @@ static void lure_bare(dmg_rod_class* i_this) { i_this->play_cam_mode = 5; i_this->camera_morf_rate = 1.0f; i_this->field_0x1407 = 110; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); i_this->action = ACTION_LURE_ACTION; i_this->field_0x1006 = 0; @@ -2884,7 +2884,7 @@ static void lure_heart(dmg_rod_class* i_this) { i_this->field_0x1418 = daAlink_getAlinkActorClass()->shape_angle.y; i_this->camera_morf_rate = 0.0f; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); daAlink_getAlinkActorClass()->onFishingKeep(); @@ -4470,8 +4470,8 @@ static void play_camera(dmg_rod_class* i_this) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); fopAc_ac_c* mgfish_a = fopAcM_SearchByID(i_this->mg_fish_id); mg_fish_class* mgfish = (mg_fish_class*)mgfish_a; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); dBgS_GndChk gndChk; dBgS_ObjGndChk_Spl sp1F0; @@ -4531,8 +4531,8 @@ static void play_camera(dmg_rod_class* i_this) { i_this->field_0x1428 = 100.0f + WREG_F(1); sp58 = (camera_class*)dComIfGp_getCamera(0); - i_this->field_0x144c = sp58->lookat.eye; - i_this->field_0x1458 = sp58->lookat.center; + i_this->field_0x144c = sp58->view.lookat.eye; + i_this->field_0x1458 = sp58->view.lookat.center; i_this->play_cam_eye = i_this->field_0x144c; i_this->play_cam_center = i_this->field_0x1458; @@ -4778,8 +4778,8 @@ static void play_camera(dmg_rod_class* i_this) { f32 sp2C = -20.0f + (20.0f * cM_ssin(i_this->counter * 700)); actor->eyePos.y = actor->current.pos.y + sp2C; if (TREG_S(7) != 0) { - camera_class* sp28 = dComIfGp_getCamera(0); - actor->eyePos = sp28->lookat.eye; + camera_process_class* sp28 = dComIfGp_getCamera(0); + actor->eyePos = sp28->view.lookat.eye; } i_this->field_0xf78 = 0.05f; break; @@ -4909,9 +4909,9 @@ static void play_camera(dmg_rod_class* i_this) { player->changeOriginalDemo(); player->changeDemoMode(1, 1, 0, 0); - sp174.x = camera0->lookat.eye.x - camera0->lookat.center.x; - sp174.y = camera0->lookat.eye.y - camera0->lookat.center.y; - sp174.z = camera0->lookat.eye.z - camera0->lookat.center.z; + sp174.x = camera0->view.lookat.eye.x - camera0->view.lookat.center.x; + sp174.y = camera0->view.lookat.eye.y - camera0->view.lookat.center.y; + sp174.z = camera0->view.lookat.eye.z - camera0->view.lookat.center.z; i_this->field_0x1400 = cM_atan2s(sp174.x, sp174.z) - player->shape_angle.y; if (i_this->field_0x1400 >= 0) { @@ -4922,7 +4922,7 @@ static void play_camera(dmg_rod_class* i_this) { i_this->field_0x1404 = -cM_atan2s(sp174.y, JMAFastSqrt(SQUARE(sp174.x) + SQUARE(sp174.z))); i_this->field_0x1464 = sp174.abs(); - i_this->play_cam_center_target = camera0->lookat.center; + i_this->play_cam_center_target = camera0->view.lookat.center; case 901: if (daAlink_getAlinkActorClass()->checkCanoeRide()) { fopAc_ac_c* sp24 = fopAcM_SearchByID(i_this->boat_actor_id); @@ -5300,7 +5300,7 @@ static void play_camera_u(dmg_rod_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); fopAc_ac_c* mgfish_a = fopAcM_SearchByID(i_this->mg_fish_id); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); i_this->field_0x13b0 = i_this->rod_substick_y; i_this->field_0x13ac = i_this->rod_substick_x; @@ -5327,8 +5327,8 @@ static void play_camera_u(dmg_rod_class* i_this) { camera_class* sp10 = (camera_class*)dComIfGp_getCamera(0); camera->mCamera.SetTrimSize(1); - i_this->play_cam_eye = sp10->lookat.eye; - i_this->play_cam_center = sp10->lookat.center; + i_this->play_cam_eye = sp10->view.lookat.eye; + i_this->play_cam_center = sp10->view.lookat.center; i_this->camera_morf_rate = 1000.0f; } /* fallthrough */ @@ -6048,7 +6048,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { static int dmg_rod_IsDelete(dmg_rod_class* i_this) { if (i_this->play_cam_mode != 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(i_this->play_cam_center, i_this->play_cam_eye, i_this->play_cam_fovy, 0); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 48d785a7ce..10c0fe849a 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -708,13 +708,13 @@ BOOL daNbomb_c::procExplodeInit() { } BOOL daNbomb_c::procExplode() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 dist_scale = 0.0f; mLightInfluence.mPow = mExplosionStrength * 1500.0f; mWindInfluence.mStrength = mExplosionStrength; - f32 dist_to_cam = current.pos.abs(camera->lookat.eye); + f32 dist_to_cam = current.pos.abs(camera->view.lookat.eye); if (dist_to_cam < 1500.0f) { dist_scale = dist_to_cam / 1500.0f; dist_scale *= dist_scale * dist_scale; diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 9d31126b3e..720f86b6c9 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -1040,8 +1040,8 @@ static int ni_play(ni_class* i_this) { sp78.y = 0.0f; sp78.z = -i_this->mPadMainStickY; - camera_class* camera = dComIfGp_getCamera(0); - sp84 = camera->lookat.center - camera->lookat.eye; + camera_process_class* camera = dComIfGp_getCamera(0); + sp84 = camera->view.lookat.center - camera->view.lookat.eye; cMtx_YrotS(*calc_mtx, cM_atan2s(-sp84.x, -sp84.z)); MtxPosition(&sp78, &sp84); @@ -1159,7 +1159,7 @@ static int ni_play(ni_class* i_this) { static void play_camera(ni_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera0 = (camera_class*)dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz sp1D8; @@ -1200,8 +1200,8 @@ static void play_camera(ni_class* i_this) { camera->mCamera.Stop(); i_this->field_0xafc = 500.0f; - i_this->field_0xac8 = camera0->lookat.eye; - i_this->field_0xad4 = camera0->lookat.center; + i_this->field_0xac8 = camera0->view.lookat.eye; + i_this->field_0xad4 = camera0->view.lookat.center; i_this->field_0xaec = dComIfGd_getView()->fovy; player->changeOriginalDemo(); diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 0b41cad2b4..55a35befc2 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -152,10 +152,10 @@ static int daNpc_Henna_Draw(npc_henna_class* i_this) { g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); if (i_this->field_0x694 == 0) { - camera_class* camera = dComIfGp_getCamera(0); - f32 lookOffsetX = camera->lookat.eye.x - a_this->current.pos.x; - f32 lookOffsetY = camera->lookat.eye.y - a_this->current.pos.y; - f32 lookOffsetZ = camera->lookat.eye.z - a_this->current.pos.z; + camera_process_class* camera = dComIfGp_getCamera(0); + f32 lookOffsetX = camera->view.lookat.eye.x - a_this->current.pos.x; + f32 lookOffsetY = camera->view.lookat.eye.y - a_this->current.pos.y; + f32 lookOffsetZ = camera->view.lookat.eye.z - a_this->current.pos.z; if (lookOffsetY > 190.0f + JREG_F(16) || lookOffsetY < 0.0f || lookOffsetX * lookOffsetX + lookOffsetZ * lookOffsetZ > 700.0f + JREG_F(17)) { @@ -658,11 +658,11 @@ static void henna_ride(npc_henna_class* i_this) { } if (dComIfGp_checkPlayerStatus0(0, 0x2000) != 0) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz vecToPlayer; - vecToPlayer = actor->eyePos - camera->lookat.eye; - lookat_pos = camera->lookat.center - camera->lookat.eye; + vecToPlayer = actor->eyePos - camera->view.lookat.eye; + lookat_pos = camera->view.lookat.center - camera->view.lookat.eye; s16 reg_r27 = (s16)cM_atan2s(lookat_pos.x, lookat_pos.z); s16 sp_0x8 = (s16)cM_atan2s(vecToPlayer.x, vecToPlayer.z); @@ -848,11 +848,11 @@ static void cam_3d_morf(npc_henna_class* i_this, f32 param_1) { static void demo_camera(npc_henna_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - camera_class* camera; + camera_process_class* camera; fopAc_ac_c* unused1 = dComIfGp_getPlayer(0); camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* unused2 = dComIfGp_getCamera(0); + camera_process_class* unused2 = dComIfGp_getCamera(0); cXyz unkXyz; cXyz unkXyz2; // unused @@ -923,16 +923,16 @@ static int zoom_check(npc_henna_class* i_this, cXyz* target, s16 tolerance) { // unused assignments are needed for debug match fopAc_ac_c* a_this = &i_this->actor; fopAc_ac_c* unusedPlayer = (fopAc_ac_c*)dComIfGp_getPlayer(0); - camera_class* unusedCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* unusedCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera = (camera_class*)dComIfGp_getCamera(0); cXyz target_pos; cXyz lookat_pos; - target_pos = *target - camera->lookat.eye; + target_pos = *target - camera->view.lookat.eye; if (JMAFastSqrt(target_pos.x * target_pos.x + target_pos.z * target_pos.z) < 300.0f + XREG_F(10)) { - lookat_pos = camera->lookat.center - camera->lookat.eye; + lookat_pos = camera->view.lookat.center - camera->view.lookat.eye; s16 lookat_angle = (s16)cM_atan2s(lookat_pos.x, lookat_pos.z); s16 target_angle = (s16)cM_atan2s(target_pos.x, target_pos.z); lookat_angle -= target_angle; @@ -984,8 +984,8 @@ static void demo_camera_shop(npc_henna_class* i_this) { fopAc_ac_c* actor = &i_this->actor; fopAc_ac_c* player = dComIfGp_getPlayer(0); - camera_class* playerCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* playerCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz unkXyz_78; cXyz unkXyz_6c; @@ -1407,14 +1407,14 @@ static void demo_camera_shop(npc_henna_class* i_this) { i_this->field_0x7bc = 50.0f; playerCamera->mCamera.SetTrimSize(1); daPy_getPlayerActorClass()->onPlayerNoDraw(); - unkXyz_78 = camera->lookat.center - camera->lookat.eye; + unkXyz_78 = camera->view.lookat.center - camera->view.lookat.eye; i_this->field_0x758 = (s16) cM_atan2s(unkXyz_78.x, unkXyz_78.z); i_this->field_0x75c = -cM_atan2s( unkXyz_78.y, JMAFastSqrt(unkXyz_78.x * unkXyz_78.x + unkXyz_78.z * unkXyz_78.z)); i_this->field_0x7c4 = unkXyz_78.abs(); } case 41: { - i_this->field_0x760 = camera->lookat.eye; + i_this->field_0x760 = camera->view.lookat.eye; cMtx_YrotS(*calc_mtx, i_this->field_0x758); cMtx_XrotM(*calc_mtx, i_this->field_0x75c); unkXyz_78.x = 0.0f; @@ -1422,7 +1422,7 @@ static void demo_camera_shop(npc_henna_class* i_this) { unkXyz_78.z = i_this->field_0x7c4; MtxPosition(&unkXyz_78, &i_this->field_0x76c); i_this->field_0x76c += i_this->field_0x760; - unkXyz_78 = i_this->field_0x7a8 - camera->lookat.eye; + unkXyz_78 = i_this->field_0x7a8 - camera->view.lookat.eye; if (i_this->field_0x7b4 != 8 && i_this->field_0x7b4 != 7) { cLib_addCalcAngleS2(&i_this->field_0x758, cM_atan2s(unkXyz_78.x, unkXyz_78.z), 8, 0x800); @@ -2272,7 +2272,7 @@ static void env_control(npc_henna_class* i_this) { cXyz mae; cXyz ato; dScnKy_env_light_c* env = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); mae.x = -2591.0f - player->current.pos.x; mae.z = -6742.0f - player->current.pos.z; @@ -2532,14 +2532,14 @@ static int daNpc_Henna_Execute(npc_henna_class* i_this) { i_this->field_0x694 = 0; if (i_this->field_0x7e1 == 0) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); - lookat_pos.x = camera->lookat.center.x - camera->lookat.eye.x; - lookat_pos.z = camera->lookat.center.z - camera->lookat.eye.z; + lookat_pos.x = camera->view.lookat.center.x - camera->view.lookat.eye.x; + lookat_pos.z = camera->view.lookat.center.z - camera->view.lookat.eye.z; s16 camera_rot = cM_atan2s(lookat_pos.x, lookat_pos.z); - lookat_pos.x = actor->current.pos.x - camera->lookat.eye.x; - lookat_pos.z = actor->current.pos.z - camera->lookat.eye.z; + lookat_pos.x = actor->current.pos.x - camera->view.lookat.eye.x; + lookat_pos.z = actor->current.pos.z - camera->view.lookat.eye.z; s16 angle_diff = cM_atan2s(lookat_pos.x, lookat_pos.z) - camera_rot; if (i_this->cam_mode == 0 && (angle_diff > 0x4000 || angle_diff < -0x4000) && diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 851fe491ae..3630f58d8c 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -1033,9 +1033,9 @@ static void npc_ks_home(npc_ks_class* i_this) { i_this->path_no = 0; i_this->field_0xaec = 1; if (fopAcM_CheckCondition(actor, 4) != 0) { - camera_class* camera = dComIfGp_getCamera(0); - mae.x = camera->lookat.eye.x - camera->lookat.center.x; - mae.z = camera->lookat.eye.z - camera->lookat.center.z; + camera_process_class* camera = dComIfGp_getCamera(0); + mae.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + mae.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); if ((i_this->set_id & 1) != 0) { mae.x = 100.0f; @@ -1045,7 +1045,7 @@ static void npc_ks_home(npc_ks_class* i_this) { mae.y = -50.0f; mae.z = 200.0f; MtxPosition(&mae, &ato); - actor->current.pos = camera->lookat.eye + ato; + actor->current.pos = camera->view.lookat.eye + ato; actor->old = actor->current; } } @@ -1802,12 +1802,12 @@ static void hang_end_check(npc_ks_class* i_this) { i_this->field_0xaec = 1; actor->current.angle.x = 0; if (fopAcM_CheckCondition(actor, 4) != 0) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (checkDoorDemo()) { cMtx_YrotS(*calc_mtx, player->shape_angle.y + 0x8000); } else { - mae.x = camera->lookat.eye.x - camera->lookat.center.x; - mae.z = camera->lookat.eye.z - camera->lookat.center.z; + mae.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + mae.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); } @@ -1819,7 +1819,7 @@ static void hang_end_check(npc_ks_class* i_this) { mae.y = -50.0f; mae.z = 100.0f; MtxPosition(&mae, &ato); - actor->current.pos = camera->lookat.eye + ato; + actor->current.pos = camera->view.lookat.eye + ato; actor->old = actor->current; } } @@ -2537,8 +2537,8 @@ static void* s_fsdown_sub(void* i_actor, void* i_data) { static void demo_camera(npc_ks_class* i_this) { fopAc_ac_c* actor = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* unused_cam_p = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* unused_cam_p = dComIfGp_getCamera(0); obj_sw_class* sw_p = i_this->child_no; fopAc_ac_c* base_sw_p = &sw_p->actor; cXyz mae, ato; @@ -4048,14 +4048,14 @@ static int npc_ks_option(npc_ks_class* i_this) { (fopAcM_CheckCondition(actor, 4) != 0 && fopAcM_otherBgCheck(actor, dComIfGp_getPlayer(0)))) { if (iVar1 != 0 && player3->speedF > 2.0f) { camera_class* camera = (camera_class*) dComIfGp_getCamera(0); - mae.x = camera->lookat.eye.x - camera->lookat.center.x; - mae.z = camera->lookat.eye.z - camera->lookat.center.z; + mae.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + mae.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); mae.x = 0.0f; mae.y = -50.0f; mae.z = 100.0f; MtxPosition(&mae, &ato); - ato += camera->lookat.eye; + ato += camera->view.lookat.eye; dBgS_GndChk gnd_chk; gnd_chk.SetPos(&ato); diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index e1d196d829..06b44c70bb 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -202,15 +202,15 @@ static void action(fopAc_ac_c* param_0, lf_s* pFish) { static int daNPC_LF_Execute(npc_lf_class* i_this2) { npc_lf_class* i_this = (npc_lf_class*) i_this2; - view_class* camera; + camera_class* camera; lf_s* fish; cXyz pos; cXyz pos2; camera = dComIfGp_getCamera(0); fish = i_this->mFish; for (int i = 0; i < i_this->mIter; i++, fish++) { - pos.x = fish->mPos.x - camera->lookat.eye.x; - pos.z = fish->mPos.z - camera->lookat.eye.z; + pos.x = fish->mPos.x - camera->view.lookat.eye.x; + pos.z = fish->mPos.z - camera->view.lookat.eye.z; if (JMAFastSqrt((pos.x * pos.x) + (pos.z * pos.z)) < 1500.0f) { fish->field_0x17 = 0; diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 5d1c8bde1e..a424218841 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -2345,13 +2345,13 @@ static void action(npc_ne_class* i_this) { } else if (!i_this->mNoFollow) { if (i_this->mDistToTarget > 700.0f && fopAcM_CheckCondition(_this, 4) && player->speedF > 2.0f) { - camera_class* camera = dComIfGp_getCamera(0); - vec1.x = camera->lookat.eye.x - camera->lookat.center.x; - vec1.z = camera->lookat.eye.z - camera->lookat.center.z; + camera_process_class* camera = dComIfGp_getCamera(0); + vec1.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + vec1.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; mDoMtx_YrotS(*calc_mtx, cM_atan2s(vec1.x, vec1.z)); vec1.set(0.0f, -50.0f, 100.0f); MtxPosition(&vec1, &vec2); - vec2 += camera->lookat.eye; + vec2 += camera->view.lookat.eye; dBgS_ObjGndChk_Spl gnd_chk_spl; gnd_chk_spl.SetPos(&vec2); f32 cross = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); @@ -2603,7 +2603,7 @@ static void action(npc_ne_class* i_this) { static void demo_camera(npc_ne_class* i_this) { fopAc_ac_c* _this = static_cast(i_this); daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (i_this->mDemoTimer != 0) { i_this->mDemoTimer--; diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index cb883f0b24..4f0ba6b40b 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -126,8 +126,8 @@ static void cam_3d_morf(npc_sq_class* i_this, f32 i_scale) { static void demo_camera(npc_sq_class* i_this) { fopAc_ac_c* _this = static_cast(i_this); - camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz vec; s8 end = 0; @@ -144,8 +144,8 @@ static void demo_camera(npc_sq_class* i_this) { i_this->mCameraFovY = 55.0f; player_camera->mCamera.SetTrimSize(3); i_this->mMsgFlow.init(_this, i_this->mFlowID, 0, NULL); - i_this->mCameraEye = camera->lookat.eye; - i_this->mCameraCenter = camera->lookat.center; + i_this->mCameraEye = camera->view.lookat.eye; + i_this->mCameraCenter = camera->view.lookat.center; daPy_getPlayerActorClass()->changeOriginalDemo(); // no break diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 35879aa9cd..ed8e4d9803 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -2363,7 +2363,7 @@ int daNpc_Taro_c::cutArrowTutorial(int param_1) { mMotionSeqMngr.setNo(0, 0.0f, 0, 0); mEventTimer = timer; if (!daNpcT_chkEvtBit(0x4c)) { - camera_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); mJntAnm.lookCamera(0); mPlayerAngle = cLib_targetAngleY(fopAcM_GetPosition_p(this), fopCamM_GetEye_p(pCamera)); } else { @@ -2433,7 +2433,7 @@ int daNpc_Taro_c::cutArrowTutorial(int param_1) { case 7: if (cLib_calcTimer(&mEventTimer) == 0) { if (!daNpcT_chkEvtBit(0x4c)) { - camera_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); mJntAnm.lookCamera(0); cStack_48.y = cLib_targetAngleY(fopAcM_GetPosition_p(this), fopCamM_GetEye_p(pCamera)); } else { diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 8b83afb997..4d5440d21f 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -2848,7 +2848,7 @@ void daNPC_TK_c::checkActionSet() { } if (mFlags & 0x1) { - camera_class* cam = dComIfGp_getCamera(0); + camera_process_class* cam = dComIfGp_getCamera(0); field_0x69e = -fopCamM_GetAngleX(cam); setActionMode(3); mFlags ^= (u16)0x1; diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index 09568aa6f6..27382c969a 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -501,7 +501,7 @@ void daObjARI_c::Z_BufferChk() { vec1.y += 20.0f; mDoLib_project(&vec1, &vec2); f32 trim_height; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { trim_height = camera->mCamera.TrimHeight(); } else { diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 2085c5e0e1..c66a45b20f 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -921,7 +921,7 @@ static int daObj_Brg_Execute(obj_brg_class* i_this) { cXyz spE8; camera_class* camera = (camera_class*) dComIfGp_getCamera(0); - spC4 = a_this->current.pos - camera->lookat.eye; + spC4 = a_this->current.pos - camera->view.lookat.eye; if (i_this->field_0xb1ef != 0) { i_this->field_0xb1ef--; @@ -937,7 +937,7 @@ static int daObj_Brg_Execute(obj_brg_class* i_this) { } if (spC4.abs() > sp1BC) { - spD0 = camera->lookat.center - camera->lookat.eye; + spD0 = camera->view.lookat.center - camera->view.lookat.eye; s16 atan_res = cM_atan2s(spD0.x, spD0.z); cMtx_YrotS(*calc_mtx, -atan_res); diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 8082da406a..d40992d89c 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -291,7 +291,7 @@ void daObjCHO_c::Z_BufferChk() { vec1.y += 20.0f; mDoLib_project(&vec1, &vec2); f32 trim_height; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { trim_height = camera->mCamera.TrimHeight(); } else { diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index 58be175caf..a69083ff06 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -100,7 +100,7 @@ int daObjCRVGATE_c::checkOpen() { } void daObjCRVGATE_c::actionStartEvent() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camera_body = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { @@ -173,7 +173,7 @@ void daObjCRVGATE_c::actionDemoEvent() { ANGLE_ADD(mMoveAngle.z, 0x300); if (mDoorOpenAngle.x == 0x4000) { mEventID = 3; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCamCenter, mCamEye); camera->mCamera.Start(); diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index e8497b2985..5cdba0081f 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -269,7 +269,7 @@ void daObjDAN_c::Z_BufferChk() { vec1.y += 20.0f; mDoLib_project(&vec1, &vec2); f32 trim_height; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { trim_height = camera->mCamera.TrimHeight(); } else { diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 549bda0bb9..3dbd1123ed 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -463,7 +463,7 @@ int daObjDrop_c::actionCompleteWait() { } int daObjDrop_c::actionOrderCompleteDemo() { - camera_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (eventInfo.checkCommandDemoAccrpt()) { pcamera->mCamera.SetTrimTypeForce(1); @@ -480,7 +480,7 @@ int daObjDrop_c::actionOrderCompleteDemo() { } int daObjDrop_c::actionCompleateDemo() { - camera_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); pcamera->mCamera.SetTrimTypeForce(1); if (eventInfo.checkCommandDemoAccrpt()) { diff --git a/src/d/actor/d_a_obj_gra2_base.inc b/src/d/actor/d_a_obj_gra2_base.inc index a7b10b987a..b99ee70315 100644 --- a/src/d/actor/d_a_obj_gra2_base.inc +++ b/src/d/actor/d_a_obj_gra2_base.inc @@ -89,7 +89,7 @@ int daObj_GrA_c::waitDemo(void* param_1) { } int daObj_GrA_c::skipDemoGra() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daObj_GrA_c* gra_p = (daObj_GrA_c*)field_0x204c.getActor(); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -110,7 +110,7 @@ static int skipCallBack(void* param_1, int param_2) { int daObj_GrA_c::startDemo(void* param_1) { daPy_py_c* player = daPy_getPlayerActorClass(); daObj_GrA_c* gra_p = (daObj_GrA_c *)field_0x204c.getActor(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); switch (field_0xa7c) { diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index b94a6117e6..f1f496ce8b 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1440,7 +1440,7 @@ void daObj_GrA_c::demo_camera() { f32 fVar1; int prm_short; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); switch (mDemoCamMode) { @@ -1581,7 +1581,7 @@ void daObj_GrA_c::rollAttackedDemo() { daPy_py_c* player = daPy_getPlayerActorClass(); int cmp_val; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); switch (mDemoCamMode) { @@ -1701,7 +1701,7 @@ void daObj_GrA_c::rollAttackedDemo() { void daObj_GrA_c::graThrowDemo() { cXyz sp2c; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); switch (mDemoCamMode) { @@ -2021,7 +2021,7 @@ void daObj_GrA_c::executeCrazyThrow() { } void daObj_GrA_c::initCrazyAttack() { - camera_class* camera; + camera_process_class* camera; if (field_0x1ff0 == 3 && field_0x1ff8 == 0) { field_0x1ff0 = 4; diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 78c7653e70..1868121f5f 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -341,9 +341,9 @@ int daObjHHASHI_c::Execute(f32 (**param_1)[3][4]) { int daObjHHASHI_c::Draw() { if (dComIfGp_event_runCheck()) { - camera_class* pCamera = dComIfGp_getCamera(0); - f32 xdiff = current.pos.x - pCamera->lookat.eye.x; - f32 zdiff = current.pos.z - pCamera->lookat.eye.z; + camera_process_class* pCamera = dComIfGp_getCamera(0); + f32 xdiff = current.pos.x - pCamera->view.lookat.eye.x; + f32 zdiff = current.pos.z - pCamera->view.lookat.eye.z; if (JMAFastSqrt(xdiff * xdiff + zdiff * zdiff) < 200.0f) { return 1; } diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 43a078154c..3c6fdd1ae2 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -746,7 +746,7 @@ void daObjIceBlk_c::actionWait() { } void daObjIceBlk_c::actionOrderEvent() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (eventInfo.checkCommandDemoAccrpt()) { setAction(ACTION_EVENT_e); @@ -761,7 +761,7 @@ void daObjIceBlk_c::actionOrderEvent() { } void daObjIceBlk_c::actionEvent() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (mMode != MODE_PROC_WALK_e) { camera->mCamera.Start(); diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 919629415b..97f8029d4b 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -445,7 +445,7 @@ void daItem_c::procMainSimpleGetDemo() { current.pos.y = item_pos.y; } - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); shape_angle.x = fopCamM_GetAngleX(camera); shape_angle.y = fopCamM_GetAngleY(camera); shape_angle.z = fopCamM_GetAngleZ(camera); diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index c1435c9724..7cc28ed5cf 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -435,7 +435,7 @@ void daObjKABUTO_c::Z_BufferChk() { vec1.y += 20.0f; mDoLib_project(&vec1, &vec2); f32 trim_height; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { trim_height = camera->mCamera.TrimHeight(); } else { diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index b654e91fa5..a03409ef01 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -518,7 +518,7 @@ void daObjKAM_c::Z_BufferChk() { currentOffset = current.pos; currentOffset.y += 20.0f; mDoLib_project(¤tOffset, ¤tProj); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 cameraHeight; if (camera != NULL) { cameraHeight = camera->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 6cb86dc3e4..f4bedd7f15 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -613,7 +613,7 @@ void daObjKAT_c::Z_BufferChk() { curWithOff.y += 20.0f; mDoLib_project(&curWithOff, &projected); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 unkFloat1; if (camera != NULL) { unkFloat1 = camera->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 31481c7faf..f5d27fa4ae 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -530,7 +530,7 @@ void daObjKUW_c::Z_BufferChk() { cStack_68.y += 20.0f; mDoLib_project(&cStack_68, &local_5c); - camera_class* cc = dComIfGp_getCamera(0); + camera_process_class* cc = dComIfGp_getCamera(0); f32 trimHeight; if (cc != NULL) { trimHeight = cc->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 77011548d5..9352de063f 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -197,10 +197,10 @@ static int set_out_check(obj_lp_class* i_this, cXyz* param_2) { return 1; } - camera_class* camera = dComIfGp_getCamera(0); - sp3c = camera->lookat.center - camera->lookat.eye; + camera_process_class* camera = dComIfGp_getCamera(0); + sp3c = camera->view.lookat.center - camera->view.lookat.eye; s16 sVar1 = cM_atan2s(sp3c.x, sp3c.z); - sp3c = *param_2 - camera->lookat.eye; + sp3c = *param_2 - camera->view.lookat.eye; s16 sVar2 = cM_atan2s(sp3c.x, sp3c.z); s16 diff = sVar1 - sVar2; @@ -242,12 +242,12 @@ static int daObj_Lp_Execute(obj_lp_class* i_this) { } } - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); wd_ss* WdSs = i_this->mWdSs; for (int i = 0; i < i_this->field_0xad98; i++, WdSs++) { if ((i_this->field_0x574 + i & 0x1f) == 0) { - f32 fVar1 = WdSs->field_0x10.x - camera->lookat.eye.x; - f32 fVar2 = WdSs->field_0x10.z - camera->lookat.eye.z; + f32 fVar1 = WdSs->field_0x10.x - camera->view.lookat.eye.x; + f32 fVar2 = WdSs->field_0x10.z - camera->view.lookat.eye.z; fVar1 = JMAFastSqrt(fVar1 * fVar1 + fVar2 * fVar2); if (fVar1 < 5000.0f) { WdSs->field_0x4f = 0; diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 4a67dd0f3a..3dcc1837de 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -782,7 +782,7 @@ void daSCannon_c::initEmtLine() { cXyz pos; csXyz rot; - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera_p != NULL) { pos = *fopCamM_GetEye_p(camera_p); rot.set(dCam_getAngleX(camera_p), dCam_getAngleY(camera_p), 0); @@ -795,7 +795,7 @@ void daSCannon_c::exeEmtLine() { cXyz pos; JGeometry::TVec3 rot; if (mpEmtLine != NULL) { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera_p != NULL) { pos = *fopCamM_GetEye_p(camera_p); rot.x = dCam_getAngleX(camera_p); diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index fe265afb00..e425d3b490 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -410,7 +410,7 @@ void daObjSCannonTen_c::initEmtLine() { cXyz pos; csXyz rot; - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera_p != NULL) { pos = *fopCamM_GetEye_p(camera_p); rot.set(dCam_getAngleX(camera_p), dCam_getAngleY(camera_p), 0); @@ -423,7 +423,7 @@ void daObjSCannonTen_c::exeEmtLine() { cXyz pos; JGeometry::TVec3 rot; if (mpEmtLine != NULL) { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera_p != NULL) { pos = *fopCamM_GetEye_p(camera_p); rot.x = dCam_getAngleX(camera_p); diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index c5e18e4756..01319f599d 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -433,7 +433,7 @@ void daKey_c::effectStop() { void daKey_c::effectCtrl() { cXyz eff_scale; - f32 cam_dist = current.pos.abs(dComIfGp_getCamera(0)->lookat.eye); + f32 cam_dist = current.pos.abs(dComIfGp_getCamera(0)->view.lookat.eye); f32 var_f29 = 1000.0f; f32 max_size = 3.0f; f32 size = 1.0f; diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 47ffa2a36c..d3e4112784 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -805,7 +805,7 @@ static void part_move(obj_so_class* i_this) { static void demo_camera(obj_so_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp30, sp3c; switch (i_this->mDemoMode) { diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index 4f5209e7bc..a3673ea61f 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -277,8 +277,8 @@ static void sc_move(obj_sw_class* i_this) { static void demo_camera(obj_sw_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* zero_camera_p = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* zero_camera_p = dComIfGp_getCamera(0); cXyz sp24, sp30; switch (i_this->mDemoMode) { diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 3b93a8ee2e..a391ee007d 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -594,7 +594,7 @@ void daObjTEN_c::Z_BufferChk() { cStack_68 = current.pos; cStack_68.y += 20.0f; mDoLib_project(&cStack_68, &local_5c); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 trimHeight; if (camera != NULL) { trimHeight = camera->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 246b26e423..0ea49a1a08 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -325,7 +325,7 @@ static void yuka_control(obj_toby_class* i_this) { static void demo_camera(obj_toby_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz acStack_2c; cXyz cStack_38; cXyz cStack_44; diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index d184d92217..d9b890b65d 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -328,7 +328,7 @@ void daObjTobyHouse_c::demoProc() { csXyz cStack_98; fopAcM_SearchByName(PROC_NPC_TOBY); cXyz cStack_30(-600.0f, 70.0f, 380.0f); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz* pCamEye = fopCamM_GetEye_p(camera); csXyz local_a0(dCam_getAngleX(camera), dCam_getAngleY(camera), 0); int actIdx = dComIfGp_evmng_getMyActIdx(mStaffId, (char**)action_table, 7, 0, 0); @@ -534,7 +534,7 @@ BOOL daObjTobyHouse_c::checkLODModel() { return FALSE; } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera != NULL && fopCamM_GetEye_p(camera)->abs(current.pos) > 20000.0f) { return TRUE; } diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 60ef3736c8..82c7715476 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -505,7 +505,7 @@ void daObjTOMBO_c::Z_BufferChk() { cStack_68 = current.pos; cStack_68.y += 20.0f; mDoLib_project(&cStack_68, &local_5c); - camera_class* pCamera = dComIfGp_getCamera(0); + camera_process_class* pCamera = dComIfGp_getCamera(0); f32 trimHeight; if (pCamera != NULL) { trimHeight = pCamera->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index dd22f0ebaf..036f5b66a0 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -92,9 +92,9 @@ void daPPolamp_c::setPclModelMtx() { Vec local_2c = {0.0f, -45.0f, 0.0f}; cMtx_multVec(mModel1->getBaseTRMtx(), &local_2c, &local_20); mDoMtx_stack_c::transS(local_20.x, local_20.y, local_20.z); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { - cXyz cStack_38 = camera->lookat.eye - current.pos; + cXyz cStack_38 = camera->view.lookat.eye - current.pos; mDoMtx_stack_c::YrotM(cStack_38.atan2sX_Z()); mDoMtx_stack_c::XrotM(cStack_38.atan2sY_XZ()); } diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index f9016da772..fab5afccac 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -187,7 +187,7 @@ bool daTagWaterFall_c::checkHitWaterFall(cXyz objPos) { } bool daTagWaterFall_c::checkHitWaterFallCamera() { - return checkHitWaterFall(dComIfGp_getCamera(0)->lookat.eye); + return checkHitWaterFall(dComIfGp_getCamera(0)->view.lookat.eye); } int daTagWaterFall_c::execute() { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 12b0d6468e..55e3d5f8ee 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1064,7 +1064,7 @@ int daTbox_c::actionDropDemo() { home.pos = current.pos; if (field_0x9c9 != 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); field_0x9c9 = 0; @@ -1477,7 +1477,7 @@ int daTbox_c::checkDrop() { } void daTbox_c::settingDropDemoCamera() { - camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); player_camera->mCamera.Stop(); dStage_MapEvent_dt_c* maptooldata = dEvt_control_c::searchMapEventData(getEvent(), fopAcM_GetRoomNo(this)); diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 55229336b8..fef3260ef1 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -1,6 +1,8 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_title.h" +#include "d/d_s_logo.h" +#include "d/d_s_play.h" #include "d/d_demo.h" #include "d/d_pane_class_alpha.h" #include "d/d_menu_collect.h" @@ -16,17 +18,21 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "m_Do/m_Do_graphic.h" -class daTit_HIO_c { +class daTit_HIO_c : public JORReflexible { public: daTit_HIO_c(); virtual ~daTit_HIO_c() {} + void genMessage(JORMContext*); - /* 0x04 */ s8 field_0x4; + /* 0x04 */ s8 id; /* 0x08 */ f32 mPSScaleX; /* 0x0C */ f32 mPSScaleY; /* 0x10 */ f32 mPSPosX; /* 0x14 */ f32 mPSPosY; + #if DEBUG + /* 0x18 */ u8 unk_0x18[0x48 - 0x18]; + #endif /* 0x18 */ u8 mAppear; /* 0x19 */ u8 mArrow; /* 0x1A */ u8 field_0x1a; @@ -44,17 +50,11 @@ static char const l_arcName[] = "TitlePal"; static char const l_arcName[] = "Title"; #endif -static procFunc daTitleProc[6] = { - &daTitle_c::loadWait_proc, &daTitle_c::logoDispWait, &daTitle_c::logoDispAnm, - &daTitle_c::keyWait, &daTitle_c::nextScene_proc, &daTitle_c::fastLogoDisp, -}; - daTit_HIO_c::daTit_HIO_c() { mPSScaleX = 1.0f; mPSScaleY = 1.0f; #if VERSION == VERSION_GCN_PAL - switch (OSGetLanguage()) { case OS_LANGUAGE_ENGLISH: case OS_LANGUAGE_GERMAN: @@ -77,29 +77,49 @@ daTit_HIO_c::daTit_HIO_c() { field_0x1a = 15; } +#if DEBUG +void daTit_HIO_c::genMessage(JORMContext* mctx) { + mctx->genLabel("\n======= PRESS START ========", 0); + mctx->genSlider("Scale Ｘ", &mPSScaleX, 0.1f, 100.0f); + mctx->genSlider("Scale Ｙ", &mPSScaleY, 0.1f, 100.0f); + mctx->genSlider("Pos Ｘ", &mPSPosX, 0.0f, 1000.0f); + mctx->genSlider("Pos Ｙ", &mPSPosY, 0.0f, 1000.0f); + + mctx->genLabel("\n======= ", 0); + mctx->genSlider("出現", &mAppear, 0, 255); + mctx->genSlider("矢印", &mArrow, 0, 255); +} +#endif + int daTitle_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 10); + JUT_ASSERT(258, modelData); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000285); if (mpModel == NULL) { return 0; } - void* res = dComIfG_getObjectRes(l_arcName, 7); - mBck.init((J3DAnmTransform*)res, 1, 0, 2.0f, 0, -1, false); + int res = mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7), 1, 0, 2.0f, 0, -1, false); + JUT_ASSERT(276, res == 1); - res = dComIfG_getObjectRes(l_arcName, 13); - mBpk.init(modelData, (J3DAnmColor*)res, 1, 0, 2.0f, 0, -1); + res = mBpk.init(modelData, (J3DAnmColor*)dComIfG_getObjectRes(l_arcName, 13), 1, 0, 2.0f, 0, -1); + JUT_ASSERT(283, res == 1); - res = dComIfG_getObjectRes(l_arcName, 16); - mBrk.init(modelData, (J3DAnmTevRegKey*)res, 1, 0, 2.0f, 0, -1); + res = mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 16), 1, 0, 2.0f, 0, -1); + JUT_ASSERT(290, res == 1); - res = dComIfG_getObjectRes(l_arcName, 19); - mBtk.init(modelData, (J3DAnmTextureSRTKey*)res, 1, 0, 2.0f, 0, -1); + res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 19), 1, 0, 2.0f, 0, -1); + JUT_ASSERT(297, res == 1); return 1; } +static procFunc daTitleProc[6] = { + &daTitle_c::loadWait_proc, &daTitle_c::logoDispWait, &daTitle_c::logoDispAnm, + &daTitle_c::keyWait, &daTitle_c::nextScene_proc, &daTitle_c::fastLogoDisp, +}; + int daTitle_c::create() { fopAcM_ct(this, daTitle_c); @@ -113,27 +133,33 @@ int daTitle_c::create() { } mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/Title2D.arc", 0, NULL); - field_0x5f8 = 0; + mIsDispLogo = 0; field_0x5f9 = 0; - m2DHeap = JKRExpHeap::create(0x8000, mDoExt_getGameHeap(), false); + m2DHeap = JKRCreateExpHeap(0x8000, mDoExt_getGameHeap(), false); JUT_ASSERT(345, m2DHeap != NULL); loadWait_init(); - g_daTitHIO.field_0x4 = -1; + + g_daTitHIO.id = mDoHIO_CREATE_CHILD("タイトルロゴ", &g_daTitHIO); return phase_state; } -int daTitle_c::createHeapCallBack(fopAc_ac_c* title) { - return ((daTitle_c*)title)->CreateHeap(); +int daTitle_c::createHeapCallBack(fopAc_ac_c* actor) { + daTitle_c* i_this = (daTitle_c*)actor; + return i_this->CreateHeap(); } int daTitle_c::Execute() { + #if PLATFORM_WII || PLATFORM_SHIELD + mDoGph_gInf_c::resetDimming(); + #endif + if (fopOvlpM_IsPeek()) { return 1; } - dMenu_Collect3D_c::mViewOffsetY = 0.0f; + dMenu_Collect3D_c::setViewPortOffsetY(0.0f); if (mDoRst::isReset()) { return 1; @@ -141,6 +167,11 @@ int daTitle_c::Execute() { (this->*daTitleProc[mProcID])(); KeyWaitAnm(); + + #if VERSION == VERSION_SHIELD_DEBUG + KeyWaitPosMove(); + #endif + return 1; } @@ -167,17 +198,26 @@ void daTitle_c::KeyWaitAnm() { } } +#if VERSION == VERSION_SHIELD_DEBUG +void daTitle_c::KeyWaitPosMove() { + J2DPane* pane = mTitle.Scr->search(MULTI_CHAR('n_all')); + pane->translate(g_daTitHIO.mPSPosX, g_daTitHIO.mPSPosY); + pane->scale(g_daTitHIO.mPSScaleX, g_daTitHIO.mPSScaleY); +} +#endif + void daTitle_c::loadWait_init() { mProcID = 0; } void daTitle_c::loadWait_proc() { if (mpMount->sync()) { - JKRHeap* heap = mDoExt_setCurrentHeap(m2DHeap); - mpHeap = heap; + mpHeap = mDoExt_setCurrentHeap(m2DHeap); mpFont = mDoExt_getMesgFont(); + mTitle.Scr = new J2DScreen(); + JUT_ASSERT(529, mTitle.Scr != NULL); mTitle.Scr->setPriority("zelda_press_start.blo", 0x100000, mpMount->getArchive()); @@ -193,7 +233,9 @@ void daTitle_c::loadWait_proc() { for (int i = 0; i < 7; i++) { text[i]->setFont(mpFont); text[i]->setString(0x80, ""); - fopMsgM_messageGet(text[i]->getStringPtr(), 100); + + char* msg = text[i]->getStringPtr(); + fopMsgM_messageGet(msg, 100); } field_0x600 = new CPaneMgrAlpha(mTitle.Scr, MULTI_CHAR('n_all'), 2, NULL); @@ -201,7 +243,7 @@ void daTitle_c::loadWait_proc() { J2DPane* pane = mTitle.Scr->search(MULTI_CHAR('n_all')); pane->translate(g_daTitHIO.mPSPosX, g_daTitHIO.mPSPosY); pane->scale(g_daTitHIO.mPSScaleX, g_daTitHIO.mPSScaleY); - mpHeap->becomeCurrentHeap(); + JKRSetCurrentHeap(mpHeap); logoDispWaitInit(); } } @@ -223,7 +265,7 @@ void daTitle_c::logoDispAnmInit() { mBpk.setPlaySpeed(1.0f); mBrk.setPlaySpeed(1.0f); mBtk.setPlaySpeed(1.0f); - field_0x5f8 = 1; + mIsDispLogo = 1; mProcID = 2; } @@ -258,13 +300,29 @@ void daTitle_c::nextScene_init() { } void daTitle_c::nextScene_proc() { + scene_class* playScene; + if (!fopOvlpM_IsPeek() && !mDoRst::isReset()) { - scene_class* playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); + playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); JUT_ASSERT(706, playScene != NULL); - fopScnM_ChangeReq(playScene, 13, 0, 5); -#if VERSION != VERSION_SHIELD_DEBUG + + #if DEBUG + if (!dScnLogo_c::isOpeningCut()) + #endif + { + fopScnM_ChangeReq(playScene, PROC_NAME_SCENE, 0, 5); + } + #if DEBUG + else { + fopScnM_ChangeReq(playScene, PROC_MENU_SCENE, 0, 5); + dComIfGs_init(); + dComIfG_playerStatusD(); + } + #endif + + #if VERSION != VERSION_SHIELD_DEBUG mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); -#endif + #endif } } @@ -276,39 +334,37 @@ void daTitle_c::fastLogoDispInit() { field_0x600->alphaAnimeStart(0); field_0x604 = 0; - field_0x5fc = 30; + mWaitTimer = 30; mProcID = 5; } void daTitle_c::fastLogoDisp() { - if (field_0x5fc != 0) { - field_0x5fc--; + if (mWaitTimer != 0) { + mWaitTimer--; return; } field_0x5f9 = 1; field_0x5fa = 1; - field_0x5f8 = 1; + mIsDispLogo = 1; keyWaitInit(); } int daTitle_c::getDemoPrm() { dDemo_actor_c* demoActor = dDemo_c::getActor(demoActorID); dDemo_prm_c* prm; - if (demoActor != NULL && demoActor->checkEnable(1) && - (prm = demoActor->getPrm())) - { - void* data = (void*)prm->getData(); - JStudio::stb::TParseData_fixed<49> aTStack_30(data); - TValueIterator_raw iter = aTStack_30.begin(); - return *iter & 0xff; + if (demoActor != NULL && demoActor->checkEnable(1) && (prm = demoActor->getPrm())) { + JStudio::stb::TParseData_fixed<49> parser(prm->getData()); + TValueIterator_raw iter = parser.begin(); + return *iter; } + return -1; } int daTitle_c::Draw() { J3DModelData* modelData = mpModel->getModelData(); - MTXTrans(mpModel->getBaseTRMtx(), 0.0f, 0.0f, -430.0f); + cMtx_trans(mpModel->getBaseTRMtx(), IREG_F(7), IREG_F(8), IREG_F(9) + -430.0f); mpModel->getBaseScale()->x = -1.0f; mBck.entry(modelData); @@ -320,7 +376,7 @@ int daTitle_c::Draw() { mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); - if (field_0x5f8) { + if (mIsDispLogo) { dComIfGd_set2DOpaTop(&mTitle); } @@ -328,13 +384,15 @@ int daTitle_c::Draw() { } int daTitle_c::Delete() { + mDoHIO_DELETE_CHILD(g_daTitHIO.id); + dComIfG_resDelete(&mPhaseReq, l_arcName); delete mTitle.Scr; delete field_0x600; mpMount->getArchive()->removeResourceAll(); - mpMount->getArchive()->unmount(); - delete mpMount; + JKRUnmountArchive(mpMount->getArchive()); + mpMount->destroy(); if (m2DHeap != NULL) { m2DHeap->destroy(); @@ -352,11 +410,14 @@ static int daTitle_Execute(daTitle_c* i_this) { } static int daTitle_Delete(daTitle_c* i_this) { + fpc_ProcID id = fopAcM_GetID(i_this); return i_this->Delete(); } static int daTitle_Create(fopAc_ac_c* i_this) { - return static_cast(i_this)->create(); + daTitle_c* a_this = (daTitle_c*)i_this; + fpc_ProcID id = fopAcM_GetID(i_this); + return a_this->create(); } void dDlst_daTitle_c::draw() { diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 33d9a27762..a357efb07a 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -142,15 +142,15 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { #if !DEBUG cXyz sp8; if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0) { - dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.sun_pos, &sp8); - sp14.x = camera_p->lookat.eye.x + (8000.0f * sp8.x); - sp14.y = camera_p->lookat.eye.y + (8000.0f * sp8.y); - sp14.z = camera_p->lookat.eye.z + (8000.0f * sp8.z); + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &g_env_light.sun_pos, &sp8); + sp14.x = camera_p->view.lookat.eye.x + (8000.0f * sp8.x); + sp14.y = camera_p->view.lookat.eye.y + (8000.0f * sp8.y); + sp14.z = camera_p->view.lookat.eye.z + (8000.0f * sp8.z); } #endif - temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); - temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); + temp_r19 = cLib_targetAngleX(&camera_p->view.lookat.eye, &sp14); + temp_r18 = cLib_targetAngleY(&camera_p->view.lookat.eye, &sp14); mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z); mDoMtx_stack_c::YrotM((s16)temp_r18); mDoMtx_stack_c::XrotM(0x7FFF + -temp_r19); @@ -185,8 +185,8 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { sp14 = sun_p->mPos[0]; sp14.y = 300.0f + -(sp14.y * 0.85f); - temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); - temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); + temp_r19 = cLib_targetAngleX(&camera_p->view.lookat.eye, &sp14); + temp_r18 = cLib_targetAngleY(&camera_p->view.lookat.eye, &sp14); mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z); mDoMtx_stack_c::YrotM((s16)temp_r18); mDoMtx_stack_c::XrotM(0x7FFF + -temp_r19); @@ -246,8 +246,8 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { sp10 = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); - cam_eye = camera_p->lookat.eye; - cam_center = camera_p->lookat.center; + cam_eye = camera_p->view.lookat.eye; + cam_center = camera_p->view.lookat.center; cam_eye.y = 0.0f; cam_center.y = 0.0f; diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 1225cad07b..d059db6862 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -220,11 +220,11 @@ static int daYkgrExecute(void* i_this) { } void daYkgr_c::set_mtx() { - camera_class* iVar1 = dComIfGp_getCamera(0); + camera_process_class* iVar1 = dComIfGp_getCamera(0); cXyz local_28; cXyz* r29 = fopCamM_GetEye_p(iVar1); current.pos = *r29; - dKyr_get_vectle_calc(&iVar1->lookat.eye, &iVar1->lookat.center, &local_28); + dKyr_get_vectle_calc(&iVar1->view.lookat.eye, &iVar1->view.lookat.center, &local_28); current.angle.y = (s16)cM_atan2s(local_28.x, local_28.z); current.angle.x = -cM_atan2s( local_28.y, JMAFastSqrt((local_28.x * local_28.x + local_28.z * local_28.z))); diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index 230b3386ed..a0a86ab079 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -611,13 +611,13 @@ void dGrass_packet_c::draw() { f32 temp1 = 0.001953125f; // fakematch #if DEBUG - camera_class* sp34 = dComIfGp_getCamera(0); + camera_process_class* sp34 = dComIfGp_getCamera(0); int sp30 = 0; if (dCam_getBody() != NULL && (dCam_getBody()->Mode() == 7 || dCam_getBody()->Mode() == 8) && sp34 != NULL && dCam_getBody()->V() < -750.0f && - var_r29->m_pos.abs(sp34->lookat.eye) < 200.0f) { + var_r29->m_pos.abs(sp34->view.lookat.eye) < 200.0f) { sp30 = 1; } #endif diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index d4e8ff019a..ccafb31b5b 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -678,7 +678,7 @@ void dBgp_c::draw(fopAc_ac_c* i_actor) { mPacket.reset(); mDoLib_clipper::changeFar(100000.0f); - camera_class* sp30 = dComIfGp_getCamera(0); + camera_process_class* sp30 = dComIfGp_getCamera(0); dCamera_c* camera = &sp30->mCamera; JUT_ASSERT(1287, camera != NULL) diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 1baf13362a..3b857b8b30 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -10709,15 +10709,15 @@ int dCamera_c::ForceLockOff(fopAc_ac_c* i_actor) { } s16 dCam_getAngleY(camera_class* i_cam) { - return i_cam->mCamera.U(); + return ((camera_process_class*)i_cam)->mCamera.U(); } s16 dCam_getAngleX(camera_class* i_cam) { - return i_cam->mCamera.V(); + return ((camera_process_class*)i_cam)->mCamera.V(); } s16 dCam_getControledAngleY(camera_class* i_cam) { - return i_cam->mCamera.U2(); + return ((camera_process_class*)i_cam)->mCamera.U2(); } camera_class* dCam_getCamera() { @@ -10725,14 +10725,14 @@ camera_class* dCam_getCamera() { } dCamera_c* dCam_getBody() { - camera_class* camera = dCam_getCamera(); + camera_process_class* camera = (camera_process_class*)dCam_getCamera(); return &camera->mCamera; } 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 = &((camera_class*)i_this)->mCamera; + dCamera_c* camera = &i_this->mCamera; int camera_id = get_camera_id(a_this); dDlst_window_c* window = get_window(camera_id); @@ -10786,7 +10786,7 @@ static void view_setup(camera_process_class* i_this) { static void store(camera_process_class* i_camera) { camera_process_class* process = (camera_process_class*)i_camera; camera_class* camera = (camera_class*)i_camera; - dCamera_c* dCamera = &((camera_class*)i_camera)->mCamera; + dCamera_c* dCamera = &i_camera->mCamera; int camera_id = get_camera_id(camera); dDlst_window_c* window = get_window(camera_id); view_port_class* viewport = window->getViewPort(); @@ -10913,33 +10913,30 @@ cXyz dCamera_c::Center() { } static int camera_execute(camera_process_class* i_this) { - // this variable is likely fake as it doesn't exist in debug, - // but directly casting the parameter on each use breaks retail - camera_class* camera = (camera_class*)i_this; - preparation(camera); + preparation(i_this); if (dDemo_c::getCamera() != NULL) { - camera->mCamera.ResetView(); + i_this->mCamera.ResetView(); } dComIfGp_offCameraAttentionStatus(0, 0x40); - if (camera->mCamera.Active()) { - camera->mCamera.Run(); + if (i_this->mCamera.Active()) { + i_this->mCamera.Run(); } else { - camera->mCamera.NotRun(); + i_this->mCamera.NotRun(); } - camera->mCamera.CalcTrimSize(); + i_this->mCamera.CalcTrimSize(); - store(camera); - view_setup(camera); + store(i_this); + view_setup(i_this); return 1; } static int 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 = &i_this->mCamera; dDlst_window_c* window = get_window(a_this); view_port_class* viewport = window->getViewPort(); camera_process_class* process = i_this; @@ -10991,24 +10988,24 @@ static int camera_draw(camera_process_class* i_this) { int trim_height = body->TrimHeight(); window->setScissor(0.0f, trim_height, FB_WIDTH, FB_HEIGHT - trim_height * 2.0f); - C_MTXPerspective(process->projMtx, process->fovy, process->aspect, process->near, process->far); - mDoMtx_lookAt(process->viewMtx, &process->lookat.eye, &process->lookat.center, - &process->lookat.up, process->bank); + C_MTXPerspective(process->view.projMtx, process->view.fovy, process->view.aspect, process->view.near, process->view.far); + mDoMtx_lookAt(process->view.viewMtx, &process->view.lookat.eye, &process->view.lookat.center, + &process->view.lookat.up, process->view.bank); #if WIDESCREEN_SUPPORT - mDoGph_gInf_c::setWideZoomProjection(process->projMtx); + mDoGph_gInf_c::setWideZoomProjection(process->view.projMtx); #endif - j3dSys.setViewMtx(process->viewMtx); - cMtx_inverse(process->viewMtx, process->invViewMtx); + j3dSys.setViewMtx(process->view.viewMtx); + cMtx_inverse(process->view.viewMtx, process->view.invViewMtx); - Z2GetAudience()->setAudioCamera(process->viewMtx, process->lookat.eye, process->lookat.center, - process->fovy, process->aspect, getComStat(0x80), camera_id, + Z2GetAudience()->setAudioCamera(process->view.viewMtx, process->view.lookat.eye, process->view.lookat.center, + process->view.fovy, process->view.aspect, getComStat(0x80), camera_id, false); dBgS_GndChk gndchk; gndchk.OnWaterGrp(); - gndchk.SetPos(&process->lookat.eye); + gndchk.SetPos(&process->view.lookat.eye); f32 cross = dComIfG_Bgsp().GroundCross(&gndchk); if (cross != -G_CM3D_F_INF) { @@ -11020,27 +11017,27 @@ static int camera_draw(camera_process_class* i_this) { mDoAud_setCameraGroupInfo(dComIfG_Bgsp().GetGrpSoundId(gndchk)); Vec spDC; - spDC.x = process->lookat.eye.x; + spDC.x = process->view.lookat.eye.x; spDC.y = cross; - spDC.z = process->lookat.eye.z; + spDC.z = process->view.lookat.eye.z; Z2AudioMgr::getInterface()->setCameraPolygonPos(&spDC); } else { Z2AudioMgr::getInterface()->setCameraPolygonPos(NULL); } - MTXCopy(process->viewMtx, process->viewMtxNoTrans); - process->viewMtxNoTrans[0][3] = 0.0f; - process->viewMtxNoTrans[1][3] = 0.0f; - process->viewMtxNoTrans[2][3] = 0.0f; - cMtx_concatProjView(process->projMtx, process->viewMtx, process->projViewMtx); + MTXCopy(process->view.viewMtx, process->view.viewMtxNoTrans); + process->view.viewMtxNoTrans[0][3] = 0.0f; + process->view.viewMtxNoTrans[1][3] = 0.0f; + process->view.viewMtxNoTrans[2][3] = 0.0f; + cMtx_concatProjView(process->view.projMtx, process->view.viewMtx, process->view.projViewMtx); body->Draw(); return 1; } static int init_phase1(camera_class* i_this) { - camera_class* camera = i_this; + camera_process_class* camera = (camera_process_class*)i_this; int camera_id = get_camera_id(i_this); dComIfGp_setCamera(camera_id, i_this); @@ -11056,7 +11053,7 @@ static int init_phase1(camera_class* i_this) { } static int init_phase2(camera_class* i_this) { - camera_class* camera = (camera_class*)i_this; + camera_process_class* camera = (camera_process_class*)i_this; dCamera_c* body = &camera->mCamera; int camera_id = get_camera_id(i_this); i_this->field_0x238++; @@ -11138,12 +11135,12 @@ static int camera_create(camera_class* i_this) { (request_of_phase_process_fn)NULL, }; - camera_class* camera = i_this; + camera_process_class* camera = (camera_process_class*)i_this; return dComLbG_PhaseHandler(&camera->phase_request, l_method, i_this); } static int camera_delete(camera_process_class* i_this) { - dCamera_c* camera = &((camera_class*)i_this)->mCamera; + dCamera_c* camera = &i_this->mCamera; if (camera->CameraID() == 0) { #if DEBUG @@ -11212,7 +11209,7 @@ camera_process_profile_definition g_profile_CAMERA = { fpcPi_CURRENT_e, PROC_CAMERA, &g_fpcLf_Method.base, - sizeof(camera_class), + sizeof(camera_process_class), 0, 0, &g_fopVw_Method, @@ -11233,7 +11230,7 @@ camera_process_profile_definition g_profile_CAMERA2 = { fpcPi_CURRENT_e, PROC_CAMERA2, &g_fpcLf_Method.base, - sizeof(camera_class), + sizeof(camera_process_class), 0, 0, &g_fopVw_Method, diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 1f37fc6fe4..5bd6d55b9e 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1194,7 +1194,7 @@ void dComIfG_inf_c::ct() { field_0x1de0a = 0xFF; } -#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG +#if PLATFORM_WII || PLATFORM_SHIELD void dComIfG_inf_c::createBaseCsr() { JUT_ASSERT(1622, m_baseCsr == NULL); m_baseCsr = new baseCsr_c(1); diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 9c38bcb3a2..2af725c162 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -448,7 +448,7 @@ static view_class* getView() { dDlst_window_c* window = dComIfGp_getWindow(0); int camID = window->getCameraID(); - return dComIfGp_getCamera(camID); + return &dComIfGp_getCamera(camID)->view; } f32 dDemo_camera_c::JSGGetProjectionNear() const { diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index bdc92e3cb4..51d37db647 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -494,7 +494,7 @@ void dKy_pos2_get_angle(cXyz* pos1_p, cXyz* pos2_p, s16* pitch_p, s16* yaw_p) { void dKy_twi_wolflight_set(int light_id) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz vectle; if (camera_p == NULL) { @@ -503,12 +503,12 @@ void dKy_twi_wolflight_set(int light_id) { s16 angle_x; s16 angle_y; - dKy_pos2_get_angle(&camera_p->lookat.center, &camera_p->lookat.eye, &angle_x, &angle_y); - dKyr_get_vectle_calc(&camera_p->lookat.center, &camera_p->lookat.eye, &vectle); + dKy_pos2_get_angle(&camera_p->view.lookat.center, &camera_p->view.lookat.eye, &angle_x, &angle_y); + dKyr_get_vectle_calc(&camera_p->view.lookat.center, &camera_p->view.lookat.eye, &vectle); - kankyo->field_0x0c18[light_id].mPos.x = camera_p->lookat.eye.x + vectle.x * 300.0f; - kankyo->field_0x0c18[light_id].mPos.y = camera_p->lookat.eye.y + vectle.y * 300.0f; - kankyo->field_0x0c18[light_id].mPos.z = camera_p->lookat.eye.z + vectle.z * 300.0f; + kankyo->field_0x0c18[light_id].mPos.x = camera_p->view.lookat.eye.x + vectle.x * 300.0f; + kankyo->field_0x0c18[light_id].mPos.y = camera_p->view.lookat.eye.y + vectle.y * 300.0f; + kankyo->field_0x0c18[light_id].mPos.z = camera_p->view.lookat.eye.z + vectle.z * 300.0f; int size = g_env_light.light_size; #if DEBUG @@ -1633,7 +1633,7 @@ void dScnKy_env_light_c::setDaytime() { } void dScnKy_env_light_c::setSunpos() { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz pos; f32 parcent; f32 sun_angle; @@ -1682,9 +1682,9 @@ void dScnKy_env_light_c::setSunpos() { pos.y = cosf(DEG_TO_RAD(sun_angle)) * 80000.0f; pos.z = cosf(DEG_TO_RAD(sun_angle)) * -48000.0f; - sun_pos.x = camera_p->lookat.eye.x + pos.x; - sun_pos.y = camera_p->lookat.eye.y - pos.y; - sun_pos.z = camera_p->lookat.eye.z + pos.z; + sun_pos.x = camera_p->view.lookat.eye.x + pos.x; + sun_pos.y = camera_p->view.lookat.eye.y - pos.y; + sun_pos.z = camera_p->view.lookat.eye.z + pos.z; pos.x = sinf(DEG_TO_RAD(moon_angle)) * 80000.0f; pos.y = cosf(DEG_TO_RAD(moon_angle)) * 80000.0f; @@ -1930,9 +1930,9 @@ void dScnKy_env_light_c::setLight_palno_get(u8* prev_envr_id_p, u8* next_envr_id // use a specific palette for rollgoal (camera eye gets set below 0.0) else if (strcmp(dComIfGp_getStartStageName(), "R_SP127") == 0) { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); - if (camera_p != NULL && camera_p->lookat.eye.y < 0.0f) { + if (camera_p != NULL && camera_p->view.lookat.eye.y < 0.0f) { psel_idx = envr_p->pselect_id[10]; } } @@ -2146,9 +2146,9 @@ void dScnKy_env_light_c::setLight_palno_get(u8* prev_envr_id_p, u8* next_envr_id // use a specific palette for rollgoal (camera eye gets set below 0.0) else if (strcmp(dComIfGp_getStartStageName(), "R_SP127") == 0) { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); - if (camera_p != NULL && camera_p->lookat.eye.y < 0.0f) { + if (camera_p != NULL && camera_p->view.lookat.eye.y < 0.0f) { pselect_p = &g_env_light.stage_pselect_info[envr_p->pselect_id[10]]; } } @@ -2257,7 +2257,7 @@ void dScnKy_env_light_c::setLight() { u8* init_timer = &g_env_light.light_init_timer; int i; f32 sp8C; - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); GXColorS10 add_col; add_col.r = 0; @@ -2276,14 +2276,14 @@ void dScnKy_env_light_c::setLight() { dKy_WaterIn_Light_set(); } - chkpos = camera_p->lookat.eye; + chkpos = camera_p->view.lookat.eye; chkpos.y += 100000.0f; camchk.SetPos(&chkpos); sp84 = dComIfG_Bgsp().GroundCross(&camchk); - if (sp84 > camera_p->lookat.eye.y) { - sp84 -= camera_p->lookat.eye.y; + if (sp84 > camera_p->view.lookat.eye.y) { + sp84 -= camera_p->view.lookat.eye.y; sp80 = 1.0f - sp84 / 2250.0f; if (sp80 < 0.0f) { sp80 = 0.0f; @@ -3247,7 +3247,7 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr J3DLightInfo* light0_info = tevstr_p->mLights[0].getLightInfo(); sp9 = 1; - dKyr_get_vectle_calc(&camera->lookat.center, &camera->lookat.eye, &camfwd); + dKyr_get_vectle_calc(&camera->view.lookat.center, &camera->view.lookat.eye, &camfwd); light_pos = *pos_p + (camfwd * 500.0f); light_pos.y += 40.0f; @@ -3256,8 +3256,8 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr #endif if (tevstr_p->Type >= 1 && tevstr_p->Type <= 9) { - dKyr_get_vectle_calc(&camera->lookat.center, &camera->lookat.eye, &camfwd); - light_pos = camera->lookat.eye + (camfwd * 180.0f); + dKyr_get_vectle_calc(&camera->view.lookat.center, &camera->view.lookat.eye, &camfwd); + light_pos = camera->view.lookat.eye + (camfwd * 180.0f); } field_0x10f8.r = light0_info->mColor.r; @@ -3705,7 +3705,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst fog_near = 30000.0f; fog_far = 30000.0f; - dKyr_get_vectle_calc(&pos, &camera_p->lookat.eye, &calc_pos); + dKyr_get_vectle_calc(&pos, &camera_p->view.lookat.eye, &calc_pos); for (int i = 0; i < 6; i++) { J3DLightInfo& light_info = *tevstr_p->mLights[i].getLightInfo(); @@ -3794,9 +3794,9 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst Vec sp8C; Vec sp80; - sp80.x = camera_p->lookat.eye.x; - sp80.y = camera_p->lookat.eye.y; - sp80.z = camera_p->lookat.eye.z; + sp80.x = camera_p->view.lookat.eye.x; + sp80.y = camera_p->view.lookat.eye.y; + sp80.z = camera_p->view.lookat.eye.z; light_info = tevstr_p->mLightObj.getLightInfo(); cMtx_multVec(view_mtx, &sp80, &sp8C); @@ -3868,7 +3868,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst fog_far = 30000.0f; for (int i = 0; i < 6; i++) { - camera_class* sp30 = dComIfGp_getCamera(0); + camera_process_class* sp30 = dComIfGp_getCamera(0); J3DLightInfo& temp_r31 = *tevstr_p->mLights[i].getLightInfo(); if (i == 0) { @@ -3946,9 +3946,9 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst Vec sp74; Vec sp68; - sp68.x = camera_p->lookat.eye.x; - sp68.y = camera_p->lookat.eye.y; - sp68.z = camera_p->lookat.eye.z; + sp68.x = camera_p->view.lookat.eye.x; + sp68.y = camera_p->view.lookat.eye.y; + sp68.z = camera_p->view.lookat.eye.z; light_info = tevstr_p->mLightObj.getLightInfo(); cMtx_multVec(view_mtx, &sp68, &sp74); @@ -4635,7 +4635,7 @@ void dScnKy_env_light_c::SetBaseLight() { if (daytime > 67.5f && daytime < 292.5f) { base_light.mPosition = kankyo->sun_light_pos; } else if (camera != NULL) { - base_light.mPosition = camera->lookat.eye + kankyo->moon_pos; + base_light.mPosition = camera->view.lookat.eye + kankyo->moon_pos; } else { base_light.mPosition = kankyo->moon_pos; } @@ -8089,7 +8089,7 @@ void dKy_undwater_filter_draw() { static cXyz S_old_camctr(0.0f, 0.0f, 0.0f); if (dKy_camera_water_in_status_check()) { - f32 dist_to_old = camera->lookat.eye.abs(S_old_cameye); + f32 dist_to_old = camera->view.lookat.eye.abs(S_old_cameye); if (dist_to_old > 100.0f) { dist_to_old = 100.0f; } @@ -8099,7 +8099,7 @@ void dKy_undwater_filter_draw() { 0.0001f); } - dist_to_old = camera->lookat.center.abs(S_old_camctr); + dist_to_old = camera->view.lookat.center.abs(S_old_camctr); if (dist_to_old > 100.0f) { dist_to_old = 100.0f; } @@ -8109,8 +8109,8 @@ void dKy_undwater_filter_draw() { 0.0001f); } - S_old_cameye = camera->lookat.eye; - S_old_camctr = camera->lookat.center; + S_old_cameye = camera->view.lookat.eye; + S_old_camctr = camera->view.lookat.center; mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); @@ -8424,7 +8424,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { } if (camera != 0) { - eflight_id = dKy_eflight_influence_id(camera->lookat.eye, 0); + eflight_id = dKy_eflight_influence_id(camera->view.lookat.eye, 0); if (eflight_id >= 0) { dKy_bgparts_activelight_set(g_env_light.efplight[eflight_id], 1); if (dKy_Indoor_check() == TRUE) { @@ -8513,7 +8513,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { if (i == 0) { (lightStatusPt + 2)[i].position = kankyo->sun_pos; } else if (camera != 0) { - (lightStatusPt + 2)[i].position = camera->lookat.eye + kankyo->moon_pos; + (lightStatusPt + 2)[i].position = camera->view.lookat.eye + kankyo->moon_pos; } else { (lightStatusPt + 2)[i].position = kankyo->moon_pos; } @@ -8642,7 +8642,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { void dKy_setLight_nowroom(char room_no) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); fopAc_ac_c* player = dComIfGp_getPlayer(0); MtxPtr var_r28 = j3dSys.getViewMtx(); @@ -8806,9 +8806,9 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) { sp3C.y = kankyo->sun_pos.y; sp3C.z = kankyo->sun_pos.z; } else if (camera != NULL) { - sp3C.x = camera->lookat.eye.x + kankyo->moon_pos.x; - sp3C.y = camera->lookat.eye.y + kankyo->moon_pos.y; - sp3C.z = camera->lookat.eye.z + kankyo->moon_pos.z; + sp3C.x = camera->view.lookat.eye.x + kankyo->moon_pos.x; + sp3C.y = camera->view.lookat.eye.y + kankyo->moon_pos.y; + sp3C.z = camera->view.lookat.eye.z + kankyo->moon_pos.z; } else { sp3C.x = kankyo->moon_pos.x; sp3C.y = kankyo->moon_pos.y; @@ -9286,8 +9286,8 @@ void dKy_Sound_init() { void dKy_Sound_set(cXyz pos, int param_1, fpc_ProcID actor_id, int timer) { camera_class* camera_p = (camera_class*)dComIfGp_getCamera(0); BOOL set_sound = FALSE; - f32 dist_pos_to_eye = pos.abs(camera_p->lookat.eye); - f32 dist_sndpos_to_eye = g_env_light.sound_influence.position.abs(camera_p->lookat.eye); + f32 dist_pos_to_eye = pos.abs(camera_p->view.lookat.eye); + f32 dist_sndpos_to_eye = g_env_light.sound_influence.position.abs(camera_p->view.lookat.eye); if (dist_pos_to_eye < dist_sndpos_to_eye) { if (dist_sndpos_to_eye < 1500.0f) { @@ -9969,22 +9969,22 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) { cXyz sp1C(boss_light_p[i].mPos); if (strcmp(dComIfGp_getStartStageName(), "D_SB03") == 0) { - sp1C.x = camera->lookat.eye.x; - sp1C.z = camera->lookat.eye.z; + sp1C.x = camera->view.lookat.eye.x; + sp1C.z = camera->view.lookat.eye.z; - if (sp1C.abs(camera->lookat.eye) > 2000.0f) { + if (sp1C.abs(camera->view.lookat.eye) > 2000.0f) { var_f31 = 99999.9f; spA = i; break; } else { - if (boss_light_p[i].mPos.abs(camera->lookat.eye) > var_f31) { - var_f31 = boss_light_p[i].mPos.abs(camera->lookat.eye); + if (boss_light_p[i].mPos.abs(camera->view.lookat.eye) > var_f31) { + var_f31 = boss_light_p[i].mPos.abs(camera->view.lookat.eye); spA = i; } } } else { - if (boss_light_p[i].mPos.abs(camera->lookat.eye) > var_f31) { - var_f31 = boss_light_p[i].mPos.abs(camera->lookat.eye); + if (boss_light_p[i].mPos.abs(camera->view.lookat.eye) > var_f31) { + var_f31 = boss_light_p[i].mPos.abs(camera->view.lookat.eye); spA = i; } } @@ -9993,7 +9993,7 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) { if (sp10 == 0 && spA != 0xFF) { i = spA; - if (i < 6 && pos_p->abs(camera->lookat.eye) < var_f31) { + if (i < 6 && pos_p->abs(camera->view.lookat.eye) < var_f31) { boss_light_p[i].mPos = *pos_p; boss_light_p[i].mColor.r = color_p->r; boss_light_p[i].mColor.g = color_p->g; @@ -10053,17 +10053,17 @@ int dKy_BossSpotLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXC if (spC == 0) { for (i = 1; i < 6; i++) { if (kankyo->field_0x0c18[i].field_0x26 != 0 && - kankyo->field_0x0c18[i].mPos.abs(camera->lookat.eye) > var_f31) + kankyo->field_0x0c18[i].mPos.abs(camera->view.lookat.eye) > var_f31) { - var_f31 = kankyo->field_0x0c18[i].mPos.abs(camera->lookat.eye); + var_f31 = kankyo->field_0x0c18[i].mPos.abs(camera->view.lookat.eye); sp8 = i; } } if (sp8 != 0xFF) { i = sp8; - if (i < 6 && pos_p->abs(camera->lookat.eye) < - kankyo->field_0x0c18[i].mPos.abs(camera->lookat.eye)) + if (i < 6 && pos_p->abs(camera->view.lookat.eye) < + kankyo->field_0x0c18[i].mPos.abs(camera->view.lookat.eye)) { kankyo->field_0x0c18[i].mPos = *pos_p; kankyo->field_0x0c18[i].mColor.r = color_p->r; @@ -10224,7 +10224,7 @@ void dKy_twilight_camelight_set() { var_f31 = 0.0f; if (player_p != NULL) { - var_f30 = camera_p->lookat.eye.y - player_p->current.pos.y; + var_f30 = camera_p->view.lookat.eye.y - player_p->current.pos.y; if (var_f30 < 0.0f) { var_f30 = 0.0f; } @@ -10364,7 +10364,7 @@ void dKy_WaterIn_Light_set() { var_f26 = 0.0f; if (player_p != NULL) { - var_f31 = camera->lookat.eye.y - player_p->current.pos.y; + var_f31 = camera->view.lookat.eye.y - player_p->current.pos.y; if (var_f31 < 0.0f) { var_f31 = 0.0f; } @@ -10385,12 +10385,12 @@ void dKy_WaterIn_Light_set() { sp8 = 1; kankyo->field_0x0c18[i].mCutoffAngle = 60.0f; - sp1C = camera->lookat.eye; + sp1C = camera->view.lookat.eye; sp1C.y += 100000.0f; sp28.SetPos(&sp1C); var_f25 = dComIfG_Bgsp().GroundCross(&sp28); - var_f30 = (var_f25 - camera->lookat.eye.y) / 3000.0f; + var_f30 = (var_f25 - camera->view.lookat.eye.y) / 3000.0f; if (var_f30 < 0.0f) { var_f30 = 0.0f; } @@ -10961,11 +10961,11 @@ void dKy_depth_dist_set(void* process_p) { sp24 = actor_p->eyePos; if (dComIfGp_event_runCheck() && actor_p->tevStr.Type <= 10) { - if (fabsf(sp24.y - camera_p->lookat.eye.y) < 400.0f) { - sp24.y = camera_p->lookat.eye.y; + if (fabsf(sp24.y - camera_p->view.lookat.eye.y) < 400.0f) { + sp24.y = camera_p->view.lookat.eye.y; } - f32 var_f31 = sp24.abs(camera_p->lookat.eye); + f32 var_f31 = sp24.abs(camera_p->view.lookat.eye); if (var_f31 < 2000.0f && var_f31 < kankyo->field_0x1268) { mDoLib_project(&actor_p->eyePos, &sp30); @@ -10978,8 +10978,8 @@ void dKy_depth_dist_set(void* process_p) { )) { cXyz sp18; cXyz spC; - dKyr_get_vectle_calc(&camera_p->lookat.eye, &camera_p->lookat.center, &sp18); - dKyr_get_vectle_calc(&camera_p->lookat.eye, &actor_p->eyePos, &spC); + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &camera_p->view.lookat.center, &sp18); + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &actor_p->eyePos, &spC); s16 temp_r27 = cM_atan2s(sp18.x, sp18.z); s16 temp_r26 = cM_atan2s(spC.x, spC.z); @@ -11226,12 +11226,12 @@ void dKy_murky_set(J3DMaterial* material_p) { tev_col.g = (u8)((s16)tev_col.g + (s16)((36.0f - tev_col.g) * var_f31)); tev_col.b = (u8)((s16)tev_col.b + (s16)((29.0f - tev_col.b) * var_f31)); - if (camera_p != NULL && camera_p->lookat.eye.z < 1800.0f) { + if (camera_p != NULL && camera_p->view.lookat.eye.z < 1800.0f) { f32 var_f30 = 1.0f; - if (camera_p->lookat.eye.z < 1550.0f) { + if (camera_p->view.lookat.eye.z < 1550.0f) { var_f30 = 1.0f; } else { - var_f30 = 1.0f - ((camera_p->lookat.eye.z - 1550.0f) / 250.0f); + var_f30 = 1.0f - ((camera_p->view.lookat.eye.z - 1550.0f) / 250.0f); } tev_col.a = (u8)(255.0f * var_f30); } else { @@ -11369,10 +11369,10 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { Mtx sp1D8; if (mat_name[6] == '2') { C_MTXLightPerspective(sp1D8, dComIfGd_getView()->fovy, - camera_p->aspect, 1.0f, 1.0f, -0.01f, 0.0f); + camera_p->view.aspect, 1.0f, 1.0f, -0.01f, 0.0f); } else { C_MTXLightPerspective(sp1D8, dComIfGd_getView()->fovy, - camera_p->aspect, 0.49f, -0.49f, 0.5f, 0.5f); + camera_p->view.aspect, 0.49f, -0.49f, 0.5f, 0.5f); } #if WIDESCREEN_SUPPORT @@ -11592,20 +11592,20 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { f32 temp_f29; f32 temp_f31; cXyz spB4; - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); J3DGXColor sp10; cXyz spA8; spA8.x = -5853.0f; - spA8.y = camera_p->lookat.eye.y; + spA8.y = camera_p->view.lookat.eye.y; spA8.z = -879.0f; - temp_f31 = spA8.abs(camera_p->lookat.eye); + temp_f31 = spA8.abs(camera_p->view.lookat.eye); temp_f31 = -0.2f + (temp_f31 / 4500.0f); #if DEBUG if (g_kankyoHIO.navy.rainbow_adjust_ON) { - temp_f31 = spA8.abs(camera_p->lookat.eye); + temp_f31 = spA8.abs(camera_p->view.lookat.eye); temp_f31 = temp_f31 / g_kankyoHIO.navy.rainbow_separation_dist + -0.2f; } #endif @@ -11642,9 +11642,9 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { f32 temp_f25 = 1.0f; - spA8 = camera_p->lookat.center; - spA8.y = camera_p->lookat.eye.y; - dKyr_get_vectle_calc(&camera_p->lookat.eye, &spA8, &spB4); + spA8 = camera_p->view.lookat.center; + spA8.y = camera_p->view.lookat.eye.y; + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &spA8, &spB4); f32 temp_f27 = cM3d_VectorProduct2d(0.0f, 0.0f, -0.81f, 0.583f, spB4.x, spB4.z); f32 temp_f26; diff --git a/src/d/d_kankyo_debug.cpp b/src/d/d_kankyo_debug.cpp index db88bf37d3..7fdad26ed2 100644 --- a/src/d/d_kankyo_debug.cpp +++ b/src/d/d_kankyo_debug.cpp @@ -495,7 +495,7 @@ void dKydb_HIO_debug_TVdsp(f32 param_0, f32 param_1, int param_2, int param_3, u void dKydb_HIO_debug_Wind() { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 substick_x = mDoCPd_c::getSubStickX(PAD_3); f32 substick_y = mDoCPd_c::getSubStickY(PAD_3); @@ -539,7 +539,7 @@ void dKydb_HIO_debug_draw() { cXyz pos; cXyz size; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); dKy_set_eyevect_calc2(camera, &pos, 200.0f, 200.0f); s16 var_r30 = g_kankyoHIO.light.field_0x5c; @@ -561,7 +561,7 @@ void dKydb_HIO_debug_draw() { void dKydb_HIO_winddebug_draw() { cXyz size; csXyz rot; - camera_class* temp_r31 = dComIfGp_getCamera(0); + camera_process_class* temp_r31 = dComIfGp_getCamera(0); cXyz pos; if (!mDoCPd_c::getHoldB(PAD_3)) { @@ -591,7 +591,7 @@ void dKydb_winddisp_draw() { csXyz rot; cXyz pos; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); dKy_set_eyevect_calc2(camera, &pos, 200.0f, 200.0f); if (g_kankyoHIO.wind.display_wind_dir == TRUE) { @@ -787,7 +787,7 @@ void dKydb_plight_monitor() { void dKydb_dungeonlight_draw() { cXyz proj; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); int i; fopAc_ac_c* player = dComIfGp_getPlayer(0); @@ -946,7 +946,7 @@ void dKydb_dungeonlight_draw() { if ((g_kankyoHIO.dungeonLight.field_0x8 - 1) == i) { g_env_light.dungeonlight[i].mPosition = player->current.pos; } else if (g_kankyoHIO.dungeonLight.field_0x8 == i + 160) { - g_env_light.dungeonlight[i].mPosition = camera->lookat.center; + g_env_light.dungeonlight[i].mPosition = camera->view.lookat.center; } } } diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index fce7f79a71..8150e82887 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -42,29 +42,29 @@ void dKyr_get_vectle_calc(cXyz* i_vecA, cXyz* i_vecB, cXyz* o_out) { static void dKy_set_eyevect_calc(camera_class* i_camera, Vec* o_out, f32 param_2, f32 param_3) { cXyz calc; - get_vectle_calc(&i_camera->lookat.eye, &i_camera->lookat.center, &calc); - o_out->x = i_camera->lookat.eye.x + calc.x * param_2; - o_out->y = (i_camera->lookat.eye.y + calc.y * param_3) - 200.0f; - o_out->z = i_camera->lookat.eye.z + calc.z * param_2; + get_vectle_calc(&i_camera->view.lookat.eye, &i_camera->view.lookat.center, &calc); + o_out->x = i_camera->view.lookat.eye.x + calc.x * param_2; + o_out->y = (i_camera->view.lookat.eye.y + calc.y * param_3) - 200.0f; + o_out->z = i_camera->view.lookat.eye.z + calc.z * param_2; } void dKy_set_eyevect_calc2(camera_class* i_camera, Vec* o_out, f32 param_2, f32 param_3) { cXyz calc; DOUBLE_POS pos; - pos.x = i_camera->lookat.center.x - i_camera->lookat.eye.x; + pos.x = i_camera->view.lookat.center.x - i_camera->view.lookat.eye.x; if (param_3 != 0.0f) { - pos.y = i_camera->lookat.center.y - i_camera->lookat.eye.y; + pos.y = i_camera->view.lookat.center.y - i_camera->view.lookat.eye.y; } else { pos.y = 0.0f; } - pos.z = i_camera->lookat.center.z - i_camera->lookat.eye.z; + pos.z = i_camera->view.lookat.center.z - i_camera->view.lookat.eye.z; vectle_calc(&pos, &calc); - o_out->x = i_camera->lookat.eye.x + calc.x * param_2; - o_out->y = i_camera->lookat.eye.y + calc.y * param_3; - o_out->z = i_camera->lookat.eye.z + calc.z * param_2; + o_out->x = i_camera->view.lookat.eye.x + calc.x * param_2; + o_out->y = i_camera->view.lookat.eye.y + calc.y * param_3; + o_out->z = i_camera->view.lookat.eye.z + calc.z * param_2; if (param_3 == 0.0f) { o_out->y = 0.0f; @@ -91,7 +91,7 @@ static void dKyr_set_btitex(GXTexObj* i_obj, ResTIMG* i_img) { void dKyr_lenzflare_move() { dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket; dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz eyeVect; cXyz field_0x3c; @@ -121,7 +121,7 @@ void dKyr_lenzflare_move() { lenz_packet->field_0x94 *= S2DEG_CONSTANT; // convert from short angle to degrees lenz_packet->field_0x94 += 180.0f; - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &camFwd); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &camFwd); for (int i = 2; i < 8; i++) { if (i == 2) { @@ -149,8 +149,8 @@ static BOOL dKyr_moon_arrival_check() { void dKyr_sun_move() { dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket; dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket; - camera_class* camera_p2 = dComIfGp_getCamera(0); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera_p2 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz lightDir; f32 pulse_pos; @@ -165,17 +165,17 @@ void dKyr_sun_move() { u32 stage_type = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); if (g_env_light.base_light.mColor.r == 0 && stage_type != ST_ROOM) { - dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.base_light.mPosition, + dKyr_get_vectle_calc(&camera_p2->view.lookat.eye, &g_env_light.base_light.mPosition, &lightDir); } else { - dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.sun_light_pos, &lightDir); + dKyr_get_vectle_calc(&camera_p2->view.lookat.eye, &g_env_light.sun_light_pos, &lightDir); } - sun_packet->mPos[0].x = camera_p2->lookat.eye.x + 8000.0f * lightDir.x; - sun_packet->mPos[0].y = camera_p2->lookat.eye.y + 8000.0f * lightDir.y; - sun_packet->mPos[0].z = camera_p2->lookat.eye.z + 8000.0f * lightDir.z; + sun_packet->mPos[0].x = camera_p2->view.lookat.eye.x + 8000.0f * lightDir.x; + sun_packet->mPos[0].y = camera_p2->view.lookat.eye.y + 8000.0f * lightDir.y; + sun_packet->mPos[0].z = camera_p2->view.lookat.eye.z + 8000.0f * lightDir.z; - f32 horizon_y = (sun_packet->mPos[0].y - camera_p2->lookat.eye.y) / 8000.0f; + f32 horizon_y = (sun_packet->mPos[0].y - camera_p2->view.lookat.eye.y) / 8000.0f; if (horizon_y < 0.0f) { horizon_y = 0.0f; } @@ -389,7 +389,7 @@ void dKyr_sun_move() { } if (dKyr_moon_arrival_check()) { - f32 alpha = (sun_packet->mPos[0].y - camera_p2->lookat.eye.y) / -8000.0f; + f32 alpha = (sun_packet->mPos[0].y - camera_p2->view.lookat.eye.y) / -8000.0f; alpha *= alpha; alpha *= 6.0f; @@ -406,10 +406,10 @@ void dKyr_sun_move() { sun_packet->mSunAlpha >= 0.2f) { cXyz sp24; - dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.sun_light_pos, &lightDir); - sp24.x = camera_p2->lookat.eye.x + 30160.0f * lightDir.x; - sp24.y = camera_p2->lookat.eye.y + 30160.0f * lightDir.y; - sp24.z = camera_p2->lookat.eye.z + 30160.0f * lightDir.z; + dKyr_get_vectle_calc(&camera_p2->view.lookat.eye, &g_env_light.sun_light_pos, &lightDir); + sp24.x = camera_p2->view.lookat.eye.x + 30160.0f * lightDir.x; + sp24.y = camera_p2->view.lookat.eye.y + 30160.0f * lightDir.y; + sp24.z = camera_p2->view.lookat.eye.z + 30160.0f * lightDir.z; sp24.y -= 21678.0f; sun_packet->field_0x58 = dComIfGp_particle_set(sun_packet->field_0x58, 0x11C, &sp24, 0, 0); } @@ -419,8 +419,8 @@ void dKyr_rain_init() { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); g_env_light.mpRainPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", 0x4a); g_env_light.mpRainPacket->mpTex2 = (u8*)dComIfG_getObjectRes("Always", 0x57); - g_env_light.mpRainPacket->mCamEyePos = camera->lookat.eye; - g_env_light.mpRainPacket->mCamCenterPos = camera->lookat.center; + g_env_light.mpRainPacket->mCamEyePos = camera->view.lookat.eye; + g_env_light.mpRainPacket->mCamCenterPos = camera->view.lookat.center; g_env_light.mpRainPacket->mCenterDeltaMul = 0.0f; g_env_light.mpRainPacket->field_0x3700 = 0.0f; g_env_light.mpRainPacket->mSibukiAlpha = 0.0f; @@ -439,17 +439,17 @@ void dKyr_rain_init() { } static void rain_bg_chk(dKankyo_rain_Packet* i_packet, int i_idx) { - i_packet->mRainEff[i_idx].field_0x30 = dComIfGp_getCamera(0)->lookat.center.y + -800.0f; + i_packet->mRainEff[i_idx].field_0x30 = dComIfGp_getCamera(0)->view.lookat.center.y + -800.0f; } static BOOL overhead_bg_chk() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); BOOL chk = false; dBgS_ObjGndChk_All gndchk; dBgS_RoofChk roofchk; - cXyz chkPos = camera->lookat.eye; + cXyz chkPos = camera->view.lookat.eye; chkPos.y += 50.0f; roofchk.SetPos(chkPos); @@ -465,7 +465,7 @@ static BOOL overhead_bg_chk() { chkPos.y += 10000.0f; gndchk.SetPos(&chkPos); - if (dComIfG_Bgsp().GroundCross(&gndchk) > camera->lookat.eye.y + 50.0f) { + if (dComIfG_Bgsp().GroundCross(&gndchk) > camera->view.lookat.eye.y + 50.0f) { chk = true; } @@ -473,7 +473,7 @@ static BOOL overhead_bg_chk() { } static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); BOOL chk = FALSE; dBgS_ObjGndChk_All gndchk; @@ -481,11 +481,11 @@ static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) { cXyz chk_pos; cXyz vectle; - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &vectle); - chk_pos.x = camera->lookat.eye.x + vectle.x * dist; - chk_pos.y = camera->lookat.eye.y + vectle.y * dist; - chk_pos.z = camera->lookat.eye.z + vectle.z * dist; - chk_pos.y = 50.0f + camera->lookat.eye.y; + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &vectle); + chk_pos.x = camera->view.lookat.eye.x + vectle.x * dist; + chk_pos.y = camera->view.lookat.eye.y + vectle.y * dist; + chk_pos.z = camera->view.lookat.eye.z + vectle.z * dist; + chk_pos.y = 50.0f + camera->view.lookat.eye.y; *ppos = chk_pos; roofchk.SetPos(chk_pos); @@ -501,7 +501,7 @@ static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) { chk_pos.y += 10000.0f; gndchk.SetPos(&chk_pos); - if (dComIfG_Bgsp().GroundCross(&gndchk) > 50.0f + camera->lookat.eye.y) { + if (dComIfG_Bgsp().GroundCross(&gndchk) > 50.0f + camera->view.lookat.eye.y) { chk = TRUE; } return chk; @@ -552,9 +552,9 @@ void dKyr_rain_move() { } if (rain_packet->raincnt != 0) { - dKyr_get_vectle_calc(&camera->lookat.center, &rain_packet->mCamCenterPos, &spB4); + dKyr_get_vectle_calc(&camera->view.lookat.center, &rain_packet->mCamCenterPos, &spB4); - var_f30 = rain_packet->mCamEyePos.abs(camera->lookat.eye); + var_f30 = rain_packet->mCamEyePos.abs(camera->view.lookat.eye); if (var_f30 > 10.0f) { var_f30 = (var_f30 - 10.0f) / 50.0f; @@ -565,19 +565,19 @@ void dKyr_rain_move() { var_f30 = 0.0f; } - rain_packet->mCamEyePos.x = camera->lookat.eye.x; - rain_packet->mCamEyePos.z = camera->lookat.eye.z; + rain_packet->mCamEyePos.x = camera->view.lookat.eye.x; + rain_packet->mCamEyePos.z = camera->view.lookat.eye.z; - var_f28 = rain_packet->mCamEyePos.abs(camera->lookat.eye); + var_f28 = rain_packet->mCamEyePos.abs(camera->view.lookat.eye); var_f28 = var_f28 / 20.0f; if (var_f28 > 1.0f) { var_f28 = 1.0f; } spA8.y += -(var_f28 * 15.0f); - rain_packet->mCamEyePos = camera->lookat.eye; + rain_packet->mCamEyePos = camera->view.lookat.eye; - var_f29 = rain_packet->mCamCenterPos.abs(camera->lookat.center); + var_f29 = rain_packet->mCamCenterPos.abs(camera->view.lookat.center); if (var_f29 > 10.0f) { var_f29 = (var_f29 - 10.0f) / 50.0f; if (var_f29 > 1.0f) { @@ -595,7 +595,7 @@ void dKyr_rain_move() { cLib_addCalc(&rain_packet->mCenterDelta.x, spB4.x, 0.2f, 0.1f, 0.01f); cLib_addCalc(&rain_packet->mCenterDelta.y, spB4.y, 0.2f, 0.1f, 0.01f); cLib_addCalc(&rain_packet->mCenterDelta.z, spB4.z, 0.2f, 0.1f, 0.01f); - rain_packet->mCamCenterPos = camera->lookat.center; + rain_packet->mCamCenterPos = camera->view.lookat.center; dKy_set_eyevect_calc2(camera, &spFC, 700.0f, 600.0f); spD8.x = spD8.y = spD8.z = 0.0f; @@ -756,9 +756,9 @@ void dKyr_rain_move() { cXyz sp80; f32 sp10 = 800.0f; sp80 = spC0; - sp80.y = camera->lookat.eye.y; + sp80.y = camera->view.lookat.eye.y; - if (camera->lookat.eye.abs(sp80) < sp10) { + if (camera->view.lookat.eye.abs(sp80) < sp10) { var_f31 *= rain_packet->mOverheadFade * 1.0f; } } @@ -820,7 +820,7 @@ void dKyr_rain_move() { var_f31 = 0.0f; } - if (camera->lookat.eye.y < 0.0f) { + if (camera->view.lookat.eye.y < 0.0f) { var_f31 = 0.0f; } } else { @@ -901,7 +901,7 @@ void dKyr_housi_move() { } if (g_env_light.field_0xea9 == 2) { - sp54 = camera->lookat.eye; + sp54 = camera->view.lookat.eye; sp54.y += 100000.0f; cam_gndchk.SetPos(&sp54); @@ -952,14 +952,14 @@ void dKyr_housi_move() { dBgS_CamGndChk_Wtr sp90; cXyz sp48; - camera_class* cam_p = dComIfGp_getCamera(0); - sp48 = cam_p->lookat.eye; + camera_process_class* cam_p = dComIfGp_getCamera(0); + sp48 = cam_p->view.lookat.eye; sp48.y += 100000.0f; sp90.SetPos(&sp48); f32 gnd_cross = dComIfG_Bgsp().GroundCross(&sp90); - if (gnd_cross > cam_p->lookat.eye.y) { - var_f31 = (gnd_cross - cam_p->lookat.eye.y) / 700.0f; + if (gnd_cross > cam_p->view.lookat.eye.y) { + var_f31 = (gnd_cross - cam_p->view.lookat.eye.y) / 700.0f; if (var_f31 < 0.0f) { var_f31 = 0.0f; } @@ -1202,7 +1202,7 @@ void dKyr_housi_move() { } if (dKy_darkworld_check() == true || var_r24 == 1) { - f32 var_f1_6 = sp6C.abs(camera->lookat.eye); + f32 var_f1_6 = sp6C.abs(camera->view.lookat.eye); effect->field_0x48 = var_f1_6; f32 var_f1_7; @@ -1218,7 +1218,7 @@ void dKyr_housi_move() { effect->mAlpha = var_f1_7; } - f32 var_f1_8 = sp6C.abs(camera->lookat.eye); + f32 var_f1_8 = sp6C.abs(camera->view.lookat.eye); f32 temp_f25 = var_f1_8 / 2000.0f; effect->field_0x48 = 1.0f - (temp_f25 * temp_f25); } @@ -1239,7 +1239,7 @@ void dKyr_snow_init() { } g_env_light.mpSnowPacket->field_0x6d88 = 0; - g_env_light.mpSnowPacket->field_0x6d74 = camera->lookat.eye; + g_env_light.mpSnowPacket->field_0x6d74 = camera->view.lookat.eye; g_env_light.mpSnowPacket->field_0x6d80 = 0.0f; g_env_light.mpSnowPacket->field_0x6d84 = 0.0f; g_env_light.mpSnowPacket->field_0x6d8a = 0; @@ -1283,11 +1283,11 @@ void dKyr_snow_move() { dKy_set_eyevect_calc2(camera, &spB8, 500.0f, 500.0f); dKy_set_eyevect_calc2(camera, &spAC, 1000.0f, 1000.0f); - if (snow_packet->field_0x6d74.abs(camera->lookat.eye) > 1500.0f) { + if (snow_packet->field_0x6d74.abs(camera->view.lookat.eye) > 1500.0f) { snow_packet->field_0x6d88 = 0; } - snow_packet->field_0x6d74 = camera->lookat.eye; + snow_packet->field_0x6d74 = camera->view.lookat.eye; spA0.x = spA0.y = spA0.z = 0.0f; cXyz* temp_r21 = dKyw_get_wind_vec(); @@ -1304,9 +1304,9 @@ void dKyr_snow_move() { } cXyz sp58; - spC8.x = camera->lookat.center.x - camera->lookat.eye.x; + spC8.x = camera->view.lookat.center.x - camera->view.lookat.eye.x; spC8.y = 0.0f; - spC8.z = camera->lookat.center.z - camera->lookat.eye.z; + spC8.z = camera->view.lookat.center.z - camera->view.lookat.eye.z; vectle_calc(&spC8, &sp58); snow_packet->field_0x6d84 = @@ -1341,7 +1341,7 @@ void dKyr_snow_move() { cXyz sp4C; sp88 = sp94; - if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f && + if (camera->view.lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f && snow_packet->mSnowEff[i].mPosition.y < temp_f19 + 250.0f) { f32 var_f1_3 = ((temp_f19 + 250.0f) - snow_packet->mSnowEff[i].mPosition.y) / 250.0f; @@ -1368,7 +1368,7 @@ void dKyr_snow_move() { snow_packet->mSnowEff[i].mPosition.z += sp4C.z * 5.3f; sp88 = sp94; - if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f && + if (camera->view.lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f && snow_packet->mSnowEff[i].mBasePos.y < temp_f19 + 250.0f) { f32 var_f1_5 = ((temp_f19 + 250.0f) - snow_packet->mSnowEff[i].mBasePos.y) / 250.0f; @@ -1438,7 +1438,7 @@ void dKyr_snow_move() { sp7C = snow_packet->mSnowEff[i].mPosition; - f32 var_f1_11 = sp7C.abs(camera->lookat.eye); + f32 var_f1_11 = sp7C.abs(camera->view.lookat.eye); f32 var_f26 = var_f1_11 / 100.0f; if (var_f26 > 1.0) { var_f26 = 1.0; @@ -1481,7 +1481,7 @@ void dKyr_snow_move() { sp7C = snow_packet->mSnowEff[i].mBasePos; - var_f1_11 = sp7C.abs(camera->lookat.eye); + var_f1_11 = sp7C.abs(camera->view.lookat.eye); f32 temp_f29 = var_f1_11 / 100.0f; if (temp_f29 > 1.0) { temp_f29 = 1.0; @@ -1708,7 +1708,7 @@ void cloud_shadow_move() { f32 sp20 = 0.0f; f32 sp1C = 700.0f; - f32 sp24 = pos.abs(camera->lookat.eye); + f32 sp24 = pos.abs(camera->view.lookat.eye); f32 sp18 = (sp24 / rnd_pos); if (sp18 > 1.0f) { @@ -1869,7 +1869,7 @@ void vrkumo_move() { #endif } - sp6C -= 0.09f * (camera->lookat.eye.y - sp2C); + sp6C -= 0.09f * (camera->view.lookat.eye.y - sp2C); } for (int i = 0; i < 100; i++) { @@ -2035,13 +2035,13 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) { cXyz pos[4]; u16 date = dComIfGs_getDate(); - cXyz sp60 = camera->lookat.eye + g_env_light.moon_pos; - sp60.y = camera->lookat.eye.y - g_env_light.moon_pos.y; + cXyz sp60 = camera->view.lookat.eye + g_env_light.moon_pos; + sp60.y = camera->view.lookat.eye.y - g_env_light.moon_pos.y; cXyz moon_pos; - moon_pos.x = sp60.x - camera->lookat.eye.x; - moon_pos.y = sp60.y - camera->lookat.eye.y; - moon_pos.z = sp60.z - camera->lookat.eye.z; + moon_pos.x = sp60.x - camera->view.lookat.eye.x; + moon_pos.y = sp60.y - camera->view.lookat.eye.y; + moon_pos.z = sp60.z - camera->view.lookat.eye.z; Vec vp, lp; @@ -2166,7 +2166,7 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) { 1.0f, 0.78f, 0.6f, 0.83f, }; - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &camfwd); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &camfwd); f32 cam_distXZ = JMAFastSqrt((camfwd.x * camfwd.x) + (camfwd.z * camfwd.z)); f32 cam_theta = atan2f(camfwd.x, camfwd.z); @@ -2363,21 +2363,21 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) { spB4 = envlight->moon_pos; moon_pos = spB4; } else { - spB4 = camera->lookat.eye + envlight->moon_pos; - moon_pos.x = spB4.x - camera->lookat.eye.x; - moon_pos.y = spB4.y - camera->lookat.eye.y; - moon_pos.z = spB4.z - camera->lookat.eye.z; + spB4 = camera->view.lookat.eye + envlight->moon_pos; + moon_pos.x = spB4.x - camera->view.lookat.eye.x; + moon_pos.y = spB4.y - camera->view.lookat.eye.y; + moon_pos.z = spB4.z - camera->view.lookat.eye.z; } } if (strcmp(dComIfGp_getStartStageName(), "F_SP103") == 0 && dKy_daynight_check()) { - spB4.x = 3900.0f + camera->lookat.eye.x; - spB4.y = 8052.0f + camera->lookat.eye.y; - spB4.z = -9072.0f + camera->lookat.eye.z; + spB4.x = 3900.0f + camera->view.lookat.eye.x; + spB4.y = 8052.0f + camera->view.lookat.eye.y; + spB4.z = -9072.0f + camera->view.lookat.eye.z; - moon_pos.x = spB4.x - camera->lookat.eye.x; - moon_pos.y = spB4.y - camera->lookat.eye.y; - moon_pos.z = spB4.z - camera->lookat.eye.z; + moon_pos.x = spB4.x - camera->view.lookat.eye.x; + moon_pos.y = spB4.y - camera->view.lookat.eye.y; + moon_pos.z = spB4.z - camera->view.lookat.eye.z; } int weekday = date % 8; @@ -2516,7 +2516,7 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) { }; if (strcmp(dComIfGp_getStartStageName(), "F_SP200") != 0) { - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &camfwd); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &camfwd); f32 cam_distXZ = JMAFastSqrt((camfwd.x * camfwd.x) + (camfwd.z * camfwd.z)); f32 cam_theta = atan2f(camfwd.x, camfwd.z); f32 cam_phi = atan2f(camfwd.y, cam_distXZ); @@ -3167,7 +3167,7 @@ void dKyr_drawRain(Mtx drawMtx, u8** tex) { sp3C.y = rain_packet->mRainEff[i].mBasePos.y + rain_packet->mRainEff[i].mPosition.y; sp3C.z = rain_packet->mRainEff[i].mBasePos.z + rain_packet->mRainEff[i].mPosition.z; - f32 dist = 0.1f + (sp3C.abs(camera->lookat.eye) / 1500.0f); + f32 dist = 0.1f + (sp3C.abs(camera->view.lookat.eye) / 1500.0f); if (dist > 1.0f) { dist = 1.0f; } @@ -3254,8 +3254,8 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) { } if (strcmp(dComIfGp_getStartStageName(), "F_SP113") == 0 && dComIfGp_roomControl_getStayNo() == 1) { - if ((camera->lookat.eye.z < 5100.0f || (camera->lookat.eye.x < -3250.0f && camera->lookat.eye.y < -50.0f)) || - (camera->lookat.eye.x < -2700.0f && camera->lookat.eye.z > 15750.0f)) + if ((camera->view.lookat.eye.z < 5100.0f || (camera->view.lookat.eye.x < -3250.0f && camera->view.lookat.eye.y < -50.0f)) || + (camera->view.lookat.eye.x < -2700.0f && camera->view.lookat.eye.z > 15750.0f)) { return; } @@ -3271,7 +3271,7 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) { cLib_addCalc(&rain_packet->mSibukiAlpha, alpha, 0.2f, 30.0f, 0.001f); dKy_set_eyevect_calc(camera, &eyevect, 7000.0f, 4000.0f); cXyz camdir; - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &camdir); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &camdir); f32 alphaFade = 0.0f; if (camdir.y > alphaFade) { @@ -3439,7 +3439,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) { GXColor sp1C = {0x32, 0x32, 0x32, 0xFF}; GXColor sp18 = {0xFF, 0xD7, 0xF0, 0xFF}; - camera_class* cam_p = dComIfGp_getCamera(0); + camera_process_class* cam_p = dComIfGp_getCamera(0); if (g_env_light.fishing_hole_season == 3) { sp1C.r = 0x78; sp1C.g = 0x0A; @@ -3450,7 +3450,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) { sp18.b = 0x00; } - dKy_ParticleColor_get_bg(&cam_p->lookat.eye, NULL, &color_reg1, &color_reg0, &sp1C, &sp18, + dKy_ParticleColor_get_bg(&cam_p->view.lookat.eye, NULL, &color_reg1, &color_reg0, &sp1C, &sp18, 0.0f); var_f25 = 255.0f; } @@ -3774,7 +3774,7 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) { } if (!g_env_light.camera_water_in_status) { - dKy_ParticleColor_get_bg(&camera->lookat.eye, NULL, &sp64, &sp60, &sp5C, &sp58, 0.0f); + dKy_ParticleColor_get_bg(&camera->view.lookat.eye, NULL, &sp64, &sp60, &sp5C, &sp58, 0.0f); color_reg0.r = 178.5f + (0.3f * sp60.r); color_reg0.g = 178.5f + (0.3f * sp60.g); color_reg0.b = 178.5f + (0.3f * sp60.b); @@ -3892,7 +3892,7 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) { GXSetTevColor(GX_TEVREG0, color_reg0); f32 sp38 = 2.0f * (i / 500.0f) * snow_packet->field_0x6d80; - f32 sp68 = sp50 * (camera->lookat.eye.abs(sp7C) / 1000.0f); + f32 sp68 = sp50 * (camera->view.lookat.eye.abs(sp7C) / 1000.0f); if (sp68 > 1.0f) { sp68 = 1.0f; } @@ -4100,11 +4100,11 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) { if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == 0 && dComIfG_play_c::getLayerNo(0) == 0) { moon_pos = envlight->moon_pos; } else { - moon_pos = camera->lookat.eye + envlight->moon_pos; + moon_pos = camera->view.lookat.eye + envlight->moon_pos; if (sp38) { - moon_pos.x = 3900.0f + camera->lookat.eye.x; - moon_pos.y = 8052.0f + camera->lookat.eye.y; - moon_pos.z = -9072.0f + camera->lookat.eye.z; + moon_pos.x = 3900.0f + camera->view.lookat.eye.x; + moon_pos.y = 8052.0f + camera->view.lookat.eye.y; + moon_pos.z = -9072.0f + camera->view.lookat.eye.z; } } @@ -4140,9 +4140,9 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) { rot = 0.0f; } - spBC.x = camera->lookat.eye.x; - spBC.y = camera->lookat.eye.y; - spBC.z = camera->lookat.eye.z; + spBC.x = camera->view.lookat.eye.x; + spBC.y = camera->view.lookat.eye.y; + spBC.z = camera->view.lookat.eye.z; f32 sp34 = -1.0f; int sp30 = 0; @@ -4336,7 +4336,7 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) { GXTexObj texobj, fb_texobj; if (g_env_light.mMoyaMode < 50) { - dKy_ParticleColor_get_bg(&camera->lookat.eye, NULL, &sp48, &sp44, &sp40, &sp3C, 0.0f); + dKy_ParticleColor_get_bg(&camera->view.lookat.eye, NULL, &sp48, &sp44, &sp40, &sp3C, 0.0f); f32 temp_f30 = 0.4f; color_reg0.r = (sp38.r * temp_f30) + (sp44.r * (1.0f - temp_f30)); @@ -4396,11 +4396,11 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) { ResTIMG* fb_timg = mDoGph_gInf_c::getFrameBufferTimg(); dDlst_window_c* window = dComIfGp_getWindow(0); - camera_class* window_cam = dComIfGp_getCamera(window->getCameraID()); + camera_process_class* window_cam = dComIfGp_getCamera(window->getCameraID()); dKyr_set_btitex_common(&fb_texobj, fb_timg, GX_TEXMAP0); f32 scale = 0.49f; - C_MTXLightPerspective(sp120, window_cam->fovy, window_cam->aspect, scale, -scale, 0.5f, 0.5f); + C_MTXLightPerspective(sp120, window_cam->view.fovy, window_cam->view.aspect, scale, -scale, 0.5f, 0.5f); #if WIDESCREEN_SUPPORT mDoGph_gInf_c::setWideZoomLightProjection(sp120); #endif @@ -4534,7 +4534,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { dScnKy_env_light_c* envlight = dKy_getEnvlight(); dKankyo_vrkumo_Packet* vrkumo_packet = g_env_light.mpVrkumoPacket; camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - camera_class* camera2 = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* camera2 = (camera_process_class*)dComIfGp_getCamera(0); Mtx camMtx; Mtx rotMtx; @@ -4623,7 +4623,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { } #endif - unused = 1.0f - (0.09f * (camera->lookat.eye.y - sp70)); + unused = 1.0f - (0.09f * (camera->view.lookat.eye.y - sp70)); } if (g_env_light.daytime > 105.0f && g_env_light.daytime < 240.0f && !dComIfGp_event_runCheck() && sun_packet != NULL && sun_packet->mSunAlpha > 0.0f) { @@ -4875,10 +4875,10 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { pos[3].y = sp108.y * spCC; pos[3].z = sp108.z * spCC; - pos[0] += camera->lookat.eye; - pos[1] += camera->lookat.eye; - pos[2] += camera->lookat.eye; - pos[3] += camera->lookat.eye; + pos[0] += camera->view.lookat.eye; + pos[1] += camera->view.lookat.eye; + pos[2] += camera->view.lookat.eye; + pos[3] += camera->view.lookat.eye; sp84 = 0; if (dComIfGd_getView()->fovy > 40.0f) { @@ -5029,7 +5029,7 @@ void dKyr_thunder_move() { } if (sp8 == 1) { - effect->mLightInfluence.mPosition = camera->lookat.eye; + effect->mLightInfluence.mPosition = camera->view.lookat.eye; effect->mLightInfluence.mColor.r = 0; effect->mLightInfluence.mColor.g = 0; effect->mLightInfluence.mColor.b = 0; @@ -5044,7 +5044,7 @@ void dKyr_thunder_move() { if (g_env_light.mThunderEff.field_0x2 != 0) { g_env_light.mThunderEff.field_0x2 = 0; - effect->mLightInfluence.mPosition = camera->lookat.eye; + effect->mLightInfluence.mPosition = camera->view.lookat.eye; effect->mLightInfluence.mColor.r = 0; effect->mLightInfluence.mColor.g = 0; effect->mLightInfluence.mColor.b = 0; @@ -5062,7 +5062,7 @@ void dKyr_thunder_move() { fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); } } else if (cM_rndF(1.0f) < 0.005f && g_env_light.mThunderEff.mMode < 10 && sp10 != 1) { - effect->mLightInfluence.mPosition = camera->lookat.eye; + effect->mLightInfluence.mPosition = camera->view.lookat.eye; effect->mLightInfluence.mColor.r = 0; effect->mLightInfluence.mColor.g = 0; effect->mLightInfluence.mColor.b = 0; @@ -5108,10 +5108,10 @@ void dKyr_thunder_move() { if (effect->mState != 0) { if (effect->mState < 10) { - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &sp28); - effect->mLightInfluence.mPosition.x = camera->lookat.eye.x - (sp28.x * effect->field_0x14); - effect->mLightInfluence.mPosition.y = camera->lookat.eye.y + 2000.0f; - effect->mLightInfluence.mPosition.z = camera->lookat.eye.z - (sp28.z * effect->field_0x18); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &sp28); + effect->mLightInfluence.mPosition.x = camera->view.lookat.eye.x - (sp28.x * effect->field_0x14); + effect->mLightInfluence.mPosition.y = camera->view.lookat.eye.y + 2000.0f; + effect->mLightInfluence.mPosition.z = camera->view.lookat.eye.z - (sp28.z * effect->field_0x18); if (sp10 == 2) { effect->mLightInfluence.mPosition.x = 195520.0f; @@ -5125,7 +5125,7 @@ void dKyr_thunder_move() { if (g_env_light.field_0x12d6 == 0) { if (sp10 == 0) { - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &sp28); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &sp28); f32 temp_f31; if (sp28.y < 0.2f) { @@ -5375,11 +5375,11 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { ResTIMG* fb_timg = mDoGph_gInf_c::getFrameBufferTimg(); dDlst_window_c* window = dComIfGp_getWindow(0); - camera_class* window_cam = dComIfGp_getCamera(window->getCameraID()); + camera_process_class* window_cam = dComIfGp_getCamera(window->getCameraID()); dKyr_set_btitex_common(&fb_texobj, fb_timg, GX_TEXMAP0); f32 scale = 0.49f; - C_MTXLightPerspective(sp120, window_cam->fovy, window_cam->aspect, scale, -scale, 0.5f, 0.5f); + C_MTXLightPerspective(sp120, window_cam->view.fovy, window_cam->view.aspect, scale, -scale, 0.5f, 0.5f); cMtx_concat(sp120, j3dSys.getViewMtx(), spF0); rot += 2.0f; @@ -5433,7 +5433,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { if (effect->mStatus != 0 && effect->mStatus != 1 && effect->mStatus != 11) { sp4C = effect->mBasePos + effect->mPosition; - f32 var_f31 = camera->lookat.eye.abs(sp4C); + f32 var_f31 = camera->view.lookat.eye.abs(sp4C); if (var_f31 < 250.0f) { if (var_f31 < 150.0f) { var_f31 = 0.0f; @@ -5657,10 +5657,10 @@ void dKyr_mud_move() { cLib_addCalc(&mud_packet->mEffect[i].field_0x38, sp10 * mud_packet->field_0x1c3c, 0.25f, sp1C, 0.000001f); sp68.x = mud_packet->mEffect[i].mBasePos.x + mud_packet->mEffect[i].mPosition.x; - sp68.y = camera->lookat.eye.y; + sp68.y = camera->view.lookat.eye.y; sp68.z = mud_packet->mEffect[i].mBasePos.z + mud_packet->mEffect[i].mPosition.z; - f32 spC = sp68.abs(camera->lookat.eye); + f32 spC = sp68.abs(camera->view.lookat.eye); f32 var_f30 = spC / 400.0f; if (var_f30 > 1.0f) { var_f30 = 1.0f; @@ -5970,7 +5970,7 @@ static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) { f32 temp_f30 = 0.2f + (0.8f * fabsf(cM_ssin(effect->field_0x3c))); sp7C = effect->mBasePos + effect->mPosition; - if ((strcmp(dComIfGp_getStartStageName(), "D_MN08") != 0 || dComIfGp_roomControl_getStayNo() != 1 || i < 1600 || !(camera->lookat.eye.x >= -5000.0f)) && !(var_f31 > 9000.0f)) { + if ((strcmp(dComIfGp_getStartStageName(), "D_MN08") != 0 || dComIfGp_roomControl_getStayNo() != 1 || i < 1600 || !(camera->view.lookat.eye.x >= -5000.0f)) && !(var_f31 > 9000.0f)) { if (dComIfGd_getView()->fovy > 40.0f) { cXyz proj; Vec sp34; @@ -5991,7 +5991,7 @@ static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) { f32 sp3C = 150.0f; f32 sp38 = 250.0f; - f32 var_f29 = camera->lookat.eye.abs(sp7C); + f32 var_f29 = camera->view.lookat.eye.abs(sp7C); if (var_f29 < sp38) { if (var_f29 < sp3C) { var_f29 = 0.0f; @@ -6216,7 +6216,7 @@ void dKyr_evil_draw(Mtx drawMtx, u8** tex) { f32 sp50 = 50.0f; f32 sp4C = 800.0f; - f32 var_f31 = camera->lookat.eye.abs(spA4); + f32 var_f31 = camera->view.lookat.eye.abs(spA4); if (var_f31 < sp4C) { if (var_f31 < sp50) { var_f31 = 0.0f; diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 0e0617639d..5ab08fd2b0 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -530,12 +530,12 @@ static void wether_move_rain() { } break; case TRUE: - camera_class* cam = dComIfGp_getCamera(0); + camera_process_class* cam = dComIfGp_getCamera(0); dKyr_rain_move(); if (g_env_light.mSnowCount == 0 && cam != NULL) { // Stage is not Fishing Pond - if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->lookat.eye.y > 0.0f) { + if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->view.lookat.eye.y > 0.0f) { if (g_env_light.raincnt < 125.0f) { mDoAud_rainPlay(FALSE); } else { diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 0dd064f69a..7b795d9981 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -43,7 +43,7 @@ int dThunder_c::draw() { static cXyz l_offsetPos(0.0f, 40.0f, -250.0f); static cXyz l_scale(1.0f, 1.0f, 1.0f); - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); mDoMtx_stack_c::transS(mThunderPos.x, mThunderPos.y, mThunderPos.z); mDoMtx_stack_c::YrotM(field_0x168); @@ -141,7 +141,7 @@ static int dThunder_Create(kankyo_class* i_this) { int dThunder_c::create() { dScnKy_env_light_c* env_light = dKy_getEnvlight(); - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz spB8; cXyz spC4; cXyz spD0; @@ -180,7 +180,7 @@ int dThunder_c::create() { var_f29 = 0.25f; } - field_0x168 = cLib_targetAngleY(&camera_p->lookat.eye, &camera_p->lookat.center); + field_0x168 = cLib_targetAngleY(&camera_p->view.lookat.eye, &camera_p->view.lookat.center); if (!(g_Counter.mCounter0 & 1)) { field_0x168 += 0x7FFF; @@ -217,7 +217,7 @@ int dThunder_c::create() { field_0x138.y = var_f29 * (var_f31 + cM_rndF(var_f30 - var_f31)); field_0x138.z = 1.0f; - dKyr_get_vectle_calc(&camera_p->lookat.eye, &camera_p->lookat.center, &spB8); + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &camera_p->view.lookat.center, &spB8); // JMAFastSqrt doesn't match here when it should, probably needs to be fixed // var_f29_2 = JMAFastSqrt(spB8.x * spB8.x + spB8.z * spB8.z); @@ -244,9 +244,9 @@ int dThunder_c::create() { spD0.z = cM_scos(temp_r31) * cM_scos(temp_r28); f32 temp_f1_3 = cM_rndF(spC4.x); - mThunderPos.x = camera_p->lookat.eye.x + (spB8.x * 100000.0f) + (spD0.x * temp_f1_3); - mThunderPos.y = camera_p->lookat.eye.y + 2000.0f + cM_rndF(spC4.y); - mThunderPos.z = camera_p->lookat.eye.z + (spB8.z * 100000.0f) + (spD0.z * temp_f1_3); + mThunderPos.x = camera_p->view.lookat.eye.x + (spB8.x * 100000.0f) + (spD0.x * temp_f1_3); + mThunderPos.y = camera_p->view.lookat.eye.y + 2000.0f + cM_rndF(spC4.y); + mThunderPos.z = camera_p->view.lookat.eye.z + (spB8.z * 100000.0f) + (spD0.z * temp_f1_3); if (!strcmp(dComIfGp_getStartStageName(), "R_SP30") && dComIfGp_roomControl_getStayNo() == 4) { mThunderPos.x = cM_rndFX(260.0f) + 19635.0f; diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 92d4b97b8e..447cb916c3 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -117,7 +117,7 @@ static int dKyeff_Create(kankyo_class* i_this) { dKyw_wether_init(); if (strcmp(dComIfGp_getStartStageName(), "Name") == 0) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); OSTime time = OSGetTime(); OSTicksToCalendarTime(time, &calendar); diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index d63a7438ba..e21ef10575 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -213,7 +213,7 @@ void dRes_info_c::setWarpSRT(J3DModelData* i_modelData, const cXyz& i_pos, f32 i texMtxInfo.mSRT.mTranslationY = i_transY; mDoMtx_stack_c::transS(-i_pos.x, -i_pos.y, -i_pos.z); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); mDoMtx_stack_c::YrotM(fopCamM_GetAngleY(camera)); cMtx_concat(l_texMtxInfo.mEffectMtx, mDoMtx_stack_c::get(), texMtxInfo.mEffectMtx); } diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index a4fe5558fb..fd240538d1 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -14,6 +14,7 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" #include "m_Do/m_Do_mtx.h" +#include "m_Do/m_Do_main.h" #include "f_op/f_op_overlap_mng.h" static dSn_HIO_c g_snHIO; @@ -22,33 +23,33 @@ static dSn_HIO_c g_snHIO; static int mBmgStatus; #endif -typedef void (dScnName_c::*mainProcFunc)(void); -static mainProcFunc MainProc[6] = { - &dScnName_c::FileSelectOpen, &dScnName_c::FileSelectMain, &dScnName_c::FileSelectClose, - &dScnName_c::brightCheckOpen, &dScnName_c::brightCheck, &dScnName_c::changeGameScene, -}; - dSn_HIO_c::dSn_HIO_c() { mFileSelWaitTime = 15; } -static s32 phase_1(char* resName) { +#if DEBUG +void dSn_HIO_c::genMessage(JORMContext* mctx) { + mctx->genLabel("\n*****表示調整用*****", 0); + mctx->genSlider("ファイル選択開始WaitTime", &mFileSelWaitTime, 0, 120); +} +#endif + +static s32 phase_1(char* i_resName) { mDoAud_bgmStart(-1); - if (dComIfG_setObjectRes(resName, (u8)0, NULL) == 0) { + if (dComIfG_setObjectRes(i_resName, (u8)0, NULL) == 0) { return cPhs_ERROR_e; } return cPhs_NEXT_e; } -static s32 phase_2(char* resName) { - int syncStatus = dComIfG_syncObjectRes(resName); - - if (syncStatus < 0) { +static s32 phase_2(char* i_resName) { + int rt = dComIfG_syncObjectRes(i_resName); + if (rt < 0) { return cPhs_ERROR_e; } - if (syncStatus > 0) { + if (rt > 0) { return cPhs_INIT_e; } else { return cPhs_COMPLEATE_e; @@ -65,13 +66,19 @@ static s32 resLoad(request_of_phase_process_class* i_phase, char* i_resName) { } s32 dScnName_c::create() { - int phase_state = resLoad(&field_0x1c4, "fileSel"); + int phase_state = resLoad(&phase, "fileSel"); if (phase_state == cPhs_COMPLEATE_e) { - mHeap = JKRExpHeap::create(0x180000, mDoExt_getGameHeap(), false); + mHeap = JKRCreateExpHeap(0x180000, mDoExt_getGameHeap(), false); + JUT_ASSERT(289, mHeap != NULL); + field_0x1d0 = (JKRExpHeap*)mDoExt_setCurrentHeap(mHeap); - dRes_info_c* res = dComIfG_getObjectResInfo("fileSel"); - dFs_c = new dFile_select_c(res->getArchive()); + dRes_info_c* resInfo = dComIfG_getObjectResInfo("fileSel"); + JUT_ASSERT(293, resInfo != NULL); + + dFs_c = new dFile_select_c(resInfo->getArchive()); + JUT_ASSERT(297, dFs_c != NULL); + #if VERSION == VERSION_GCN_PAL for (int i = 0; i < 5; i++); @@ -81,41 +88,46 @@ s32 dScnName_c::create() { if (fpcM_GetName(this) == PROC_NAME_SCENE) { dFs_c->setUseType(0); + + #if !PLATFORM_SHIELD dComIfGs_setNoFile(0); + #endif } - mBrightCheck = new dBrightCheck_c(res->getArchive()); + mBrightCheck = new dBrightCheck_c(resInfo->getArchive()); field_0x420 = 0; - g_snHIO.field_0x4 = -1; - field_0x1d0->becomeCurrentHeap(); + g_snHIO.id = mDoHIO_CREATE_CHILD("名前登録シーン", &g_snHIO); + JKRSetCurrentHeap(field_0x1d0); dComIfGp_setWindowNum(1); dComIfGp_setWindow(0, 0.0f, 0.0f, mDoMch_render_c::getFbWidth(), mDoMch_render_c::getEfbHeight(), 0.0f, 1.0f, 0, 2); - dDlst_window_c* window = dComIfGp_getWindow(0); - dComIfGp_setCamera(0, (camera_class*)&mCamera); + dComIfGp_setCamera(0, &mCamera); - mCamera.near = 1.0f; - mCamera.far = 100000.0f; - mCamera.fovy = 45.0f; - mCamera.aspect = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(); - mCamera.lookat.eye.set(0.0f, 0.0f, -1000.0f); - mCamera.lookat.center.set(0.0f, 0.0f, 0.0f); - mCamera.bank = 0; + dDlst_window_c* window = dComIfGp_getWindow(0); + view_port_class* viewport = window->getViewPort(); + + fopCamM_SetNear(&mCamera, 1.0f); + fopCamM_SetFar(&mCamera, 100000.0f); + fopCamM_SetFovy(&mCamera, 45.0f); + fopCamM_SetAspect(&mCamera, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF()); + fopCamM_SetEye(&mCamera, 0.0f, 0.0f, -1000.0f); + fopCamM_SetCenter(&mCamera, 0.0f, 0.0f, 0.0f); + fopCamM_SetBank(&mCamera, 0); dComIfGp_setPlayer(0, NULL); dComIfGd_setWindow(window); - dComIfGd_setViewport(window->getViewPort()); - dComIfGd_setView(&mCamera); + dComIfGd_setViewport(viewport); + dComIfGd_setView(&mCamera.view); mDoGph_gInf_c::offAutoForcus(); setView(); dKy_setLight_init(); - field_0x41e = g_snHIO.mFileSelWaitTime; - field_0x41c = 0; - field_0x41d = 0; - mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30); + mWaitTimer = g_snHIO.mFileSelWaitTime; + mDrawProc = 0; + mProc = dScnName_PROC_FileSelectOpen; + mDoGph_gInf_c::setTickRate(OS_TIMER_CLOCK / 30); #if VERSION == VERSION_GCN_PAL mBmgStatus = 0; @@ -139,21 +151,48 @@ static const char* dummyString(int i) { #endif void dScnName_c::setView() { - C_MTXPerspective(mCamera.projMtx, mCamera.fovy, mCamera.aspect, mCamera.near, - mCamera.far); - mDoMtx_lookAt(mCamera.viewMtx, &mCamera.lookat.eye, &mCamera.lookat.center, - mCamera.bank); - MTXInverse(mCamera.viewMtx, mCamera.invViewMtx); - MTXCopy(mCamera.viewMtx, mCamera.viewMtxNoTrans); - mCamera.viewMtxNoTrans[0][3] = 0.0f; - mCamera.viewMtxNoTrans[1][3] = 0.0f; - mCamera.viewMtxNoTrans[2][3] = 0.0f; - MTXCopy(mCamera.viewMtx, j3dSys.mViewMtx); - mDoMtx_concatProjView(mCamera.projMtx, mCamera.viewMtx, mCamera.projViewMtx); + dDlst_window_c* window = dComIfGp_getWindow(0); + view_port_class* viewport = window->getViewPort(); + camera_class* camera = &mCamera; + + C_MTXPerspective(camera->view.projMtx, camera->view.fovy, camera->view.aspect, camera->view.near, + camera->view.far); + mDoMtx_lookAt(camera->view.viewMtx, &camera->view.lookat.eye, &camera->view.lookat.center, + camera->view.bank); + cMtx_inverse(camera->view.viewMtx, camera->view.invViewMtx); + MTXCopy(camera->view.viewMtx, camera->view.viewMtxNoTrans); + camera->view.viewMtxNoTrans[0][3] = 0.0f; + camera->view.viewMtxNoTrans[1][3] = 0.0f; + camera->view.viewMtxNoTrans[2][3] = 0.0f; + j3dSys.setViewMtx(camera->view.viewMtx); + cMtx_concatProjView(camera->view.projMtx, camera->view.viewMtx, camera->view.projViewMtx); } +#if PLATFORM_WII || PLATFORM_SHIELD +static void setBaseCsrColor(int i_no) { + static const GXColor l_csrColor[] = { + {255, 0, 0 , 0}, + {255, 0, 255 , 0}, + {0, 182, 255 , 0}, + {0, 255, 0 , 0}, + {255, 255, 0 , 0}, + }; + + JUT_ASSERT(656, 0 <= i_no && i_no < (sizeof(l_csrColor)/sizeof(GXColor))); + + dComIfG_inf_c::baseCsr_c* baseCsr = dComIfG_inf_c::getBaseCsr(); + JUT_ASSERT(658, baseCsr != NULL); + + dDlst_blo_c* baseCsrBlo = baseCsr->getCsr(); + JUT_ASSERT(660, baseCsrBlo != NULL); + + const JUtility::TColor& color = l_csrColor[i_no]; + baseCsrBlo->setBlackColor('cursor00', color); +} +#endif + #if VERSION == VERSION_GCN_PAL -void dScnName_c::bmg_data_set(){ +void dScnName_c::bmg_data_set() { if (fopAcM_GetName(this) == PROC_NAMEEX_SCENE) { mBmgStatus = 10; } @@ -162,8 +201,14 @@ void dScnName_c::bmg_data_set(){ void dScnName_c::tex_data_set() {} #endif +typedef void (dScnName_c::*mainProcFunc)(void); +static mainProcFunc MainProc[6] = { + &dScnName_c::FileSelectOpen, &dScnName_c::FileSelectMain, &dScnName_c::FileSelectClose, + &dScnName_c::brightCheckOpen, &dScnName_c::brightCheck, &dScnName_c::changeGameScene, +}; + s32 dScnName_c::execute() { - if (fopOvlpM_IsPeek() == 0) { + if (!fopOvlpM_IsPeek()) { dComIfG_resetToOpening(this); } @@ -171,31 +216,54 @@ s32 dScnName_c::execute() { return 1; } - (this->*MainProc[field_0x41d])(); + (this->*MainProc[mProc])(); + + #if DEBUG + if (!fopOvlpM_IsPeek() && dComIfG_isSceneResetButton()) { + fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5); + dComIfGs_init(); + dComIfG_playerStatusD(); + } + #endif + return 1; } s32 dScnName_c::draw() { dComIfGp_getVibration().Run(); - switch (field_0x41c) { + switch (mDrawProc) { case 0: - dFs_c->_draw(); + dFs_c->draw(); break; case 1: - mBrightCheck->_draw(); + mBrightCheck->draw(); break; } + #if VERSION == VERSION_SHIELD_DEBUG + dComIfGp_particle_calc3D(); + dComIfGp_particle_calc2D(); + #endif return 1; } dScnName_c::~dScnName_c() { + mDoHIO_DELETE_CHILD(g_snHIO.id); + delete dFs_c; delete mBrightCheck; dComIfG_deleteObjectResMain("fileSel"); mHeap->destroy(); + #if PLATFORM_WII || PLATFORM_SHIELD + dComIfG_inf_c::baseCsr_c* baseCsr = dComIfG_inf_c::getBaseCsr(); + JUT_ASSERT(870, baseCsr != NULL); + baseCsr->onNavi(); + setBaseCsrColor(2); + #endif + + // Reset Hotspring Water bottles to normal water for (int i = 0; i < 4; i++) { dMeter2Info_changeWater(i + SLOT_11); } @@ -205,12 +273,12 @@ dScnName_c::~dScnName_c() { } void dScnName_c::FileSelectOpen() { - if (field_0x41e != 0) { - field_0x41e--; + if (mWaitTimer != 0) { + mWaitTimer--; } else { mDoAud_bgmStreamPrepare(0x2000000); mDoAud_bgmStreamPlay(); - field_0x41d = 1; + mProc = dScnName_PROC_FileSelectMain; } } @@ -225,22 +293,22 @@ void dScnName_c::FileSelectMain() { void dScnName_c::FileSelectMainNormal() { switch(dFs_c->isSelectEnd()) { case 1: - field_0x41e = 15; + mWaitTimer = 15; mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); mDoGph_gInf_c::startFadeOut(15); - field_0x41d = 2; + mProc = dScnName_PROC_FileSelectClose; field_0x420 = 1; break; } } void dScnName_c::FileSelectClose() { - field_0x41e--; + mWaitTimer--; - if (field_0x41e == 0) { - field_0x41d = 3; - field_0x41e = 15; - field_0x41c = 1; + if (mWaitTimer == 0) { + mProc = dScnName_PROC_BrightCheckOpen; + mWaitTimer = 15; + mDrawProc = 1; mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); mDoGph_gInf_c::startFadeIn(15); field_0x420 = 0; @@ -249,9 +317,9 @@ void dScnName_c::FileSelectClose() { void dScnName_c::brightCheckOpen() { if (!mDoRst::isReset()) { - field_0x41e--; - if (field_0x41e == 0) { - field_0x41d = 4; + mWaitTimer--; + if (mWaitTimer == 0) { + mProc = dScnName_PROC_BrightCheck; } } } @@ -262,11 +330,12 @@ void dScnName_c::brightCheck() { if (mBrightCheck->isEnd()) { dComIfGs_setSaveTotalTime(dComIfGs_getTotalTime()); dComIfGs_setSaveStartTime(OSGetTime()); - mDoAud_bgmStop(0x2D); + mDoAud_bgmStop(45); field_0x41f = 0; - field_0x41d = 5; + mProc = dScnName_PROC_ChangeGameScene; + // Reset rupee "first-time collection" flags so the collection cutscene will play again dComIfGs_offItemFirstBit(fpcNm_ITEM_GREEN_RUPEE); dComIfGs_offItemFirstBit(fpcNm_ITEM_BLUE_RUPEE); dComIfGs_offItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE); @@ -280,7 +349,22 @@ void dScnName_c::brightCheck() { void dScnName_c::changeGameScene() { if (!mDoRst::isReset() && !fopOvlpM_IsPeek()) { dComIfGs_gameStart(); + + #if DEBUG + // Goto Map Select debug menu if opening File 1 with development mode on + if (dFs_c->getSelectNum() == 0 && mDoMain::developmentMode) { + fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5); + dComIfGs_init(); + dComIfG_playerStatusD(); + return; + } + #endif + + #if VERSION == VERSION_SHIELD_DEBUG + fopScnM_ChangeReq(this, PROC_PLAY_SCENE, 0, 5); + #else fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : PROC_PLAY_SCENE, 0, 5); + #endif dComIfGp_offEnableNextStage(); if (dFs_c->isDataNew(dFs_c->getSelectNum())) { @@ -314,6 +398,11 @@ static int dScnName_Delete(dScnName_c* i_this) { #endif i_this->~dScnName_c(); + + #if VERSION == VERSION_SHIELD_DEBUG + dComIfGp_particle_removeScene(true); + #endif + return 1; } diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 18dd48bede..3b171087ae 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -11,147 +11,177 @@ #include "d/d_s_room.h" #include "d/d_bg_parts.h" #include "m_Do/m_Do_Reset.h" +#include "f_ap/f_ap_game.h" + #include #include static int dScnRoom_Draw(room_of_scene_class* i_this) { + fpc_ProcID id = fpcM_GetID(i_this); return 1; } -static int getResetArchiveBank(int param_1, u8 const** param_2) { - dStage_roomControl_c::nameData* arcBankName = dStage_roomControl_c::getArcBankName(); - int local_30 = 0; +static int getResetArchiveBank(int i_roomNo, const u8** o_bankIDList) { + dStage_roomControl_c::dStage_bankName* arcBankName = dStage_roomControl_c::getArcBankName(); + int bankNum = 0; + + *o_bankIDList = NULL; - *param_2 = NULL; if (arcBankName != NULL) { - dStage_roomControl_c::bankData* arcBankData = dStage_roomControl_c::getArcBankData(); - dStage_roomControl_c::bankDataEntry* entries = arcBankData->m_entries; + dStage_roomControl_c::dStage_bankData* arcBankData = dStage_roomControl_c::getArcBankData(); + dStage_roomControl_c::dStage_bankDataEntry* entries = arcBankData->m_entries; for (int i = 0; i < arcBankData->m_num; entries++, i++) { - if (entries->field_0x0 == param_1) { - if (entries->mLayerNo == dComIfG_play_c::getLayerNo(0)) { - local_30 = 0x20; - *param_2 = entries->field_0x2; + if (entries->roomNo == i_roomNo) { + if (entries->layerNo == dComIfG_play_c::getLayerNo(0)) { + bankNum = 32; + *o_bankIDList = entries->nameIDs; break; } } } } - u8 const* pbVar1 = *param_2; - for (int i = 0; i < local_30; pbVar1++, i++) { + const u8* pbank = *o_bankIDList; + for (int i = 0; i < bankNum; pbank++, i++) { char* arcBank = dStage_roomControl_c::getArcBank(i); char* name = ""; - int id = *pbVar1; - if (id != 0xff) { + int id = *pbank; + if (id != 0xFF) { JUT_ASSERT(160, 0 <= id && id < arcBankName->m_num); name = arcBankName->m_names[id]; } if (strcmp(arcBank, name) != 0) { + #if DEBUG + if (strcmp(arcBank, "") != 0) { + // "archive has been deleted from bank! <%d:%s!=%s>" + OSReport_Warning("バンクから削除するアーカイブが発生しました！ <%d:%s!=%s>\n", i, arcBank, name); + } + #endif + return i; } } - - return local_30; + + return bankNum; } -static bool resetArchiveBank(int param_0) { - const u8* tmp; - return dStage_roomControl_c::resetArchiveBank(getResetArchiveBank(param_0, &tmp)); +static bool resetArchiveBank(int i_roomNo) { + const u8* bankIDList; + return dStage_roomControl_c::resetArchiveBank(getResetArchiveBank(i_roomNo, &bankIDList)); } -static bool setArchiveBank(int param_0) { - u8* arr[4]; - int bank_no = getResetArchiveBank(param_0, (u8 const**)&arr); - if (arr[0] == NULL) { +static bool setArchiveBank(int i_roomNo) { + u8* bankIDList; + int bankNo = getResetArchiveBank(i_roomNo, (const u8**)&bankIDList); + if (bankIDList == NULL) { return true; } - dStage_roomControl_c::nameData* arcBankName = dStage_roomControl_c::getArcBankName(); - for (; (int)bank_no < 0x20; bank_no++) { + dStage_roomControl_c::dStage_bankName* arcBankName = dStage_roomControl_c::getArcBankName(); + for (; bankNo < 32; bankNo++) { const char* name = ""; - int id = arr[0][bank_no]; - if (id != 0xff) { + int id = bankIDList[bankNo]; + if (id != 0xFF) { JUT_ASSERT(216, 0 <= id && id < arcBankName->m_num); name = arcBankName->m_names[id]; } if (strcmp(name, "") != 0) { if (strnicmp(name, "pack", 4) == 0) { - int syncres = dComIfG_syncObjectRes(name); - if (syncres < 0) { - if (!dComIfG_setObjectRes(name, 0, mDoExt_getArchiveHeap())) { - OSReport_Error("Bank[%d] : %s.arc Read Error !!\n", bank_no, name); - } else { + #if DEBUG + if (fapGm_HIO_c::mPackArchiveMode) + #endif + { + int rt = dComIfG_syncObjectRes(name); + if (rt < 0) { + if (!dComIfG_setObjectRes(name, 0, mDoExt_getArchiveHeap())) { + OSReport_Error("Bank[%d] : %s.arc Read Error !!\n", bankNo, name); + } else { + return false; + } + } else if (rt != 0) { return false; } - } else if (syncres != 0) { - return false; } } else { if (!dComIfG_setObjectRes(name, 0, mDoExt_getArchiveHeap())) { - OSReport_Error("Bank[%d] : %s.arc Read Error !!\n", bank_no, name); + OSReport_Error("Bank[%d] : %s.arc Read Error !!\n", bankNo, name); } } } - dStage_roomControl_c::setArcBank(bank_no, name); + OS_REPORT(">>>>>>>>>>> create Bank[%d] : %s\n", bankNo, name); + dStage_roomControl_c::setArcBank(bankNo, name); } return true; } -static int objectDeleteJugge(void* i_obj, void*) { - if (fpcM_GetProfName(i_obj) != PROC_BG) { - if (fopAcM_IsActor(i_obj) && !fopAcM_CheckCondition((fopAc_ac_c*)i_obj, 4)) { - return 0; +static int objectDeleteJugge(void* i_process, void* i_data) { + if (fpcM_GetProfName(i_process) != PROC_BG) { + if (fopAcM_IsActor(i_process)) { + #if DEBUG + char namebuf[16]; + fopAcM_getNameString((fopAc_ac_c*)i_process, namebuf); + #endif + + if (!fopAcM_CheckCondition((fopAc_ac_c*)i_process, fopAcCnd_NODRAW_e)) { + return 0; + } + + OS_REPORT("削除！<%s>\n", namebuf); } - fpcM_Delete(i_obj); + + fpcM_Delete(i_process); } return 0; } -static int deleteJugge(void* i_obj, void*) { - fpcM_Delete(i_obj); +static int deleteJugge(void* i_process, void* i_data) { + fpcM_Delete(i_process); return 0; } -static void* isCreatingCallback(create_tag* param_1, fpc_ProcID* param_2) { - create_request* create_req = (create_request*)param_1->base.mpTagData; - if (create_req->layer->layer_id == *param_2) { +static void* isCreatingCallback(create_tag* i_createTag, fpc_ProcID* i_procId) { + create_request* create_req = (create_request*)i_createTag->base.mpTagData; + if (create_req->layer->layer_id == *i_procId) { return create_req; } return NULL; } -static bool isCreating(fpc_ProcID param_0) { - return fpcCtIt_Judge((fpcCtIt_JudgeFunc)isCreatingCallback, ¶m_0); +static u8 isCreating(fpc_ProcID i_id) { + if (fpcCtIt_Judge((fpcCtIt_JudgeFunc)isCreatingCallback, &i_id)) { + return TRUE; + } + + return FALSE; } -static int loadDemoArchive(int room_no) { +static int loadDemoArchive(int i_roomNo) { if (*dStage_roomControl_c::getDemoArcName() == 0) { - dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLbnk(); + dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(i_roomNo)->getLbnk(); if (lbnk != NULL) { dStage_Lbnk_dt_c* entries = lbnk->entries; - if (entries != NULL) { - int bank = entries[dComIfG_play_c::getLayerNo(room_no)].bank; - - if (bank != 0xff) { + int bank = entries[dComIfG_play_c::getLayerNo(i_roomNo)].bank; + if (bank != 0xFF) { JUT_ASSERT(350, 0 <= bank && bank < 100); - u8 bank2 = entries[dComIfG_play_c::getLayerNo(room_no)].bank2; + int bank2 = entries[dComIfG_play_c::getLayerNo(i_roomNo)].bank2; JUT_ASSERT(353, 0 <= bank2 && bank2 < 100); sprintf(dStage_roomControl_c::getDemoArcName(), "Demo%02d_%02d", bank, bank2); - if (!dComIfG_setObjectRes(dStage_roomControl_c::getDemoArcName(), 0, - (JKRHeap*)NULL)) - { + if (!dComIfG_setObjectRes(dStage_roomControl_c::getDemoArcName(), 0, (JKRHeap*)NULL)) { + const char* name = dStage_roomControl_c::getDemoArcName(); *dStage_roomControl_c::getDemoArcName() = 0; } else { + // "Loading demo archive <%s>" + OS_REPORT("デモアーカイブ読み込み<%s>\n", dStage_roomControl_c::getDemoArcName()); return 1; } } @@ -180,30 +210,33 @@ static bool objectSetCheck(room_of_scene_class* i_this) { return 0; } - if (i_this->mpDzrRes != NULL) { + if (i_this->roomInfo != NULL) { loadDemoArchive(roomNo); } + break; default: - if (*dStage_roomControl_c::getDemoArcName() != '\0') { - int phase = dComIfG_syncObjectRes(dStage_roomControl_c::getDemoArcName()); - - if (phase < 0) { - #if VERSION == VERSION_WII_USA_R0 - dStage_escapeRestart(); - #endif - } else if (phase > 0) { - return 0; - } - } - - fopAcM_create(PROC_BG, roomNo, NULL, -1, NULL, NULL, -1); - dComIfGp_getPEvtManager()->demoInit(); - dComIfGp_getPEvtManager()->roomInit(roomNo); - dStage_dt_c_roomReLoader(i_this->mpDzrRes, i_this->mpRoomDt, roomNo); - dComIfGp_ret_wp_set(roomNo); - i_this->field_0x1d4 = -1; - i_this->field_0x1d5 = 1; + JUT_ASSERT(417, 0); } + + if (*dStage_roomControl_c::getDemoArcName() != '\0') { + int phase = dComIfG_syncObjectRes(dStage_roomControl_c::getDemoArcName()); + + if (phase < 0) { + #if VERSION == VERSION_WII_USA_R0 + dStage_escapeRestart(); + #endif + } else if (phase > 0) { + return 0; + } + } + + fopAcM_create(PROC_BG, roomNo, NULL, -1, NULL, NULL, -1); + dComIfGp_getPEvtManager()->demoInit(); + dComIfGp_getPEvtManager()->roomInit(roomNo); + dStage_dt_c_roomReLoader(i_this->roomInfo, i_this->roomDt, roomNo); + dComIfGp_ret_wp_set(roomNo); + i_this->field_0x1d4 = -1; + i_this->field_0x1d5 = 1; } } else if (status_flag_8) { if (isCreating(fpcM_LayerID(i_this))) { @@ -212,6 +245,10 @@ static bool objectSetCheck(room_of_scene_class* i_this) { fpcM_LyJudge(&i_this->base, (fpcLyIt_JudgeFunc)deleteJugge, NULL); g_dComIfG_gameInfo.play.getParticle()->levelAllForceOnEventMove(); + + // "Object deleted! <%d>" + OS_REPORT("\x1b[32mオブジェクト削除！<%d>\n\x1b[m", roomNo); + dComIfGs_clearRoomSwitch(dComIfGp_roomControl_getZoneNo(roomNo)); dComIfGs_clearRoomItem(dComIfGp_roomControl_getZoneNo(roomNo)); dComIfGp_roomControl_offStatusFlag(roomNo, 0x20); @@ -233,14 +270,14 @@ static int dScnRoom_Execute(room_of_scene_class* i_this) { } else if (objectSetCheck(i_this)) { if (dComIfGp_roomControl_checkStatusFlag(roomNo, 4)) { fopScnM_DeleteReq(i_this); - } else if (i_this->field_0x1d4 < 0 && i_this->field_0x1d5 != 0 && - !dComIfGp_event_runCheck() && - (int)fopScnM_GetParam(i_this) == dComIfGp_roomControl_getStayNo()) - { - if (isCreating(fpcM_LayerID(i_this))) { - dScnPly_c::nextPauseTimer = 2; - } else { - i_this->field_0x1d5 = 0; + } else if (i_this->field_0x1d4 < 0 && i_this->field_0x1d5 != 0 && !dComIfGp_event_runCheck()) { + int param = fopScnM_GetParam(i_this); + if (param == dComIfGp_roomControl_getStayNo()) { + if (isCreating(fpcM_LayerID(i_this))) { + dScnPly_c::setPauseTimer(2); + } else { + i_this->field_0x1d5 = 0; + } } } } @@ -252,27 +289,27 @@ static int dScnRoom_IsDelete(room_of_scene_class*) { return 1; } -static bool isReadRoom(int param_0) { +static bool isReadRoom(int i_roomNo) { roomRead_class* room = dComIfGp_getStageRoom(); - if (room == NULL) { return false; } - - if (room->num <= param_0) { + if (room->num <= i_roomNo) { return false; } + JUT_ASSERT(589, 0 <= dComIfGp_getNextStageRoomNo() && dComIfGp_getNextStageRoomNo() < 64); + roomRead_data_class* roomData = room->m_entries[dComIfGp_getNextStageRoomNo()]; - u8* tmp = roomData->m_rooms; + u8* room_data = roomData->m_rooms; for (int i = 0; i < roomData->num; i++) { - if (dStage_roomRead_dt_c_ChkBg(*tmp) && - param_0 == dStage_roomRead_dt_c_GetLoadRoomIndex(*tmp)) + if (dStage_roomRead_dt_c_ChkBg(*room_data) && + i_roomNo == dStage_roomRead_dt_c_GetLoadRoomIndex(*room_data)) { return true; } - tmp++; + room_data++; } return false; @@ -283,7 +320,22 @@ inline const char* setArcName(room_of_scene_class* i_room) { } static int dScnRoom_Delete(room_of_scene_class* i_this) { + OS_REPORT("dScnRoom_Delete():room%d\n", fopScnM_GetParam(i_this)); + int roomNo = fopScnM_GetParam(i_this); + + #if DEBUG + dBgp_c* bgp = dStage_roomControl_c::getBgp(roomNo); + if (bgp != NULL) { + if (!bgp->remove()) { + return 0; + } + + delete bgp; + dStage_roomControl_c::setBgp(roomNo, NULL); + } + #endif + dComIfGp_roomControl_setStatusFlag(roomNo, 0); dComIfGp_roomControl_getStatusRoomDt(roomNo)->init(); @@ -297,6 +349,9 @@ static int dScnRoom_Delete(room_of_scene_class* i_this) { if (heap != NULL) { heap->freeAll(); } + } else { + // "Room(%d) data saved!" + OS_REPORT(">>> 部屋(%d)データ保持！\n", roomNo); } dComIfGp_roomControl_getStatusRoomDt(roomNo)->init(); @@ -305,6 +360,7 @@ static int dScnRoom_Delete(room_of_scene_class* i_this) { } static int phase_0(room_of_scene_class* i_this) { + int param = fopScnM_GetParam(i_this); int roomNo = fopScnM_GetParam(i_this); dStage_roomControl_c::setStatusProcID(roomNo, fopScnM_GetID(i_this)); return cPhs_NEXT_e; @@ -320,18 +376,21 @@ static int phase_1(room_of_scene_class* i_this) { JKRExpHeap* heap = dStage_roomControl_c::getMemoryBlock(roomNo); if (heap != NULL) { + OS_REPORT("#######<%d>\n", heap->getTotalUsedSize()); + if (heap->getTotalUsedSize() != 0) { return cPhs_INIT_e; } } else { - stage_stag_info_class* stagInfo = dComIfGp_getStage()->getStagInfo(); - - if (dStage_staginfo_GetArchiveHeap(stagInfo) != FALSE) { + if (dStage_staginfo_GetArchiveHeap(dComIfGp_getStage()->getStagInfo()) != FALSE) { heap = mDoExt_getArchiveHeap(); } } - if (!dComIfG_setStageRes(arcName, heap)) { + int rt = dComIfG_setStageRes(arcName, heap); + if (!rt) { + //! In Wii USA Revision 0, if a stage's resources fail to load, the stage will restart as a failsafe. + //! In later versions this failsafe was removed, and the room will simply not load. #if VERSION == VERSION_WII_USA_R0 dStage_escapeRestart(); #endif @@ -344,9 +403,11 @@ static int phase_1(room_of_scene_class* i_this) { static int phase_2(room_of_scene_class* i_this) { const char* arcName = setArcName(i_this); - int rt = dComIfG_syncStageRes(arcName); + int rt = dComIfG_syncStageRes(arcName); if (rt < 0) { + //! In Wii USA Revision 0, if a stage's resources fail to load, the stage will restart as a failsafe. + //! In later versions this failsafe was removed, and the room will simply not load. #if VERSION == VERSION_WII_USA_R0 dStage_escapeRestart(); #endif @@ -374,12 +435,12 @@ static int phase_2(room_of_scene_class* i_this) { dComIfGp_roomControl_setZoneNo(roomNo, dComIfGs_createZone(roomNo)); } - i_this->mpRoomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo); - i_this->mpRoomDt->setRoomNo(roomNo); - i_this->mpDzrRes = dComIfG_getStageRes(arcName, "room.dzr"); + i_this->roomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo); + i_this->roomDt->setRoomNo(roomNo); + i_this->roomInfo = dComIfG_getStageRes(arcName, "room.dzr"); - if (i_this->mpDzrRes != NULL) { - dStage_dt_c_roomLoader(i_this->mpDzrRes, i_this->mpRoomDt, roomNo); + if (i_this->roomInfo != NULL) { + dStage_dt_c_roomLoader(i_this->roomInfo, i_this->roomDt, roomNo); } JKRHeap* old_heap = NULL; @@ -390,12 +451,12 @@ static int phase_2(room_of_scene_class* i_this) { } #if DEBUG - void* mpat = dComIfGp_roomControl_getStatusRoomDt(roomNo)->getMapPath(); - if (mpat != NULL) { + void* unit = dComIfGp_roomControl_getStatusRoomDt(roomNo)->getUnit(); + if (unit != NULL) { dBgp_c* bgp = new dBgp_c(); JUT_ASSERT(786, bgp != NULL); - bgp->create(roomNo, mpat); + bgp->create(roomNo, unit); dStage_roomControl_c::setBgp(roomNo, bgp); } #endif @@ -408,10 +469,10 @@ static int phase_2(room_of_scene_class* i_this) { } static int phase_3(room_of_scene_class* i_this) { - if (objectSetCheck(i_this)) { - return cPhs_NEXT_e; - } else { + if (!objectSetCheck(i_this)) { return cPhs_INIT_e; + } else { + return cPhs_NEXT_e; } } @@ -420,21 +481,25 @@ static int phase_4(room_of_scene_class* i_this) { return cPhs_INIT_e; } - if (objectSetCheck(i_this)) { - return cPhs_COMPLEATE_e; - } else { + if (!objectSetCheck(i_this)) { return cPhs_INIT_e; } + + OS_REPORT("dScnRoom_Create(): End !! room%d\n", fopScnM_GetParam(i_this)); + return cPhs_COMPLEATE_e; } static int dScnRoom_Create(scene_class* i_this) { - static int (*l_method[5])(void*) = { - (int (*)(void*))phase_0, (int (*)(void*))phase_1, (int (*)(void*))phase_2, - (int (*)(void*))phase_3, (int (*)(void*))phase_4, + static request_of_phase_process_fn l_method[5] = { + (request_of_phase_process_fn)phase_0, + (request_of_phase_process_fn)phase_1, + (request_of_phase_process_fn)phase_2, + (request_of_phase_process_fn)phase_3, + (request_of_phase_process_fn)phase_4, }; room_of_scene_class* room = static_cast(i_this); - return dComLbG_PhaseHandler(&room->field_0x1c4, l_method, i_this); + return dComLbG_PhaseHandler(&room->phase, l_method, i_this); } static scene_method_class l_dScnRoom_Method = { diff --git a/src/d/d_shop_camera.cpp b/src/d/d_shop_camera.cpp index c2a8f8a711..18df2331be 100644 --- a/src/d/d_shop_camera.cpp +++ b/src/d/d_shop_camera.cpp @@ -67,7 +67,7 @@ int ShopCam_action_c::shop_cam_action_init() { } 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); @@ -131,7 +131,7 @@ int ShopCam_action_c::shop_cam_action() { } void ShopCam_action_c::Save() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { field_0x98 = *fopCamM_GetCenter_p(camera); field_0xa4 = *fopCamM_GetEye_p(camera); @@ -150,7 +150,7 @@ void ShopCam_action_c::Reset() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); player->offPlayerNoDraw(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(field_0x98, field_0xa4, field_0xbc, 0); camera->mCamera.Stay(); camera->mCamera.Reset(field_0x98, field_0xa4, field_0xbc, 0); diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index e1bd46d431..ff254b40d0 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -191,8 +191,8 @@ void dStage_roomControl_c::init() { status++; } - mArcBankName = (dStage_roomControl_c::nameData*)dComIfG_getStageRes("name.bin"); - mArcBankData = (dStage_roomControl_c::bankData*)dComIfG_getStageRes("bank.bin"); + mArcBankName = (dStage_roomControl_c::dStage_bankName*)dComIfG_getStageRes("name.bin"); + mArcBankData = (dStage_roomControl_c::dStage_bankData*)dComIfG_getStageRes("bank.bin"); if (mArcBankName == NULL) { JUT_ASSERT(449, mArcBankData == NULL); @@ -1564,9 +1564,9 @@ u8 dStage_roomControl_c::m_time_pass; u8 dStage_roomControl_c::mNoChangeRoom; -dStage_roomControl_c::nameData* dStage_roomControl_c::mArcBankName; +dStage_roomControl_c::dStage_bankName* dStage_roomControl_c::mArcBankName; -dStage_roomControl_c::bankData* dStage_roomControl_c::mArcBankData; +dStage_roomControl_c::dStage_bankData* dStage_roomControl_c::mArcBankData; dStage_roomControl_c::roomDzs_c dStage_roomControl_c::m_roomDzs; #if DEBUG diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 1d4ad44326..db39a252ed 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -493,7 +493,7 @@ static int fopAc_Create(void* i_this) { dKy_tevstr_init(&actor->tevStr, actor->home.roomNo, -1); dStage_FileList_dt_c* sp14 = NULL; - camera_class* sp10 = dComIfGp_getCamera(0); + camera_process_class* sp10 = dComIfGp_getCamera(0); if (dComIfGp_roomControl_getStayNo() >= 0) { sp14 = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo(); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 8c0bb21f31..000d790c3e 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -2162,7 +2162,7 @@ static void get_vectle_calc(const cXyz* pXyzA, const cXyz* pXyzB, cXyz* pOut) { void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelData) { const cXyz* pEyePos = &i_actor->eyePos; camera_class* camera = dCam_getCamera(); - cXyz v1 = *pEyePos - camera->lookat.eye; + cXyz v1 = *pEyePos - camera->view.lookat.eye; cXyz v2; get_vectle_calc(&i_actor->tevStr.field_0x32c, pEyePos, &v2); cXyz half; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 1d0537599b..99c6fbeb7b 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -814,7 +814,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ if (dCam_getBody()->Mode() != 4 && dCam_getBody()->Mode() != 7) { int cam_id = dComIfGp_getPlayerCameraID(0); - camera_class* temp_r4 = dComIfGp_getCamera(cam_id); + camera_process_class* temp_r4 = dComIfGp_getCamera(cam_id); dAttention_c* attention = dComIfGp_getAttention(); f32 var_f30; @@ -832,11 +832,11 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ if (atn_actor != NULL) { cXyz sp28; sp28 = atn_actor->eyePos; - if (std::fabs(sp28.y - camera_p->lookat.eye.y) < 400.0f) { - sp28.y = camera_p->lookat.eye.y; + if (std::fabs(sp28.y - camera_p->view.lookat.eye.y) < 400.0f) { + sp28.y = camera_p->view.lookat.eye.y; } - var_f29 = atn_actor->current.pos.abs(camera_p->lookat.eye); + var_f29 = atn_actor->current.pos.abs(camera_p->view.lookat.eye); var_f31 = var_f29 / ((SREG_F(2) + 280.0f) * var_f30); var_f31 -= 0.8f; if (var_f31 < 0.0f) { @@ -1564,14 +1564,14 @@ int mDoGph_Painter() { if (dComIfGp_getWindowNum() != 0) { dDlst_window_c* window_p = dComIfGp_getWindow(0); int camera_id = window_p->getCameraID(); - camera_class* camera_p = dComIfGp_getCamera(camera_id); + camera_process_class* camera_p = dComIfGp_getCamera(camera_id); if (camera_p != NULL) { #if DEBUG fapGm_HIO_c::startCpuTimer(); #endif - dComIfGd_imageDrawShadow(camera_p->viewMtx); + dComIfGd_imageDrawShadow(camera_p->view.viewMtx); #if DEBUG // "drawing Shadow Texture (Rendering)" @@ -1604,7 +1604,7 @@ int mDoGph_Painter() { GXSetScissor(view_port->x_orig, view_port->y_orig, view_port->width, view_port->height); - JPADrawInfo draw_info(camera_p->viewMtx, camera_p->fovy, camera_p->aspect); + JPADrawInfo draw_info(camera_p->view.viewMtx, camera_p->view.fovy, camera_p->view.aspect); #if WIDESCREEN_SUPPORT if (mDoGph_gInf_c::isWideZoom()) { @@ -1632,17 +1632,17 @@ int mDoGph_Painter() { #endif dComIfGp_setCurrentWindow(window_p); - dComIfGp_setCurrentView(camera_p); + dComIfGp_setCurrentView(&camera_p->view); dComIfGp_setCurrentViewport(view_port); - GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); + GXSetProjection(camera_p->view.projMtx, GX_PERSPECTIVE); #if DEBUG - captureScreenSetProjection(camera_p->projMtx); + captureScreenSetProjection(camera_p->view.projMtx); #endif PPCSync(); - j3dSys.setViewMtx(camera_p->viewMtx); + j3dSys.setViewMtx(camera_p->view.viewMtx); dKy_setLight(); dComIfGd_drawOpaListSky(); dComIfGd_drawXluListSky(); @@ -1675,7 +1675,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - dComIfGd_drawShadow(camera_p->viewMtx); + dComIfGd_drawShadow(camera_p->view.viewMtx); #if DEBUG // "shadow drawing (Rendering)" @@ -1738,10 +1738,10 @@ int mDoGph_Painter() { #if DEBUG if (dJcame_c::get()) { - dJcame_c::get()->show3D(camera_p->viewMtx); + dJcame_c::get()->show3D(camera_p->view.viewMtx); } if (dJprev_c::get()) { - dJprev_c::get()->show3D(camera_p->viewMtx); + dJprev_c::get()->show3D(camera_p->view.viewMtx); } #endif @@ -1750,7 +1750,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - motionBlure(camera_p); + motionBlure(&camera_p->view); #if DEBUG // "blur filter (Rendering)" @@ -1759,7 +1759,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - drawDepth2(camera_p, view_port, dComIfGp_getCameraZoomForcus(camera_id)); + drawDepth2(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); GXInvalidateTexAll(); GXSetClipMode(GX_CLIP_ENABLE); @@ -1843,7 +1843,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - retry_captue_frame(camera_p, view_port, dComIfGp_getCameraZoomForcus(camera_id)); + retry_captue_frame(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); #if DEBUG // "Frame Buffer capture 2nd time (Rendering)" @@ -1878,7 +1878,7 @@ int mDoGph_Painter() { dComIfGd_drawIndScreen(); if (strcmp(dComIfGp_getStartStageName(), "F_SP124") == 0) { - retry_captue_frame(camera_p, view_port, + retry_captue_frame(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); } @@ -1895,8 +1895,8 @@ int mDoGph_Painter() { j3dSys.setViewMtx(m2); dComIfGd_drawXluList2DScreen(); - j3dSys.setViewMtx(camera_p->viewMtx); - GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); + j3dSys.setViewMtx(camera_p->view.viewMtx); + GXSetProjection(camera_p->view.projMtx, GX_PERSPECTIVE); #if DEBUG // "drawing up to full projection screen (Rendering)" @@ -1912,7 +1912,7 @@ int mDoGph_Painter() { u8 enable = mDoGph_gInf_c::getBloom()->getEnable(); GXColor color = *mDoGph_gInf_c::getBloom()->getMonoColor(); if (color.a != 0 || enable) { - retry_captue_frame(camera_p, view_port, + retry_captue_frame(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); } } @@ -1925,14 +1925,14 @@ int mDoGph_Painter() { #endif mDoGph_gInf_c::getBloom()->draw(); - j3dSys.setViewMtx(camera_p->viewMtx); - GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); + j3dSys.setViewMtx(camera_p->view.viewMtx); + GXSetProjection(camera_p->view.projMtx, GX_PERSPECTIVE); #if DEBUG if (g_kankyoHIO.navy.field_0x30d != 0 && dKy_darkworld_check() == TRUE) { dComIfGd_drawOpaListDark(); dComIfGd_drawXluListDark(); - retry_captue_frame(camera_p, view_port, + retry_captue_frame(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); dComIfGd_drawOpaListInvisible(); dComIfGd_drawXluListInvisible(); @@ -1968,7 +1968,7 @@ int mDoGph_Painter() { dComIfGp_particle_draw2Dgame(&draw_info2); } - trimming(camera_p, view_port); + trimming(&camera_p->view, view_port); if (strcmp(dComIfGp_getStartStageName(), "F_SP127") != 0 && (mDoGph_gInf_c::isFade() & 0x80) == 0)