New matches in d_camera_c (#2498)

* dCamera_c::blureCamera matching

* store progress

* camera store matching (regalloc)

* setEventRecoveryTrans matching

* matched currentEvCamera and runEventRecoveryTrans

* Fix
This commit is contained in:
Łukasz Starzyk
2025-06-24 20:51:18 +02:00
committed by GitHub
parent 384558830a
commit 6ae7bb47dc
4 changed files with 206 additions and 18 deletions
+2 -2
View File
@@ -360,7 +360,7 @@ public:
/* 8018050C */ bool currentEvCamera();
/* 801806D4 */ bool letCamera(s32);
/* 801806DC */ void setEventRecoveryTrans(s16);
/* 80180738 */ void runEventRecoveryTrans();
/* 80180738 */ s16 runEventRecoveryTrans();
/* 80180A40 */ void EventRecoverNotime();
/* 80180AA8 */ int Set(cXyz, cXyz);
/* 80180AE0 */ int Set(cXyz, cXyz, f32, s16);
@@ -377,7 +377,7 @@ public:
/* 80181210 */ void SetBlureScale(f32, f32, f32);
/* 80181220 */ void SetBlurePosition(f32, f32, f32);
/* 80181278 */ void SetBlureActor(fopAc_ac_c*);
/* 80181280 */ void blureCamera();
/* 80181280 */ int blureCamera();
/* 80181490 */ void onHorseDush();
/* 80181500 */ fopAc_ac_c* GetForceLockOnActor();
/* 80181534 */ int ForceLockOn(fopAc_ac_c*);
+2 -2
View File
@@ -62,8 +62,8 @@ struct stage_tresure_class {
// STAG
struct stage_stag_info_class {
/* 0x00 */ f32 field_0x0;
/* 0x04 */ f32 field_0x4;
/* 0x00 */ f32 mNear;
/* 0x04 */ f32 mFar;
/* 0x08 */ u8 mCameraType;
/* 0x09 */ u8 field_0x09;
/* 0x0A */ u16 field_0x0a;
+16
View File
@@ -31,6 +31,14 @@ public:
/* 0x248 */ dCamera_c mCamera;
};
inline void fopCamM_SetAngleX(camera_class* i_camera, s16 angle) {
i_camera->angle.x = angle;
}
inline void fopCamM_SetAngleY(camera_class* i_camera, s16 angle) {
i_camera->angle.y = angle;
}
inline void fopCamM_SetNear(camera_class* i_this, f32 near) {
i_this->near = near;
}
@@ -55,6 +63,10 @@ inline void fopCamM_SetCenter(camera_class* i_this, f32 x, f32 y, f32 z) {
i_this->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);
}
inline void fopCamM_SetBank(camera_class* i_this, s16 bank) {
i_this->bank = bank;
}
@@ -95,6 +107,10 @@ inline cXyz* fopCamM_GetCenter_p(camera_class* i_camera) {
return &i_camera->lookat.center;
}
inline cXyz* fopCamM_GetUp_p(camera_class* i_camera) {
return &i_camera->lookat.up;
}
inline s16 fopCamM_GetBank(camera_class* i_camera) {
return i_camera->bank;
}