mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-23 14:41:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_s_room / d_s_name / d_a_title debug work (#3123)

Browse Source 
* d_s_room / d_s_name debug work

* camera_class rtti fix

* d_a_title debug / handle shield rel changes

* fix shield build

* fix regressions
This commit is contained in:
TakaRikka
2026-03-06 22:30:25 -08:00
committed by GitHub
parent a2b179f952
commit 8e2545f2ec
140 changed files with 1293 additions and 1042 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+33 -20
View File
@@ -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"),
]
include/d/actor/d_a_title.h
+6 -3
View File
@@ -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
include/d/d_bg_parts.h
+1 -1
View File
@@ -189,7 +189,7 @@ public:
};
dBgp_c();
~dBgp_c();
~dBgp_c() {}
void create(s8, void*);
int remove();
include/d/d_bright_check.h
+6
View File
@@ -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;
include/d/d_com_inf_game.h
+20 -9
View File
@@ -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) {
include/d/d_drawlist.h
+3 -1
View File
@@ -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);
include/d/d_file_select.h
+7 -3
View File
@@ -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
include/d/d_menu_collect.h
+4
View File
@@ -209,6 +209,10 @@ public:
virtual ~dMenu_Collect3D_c();
static void setViewPortOffsetY(f32 i_offset) {
mViewOffsetY = i_offset;
}
static f32 mViewOffsetY;
private:
include/d/d_s_name.h
+21 -50
View File
@@ -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;
};
include/d/d_s_room.h
+4 -4
View File
@@ -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;
};
include/d/d_stage.h
+28 -14
View File
@@ -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;
include/d/dolzel_rel.h
+13 -3
View File
@@ -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
include/f_op/f_op_camera_mng.h
+16 -15
View File
@@ -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);
src/c/c_dylink.cpp
+10 -10
View File
@@ -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},
src/d/actor/d_a_L7demo_dr.cpp
+9 -9
View File
@@ -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();
src/d/actor/d_a_L7op_demo_dr.cpp
+8 -8
View File
@@ -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);
src/d/actor/d_a_alink.cpp
+1 -1
View File
@@ -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);
src/d/actor/d_a_alink_kandelaar.inc
+1 -1
View File
@@ -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();
src/d/actor/d_a_b_bq.cpp
+4 -4
View File
@@ -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
src/d/actor/d_a_b_dr.cpp
+11 -11
View File
@@ -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;
src/d/actor/d_a_b_dre.cpp
+7 -7
View File
@@ -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, &param_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();
src/d/actor/d_a_b_ds.cpp
+10 -10
View File
@@ -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);
src/d/actor/d_a_b_gg.cpp
+7 -7
View File
@@ -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:
src/d/actor/d_a_b_gm.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_b_gnd.cpp
+2 -2
View File
@@ -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();
src/d/actor/d_a_b_mgn.cpp
+3 -3
View File
@@ -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;
src/d/actor/d_a_b_ob.cpp
+6 -6
View File
@@ -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);
src/d/actor/d_a_b_tn.cpp
+5 -5
View File
@@ -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) {
src/d/actor/d_a_b_yo.cpp
+4 -4
View File
@@ -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;
src/d/actor/d_a_b_zant.cpp
+1 -1
View File
@@ -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);
src/d/actor/d_a_bd.cpp
+6 -6
View File
@@ -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)) {
src/d/actor/d_a_bg.cpp
+1 -1
View File
@@ -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);
src/d/actor/d_a_boomerang.cpp
+2 -2
View File
@@ -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);
src/d/actor/d_a_cstatue.cpp
+1 -1
View File
@@ -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();
src/d/actor/d_a_e_bee.cpp
+2 -2
View File
@@ -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;
}
src/d/actor/d_a_e_bg.cpp
+2 -2
View File
@@ -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 {
src/d/actor/d_a_e_df.cpp
+3 -3
View File
@@ -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);
src/d/actor/d_a_e_dt.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_fm.cpp
+4 -4
View File
@@ -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);
src/d/actor/d_a_e_gb.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_ge.cpp
+1 -1
View File
@@ -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));
src/d/actor/d_a_e_gi.cpp
+1 -1
View File
@@ -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;
}
src/d/actor/d_a_e_gob.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_hp.cpp
+1 -1
View File
@@ -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);
src/d/actor/d_a_e_hzelda.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_mk.cpp
+7 -7
View File
@@ -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) {
src/d/actor/d_a_e_nest.cpp
+1 -1
View File
@@ -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) {
src/d/actor/d_a_e_oc.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_ph.cpp
+3 -3
View File
@@ -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();
src/d/actor/d_a_e_pm.cpp
+8 -8
View File
@@ -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);
src/d/actor/d_a_e_po.cpp
+9 -9
View File
@@ -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<camera_class*>(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)));
camera_process_class* camera1 =
static_cast<camera_process_class*>(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)));
camera_class* camera2 = static_cast<camera_class*>(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<camera_class*>(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)));
camera_process_class* camera_player =
static_cast<camera_process_class*>(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)));
camera_class* camera = static_cast<camera_class*>(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<camera_class*>(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)));
camera_process_class* camera_player =
static_cast<camera_process_class*>(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)));
camera_class* camera = static_cast<camera_class*>(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);
src/d/actor/d_a_e_pz.cpp
+8 -8
View File
@@ -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();
src/d/actor/d_a_e_rd.cpp
+5 -5
View File
@@ -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));
src/d/actor/d_a_e_rdb.cpp
+1 -1
View File
@@ -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;
src/d/actor/d_a_e_rdy.cpp
+5 -5
View File
@@ -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));
src/d/actor/d_a_e_s1.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_sf.cpp
+1 -1
View File
@@ -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;
src/d/actor/d_a_e_sh.cpp
+2 -2
View File
@@ -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));
src/d/actor/d_a_e_sm.cpp
+4 -4
View File
@@ -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();
src/d/actor/d_a_e_sm2.cpp
+4 -4
View File
@@ -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;
src/d/actor/d_a_e_sw.cpp
+2 -2
View File
@@ -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 ||
src/d/actor/d_a_e_th.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_tt.cpp
+1 -1
View File
@@ -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 {
src/d/actor/d_a_e_vt.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_warpappear.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_wb.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_e_ww.cpp
+3 -3
View File
@@ -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;
src/d/actor/d_a_e_ym.cpp
+1 -1
View File
@@ -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();
}
src/d/actor/d_a_e_ymb.cpp
+6 -6
View File
@@ -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;
src/d/actor/d_a_e_zh.cpp
+8 -8
View File
@@ -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;
src/d/actor/d_a_horse.cpp
+1 -1
View File
@@ -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) {
src/d/actor/d_a_kago.cpp
+1 -1
View File
@@ -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;
src/d/actor/d_a_kytag00.cpp
+2 -2
View File
@@ -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);
src/d/actor/d_a_kytag01.cpp
+8 -8
View File
@@ -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) {
src/d/actor/d_a_kytag03.cpp
+4 -4
View File
@@ -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;
src/d/actor/d_a_kytag04.cpp
+1 -1
View File
@@ -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;
src/d/actor/d_a_kytag06.cpp
+6 -6
View File
@@ -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);
src/d/actor/d_a_kytag10.cpp
+3 -3
View File
@@ -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;
src/d/actor/d_a_kytag13.cpp
+5 -5
View File
@@ -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;
}
src/d/actor/d_a_mg_fshop.cpp
+3 -3
View File
@@ -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());
src/d/actor/d_a_mg_rod.cpp
+26 -26
View File
@@ -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);
src/d/actor/d_a_nbomb.cpp
+2 -2
View File
@@ -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;
src/d/actor/d_a_ni.cpp
+5 -5
View File
@@ -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();
src/d/actor/d_a_npc_henna.cpp
+23 -23
View File
@@ -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) &&
src/d/actor/d_a_npc_ks.cpp
+13 -13
View File
@@ -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);
src/d/actor/d_a_npc_lf.cpp
+3 -3
View File
@@ -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;
src/d/actor/d_a_npc_ne.cpp
+5 -5
View File
@@ -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<fopAc_ac_c*>(i_this);
daPy_py_c* player = static_cast<daPy_py_c*>(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--;
src/d/actor/d_a_npc_sq.cpp
+4 -4
View File
@@ -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<fopAc_ac_c*>(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
src/d/actor/d_a_npc_taro.cpp
+2 -2
View File
@@ -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 {
src/d/actor/d_a_npc_tk.cpp
+1 -1
View File
@@ -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;
src/d/actor/d_a_obj_ari.cpp
+1 -1
View File
@@ -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 {
src/d/actor/d_a_obj_brg.cpp
+2 -2
View File
@@ -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);
src/d/actor/d_a_obj_cho.cpp
+1 -1
View File
@@ -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 {
src/d/actor/d_a_obj_crvgate.cpp
+2 -2
View File
@@ -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();
src/d/actor/d_a_obj_dan.cpp
+1 -1
View File
@@ -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 {
src/d/actor/d_a_obj_drop.cpp
+2 -2
View File
@@ -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()) {
src/d/actor/d_a_obj_gra2_base.inc
+2 -2
View File
@@ -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) {
src/d/actor/d_a_obj_gra2_soldier.inc
+4 -4
View File
@@ -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;
src/d/actor/d_a_obj_hhashi.cpp
+3 -3
View File
@@ -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;
}
src/d/actor/d_a_obj_iceblock.cpp
+2 -2
View File
@@ -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();

Some files were not shown because too many files have changed in this diff Show More