d_s_room / d_s_name / d_a_title debug work (#3123)

* 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
+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));