d_camera debug almost matching (#3032)

This commit is contained in:
Max Roncace
2026-01-11 22:20:17 -05:00
committed by GitHub
parent 2dd7e2ea62
commit decb0c5437
18 changed files with 3715 additions and 1836 deletions
+2 -2
View File
@@ -55,8 +55,8 @@ int daTagMhint_c::create() {
->m_entries[field_0x56d]
.m_arrow_idx];
eyePos.set(arrow_data_p->position.x, arrow_data_p->position.y,
arrow_data_p->position.z);
eyePos.set(arrow_data_p->posX, arrow_data_p->posY,
arrow_data_p->posZ);
attention_info.position = eyePos;
}
+3 -4
View File
@@ -25,11 +25,10 @@ int daTagMmsg_c::create() {
if (!checkNoAttention()) {
s32 roomNo = fopAcM_GetRoomNo(this);
cXyz* tmp =
stage_arrow_data_class* arrowData =
&dComIfGp_getRoomArrow(roomNo)
->m_entries[dComIfGp_getRoomCamera(roomNo)->m_entries[mAttention].m_arrow_idx]
.position;
eyePos.set(tmp->x, tmp->y, tmp->z);
->m_entries[dComIfGp_getRoomCamera(roomNo)->m_entries[mAttention].m_arrow_idx];
eyePos.set(arrowData->posX, arrowData->posY, arrowData->posZ);
attention_info.position = eyePos;
}
+3 -4
View File
@@ -55,11 +55,10 @@ int daTagMstop_c::create() {
if (!checkNoAttention()) {
s32 room = fopAcM_GetRoomNo(this);
cXyz* pos = &dComIfGp_getRoomArrow(room)
->m_entries[dComIfGp_getRoomCamera(room)->m_entries[idx].m_arrow_idx]
.position;
stage_arrow_data_class* arrowData = &dComIfGp_getRoomArrow(room)
->m_entries[dComIfGp_getRoomCamera(room)->m_entries[idx].m_arrow_idx];
eyePos.set(pos->x, pos->y, pos->z);
eyePos.set(arrowData->posX, arrowData->posY, arrowData->posZ);
attention_info.position = eyePos;
}
+8 -8
View File
@@ -1498,8 +1498,8 @@ void daTbox_c::settingDropDemoCamera() {
cXyz spA0;
cXyz spAC;
spA0.x = stage_arrow_data->position.x;
spA0.z = stage_arrow_data->position.z;
spA0.x = stage_arrow_data->posX;
spA0.z = stage_arrow_data->posZ;
spAC.x = home.pos.x;
spAC.z = home.pos.z;
f32 var_f30 = spA0.abs(spAC);
@@ -1510,16 +1510,16 @@ void daTbox_c::settingDropDemoCamera() {
s16 angle;
getDropSAngle(&angle);
spB8.x = stage_arrow_data->position.x;
spB8.x = stage_arrow_data->posX;
spB8.y = 0.0f;
spB8.z = stage_arrow_data->position.z;
spB8.z = stage_arrow_data->posZ;
spB8 -= home.pos;
Mtx mtx;
MTXRotAxisRad(mtx, &spC4, cM_s2rad(angle));
mDoMtx_multVec(mtx, &spB8, &spB8);
spB8 += home.pos;
spB8.y = stage_arrow_data->position.y;
spB8.y = stage_arrow_data->posY;
cXyz cam_eye;
cXyz cam_center;
@@ -1527,10 +1527,10 @@ void daTbox_c::settingDropDemoCamera() {
cam_eye = spB8;
cam_center = home.pos;
f32 var_f29 = cM_ssin(stage_arrow_data->angle.x);
f32 var_f28 = cM_scos(stage_arrow_data->angle.x);
f32 var_f29 = cM_ssin(stage_arrow_data->angleX);
f32 var_f28 = cM_scos(stage_arrow_data->angleX);
f32 dist = var_f30 * (var_f29 / var_f28);
if (stage_arrow_data->angle.x > 0) {
if (stage_arrow_data->angleX > 0) {
dist = -dist;
}