mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 04:14:34 +00:00
Code Issues Projects Releases Wiki Activity

Camera_KeepOn4 docs 1 (#2627)

Browse source 
* `Camera_KeepOn4` docs 1

* add comment

* backticks around at, eye
This commit is contained in:
Dragorn421 2025-06-13 23:45:22 +02:00 • committed by GitHub
parent e4e14a6bcf
commit 8a823a7ad2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 75 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

136
src/code/z_camera.c
View file

@ -3593,7 +3593,7 @@ s32 Camera_KeepOn3(Camera* camera) {
playerHeadPos = camPlayerPosRot->pos; playerHeadPos = camPlayerPosRot->pos;
playerHeadPos.y += playerHeight; playerHeadPos.y += playerHeight;
rwData->atTarget = Camera_AddVecGeoToVec3f(&playerHeadPos, &targetToPlayerDir); rwData->atTarget = Camera_AddVecGeoToVec3f(&playerHeadPos, &targetToPlayerDir);
angleCnt = ARRAY_COUNT(D_8011D3B0); angleCnt = ARRAY_COUNT(sCamCheckAroundOffsetsYaw);
i = 0; i = 0;
targetToPlayerDir.r = prevTargetPlayerDist; targetToPlayerDir.r = prevTargetPlayerDist;
atToEyeAdj.r = roData->minDist + (targetToPlayerDir.r * (1 - 0.5f)) - atToEyeNextDir.r + atToEyeNextDir.r; atToEyeAdj.r = roData->minDist + (targetToPlayerDir.r * (1 - 0.5f)) - atToEyeNextDir.r + atToEyeNextDir.r;
@ -3605,8 +3605,8 @@ s32 Camera_KeepOn3(Camera* camera) {
!Camera_BGCheck(camera, &rwData->atTarget, &lineChkPointB)) { !Camera_BGCheck(camera, &rwData->atTarget, &lineChkPointB)) {
break; break;
} }
atToEyeAdj.yaw = sp80 + D_8011D3B0[i]; atToEyeAdj.yaw = sp80 + sCamCheckAroundOffsetsYaw[i];
atToEyeAdj.pitch = sp82 + D_8011D3CC[i]; atToEyeAdj.pitch = sp82 + sCamCheckAroundOffsetsPitch[i];
lineChkPointB = Camera_AddVecGeoToVec3f(&rwData->atTarget, &atToEyeAdj); lineChkPointB = Camera_AddVecGeoToVec3f(&rwData->atTarget, &atToEyeAdj);
i++; i++;
} }
@ -3664,24 +3664,24 @@ s32 Camera_KeepOn3(Camera* camera) {
"ique-cn:128 ntsc-1.0:79 ntsc-1.1:79 ntsc-1.2:79 pal-1.0:79 pal-1.1:79" "ique-cn:128 ntsc-1.0:79 ntsc-1.1:79 ntsc-1.2:79 pal-1.0:79 pal-1.1:79"
s32 Camera_KeepOn4(Camera* camera) { s32 Camera_KeepOn4(Camera* camera) {
static Vec3f D_8015BD50; static Vec3f sAtTarget;
static Vec3f D_8015BD60; static Vec3f D_8015BD60;
static Vec3f D_8015BD70; static Vec3f sEyeCandidate;
Vec3f* eye = &camera->eye; Vec3f* eye = &camera->eye;
Vec3f* at = &camera->at; Vec3f* at = &camera->at;
Vec3f* eyeNext = &camera->eyeNext; Vec3f* eyeNext = &camera->eyeNext;
Actor* spCC[2]; Actor* lineOCCheckExclusions[2];
f32 t = -0.5f; f32 t = -0.5f;
f32 temp_f0_2; f32 temp_f0_2;
CollisionPoly* spC0; CollisionPoly* spC0;
VecGeo spB8; VecGeo vecGeo;
UNUSED VecGeo spB0; VecGeo atToEyeDir;
VecGeo spA8; VecGeo atToEyeNextDir;
s16* itemType = &camera->data2; s16* itemType = &camera->data2;
s16 spA2; s16 atToEyeBasePitch;
s16 spA0; s16 atToEyeBaseYaw;
s16 sp9E; s16 sp9E;
s16 sp9C; s16 lineOCCheckNumExclusions;
PosRot* playerPosRot = &camera->playerPosRot; PosRot* playerPosRot = &camera->playerPosRot;
KeepOn4ReadOnlyData* roData = &camera->paramData.keep4.roData; KeepOn4ReadOnlyData* roData = &camera->paramData.keep4.roData;
KeepOn4ReadWriteData* rwData = &camera->paramData.keep4.rwData; KeepOn4ReadWriteData* rwData = &camera->paramData.keep4.rwData;
@ -3839,87 +3839,87 @@ s32 Camera_KeepOn4(Camera* camera) {
sUpdateCameraDirection = 1; sUpdateCameraDirection = 1;
sCameraInterfaceField = roData->interfaceField; sCameraInterfaceField = roData->interfaceField;
spB0 = OLib_Vec3fDiffToVecGeo(at, eye); atToEyeDir = OLib_Vec3fDiffToVecGeo(at, eye);
spA8 = OLib_Vec3fDiffToVecGeo(at, eyeNext); atToEyeNextDir = OLib_Vec3fDiffToVecGeo(at, eyeNext);
D_8015BD50 = playerPosRot->pos; sAtTarget = playerPosRot->pos;
D_8015BD50.y += playerHeight; sAtTarget.y += playerHeight;
temp_f0_2 = BgCheck_CameraRaycastDown2(&camera->play->colCtx, &spC0, &i, &D_8015BD50); temp_f0_2 = BgCheck_CameraRaycastDown2(&camera->play->colCtx, &spC0, &i, &sAtTarget);
if (temp_f0_2 > (roData->unk_00 + D_8015BD50.y)) { if (temp_f0_2 > (roData->unk_00 + sAtTarget.y)) {
D_8015BD50.y = temp_f0_2 + 10.0f; sAtTarget.y = temp_f0_2 + 10.0f;
} else { } else {
D_8015BD50.y += roData->unk_00; sAtTarget.y += roData->unk_00;
} }
sp9C = 0; lineOCCheckNumExclusions = 0;
switch (camera->animState) { switch (camera->animState) {
case 0: case 0:
case 20: case 20:
spCC[sp9C] = &camera->player->actor; lineOCCheckExclusions[lineOCCheckNumExclusions] = &camera->player->actor;
sp9C++; lineOCCheckNumExclusions++;
func_80043ABC(camera); func_80043ABC(camera);
camera->stateFlags &= ~(CAM_STATE_CHECK_WATER | CAM_STATE_CHECK_BG); camera->stateFlags &= ~(CAM_STATE_CHECK_WATER | CAM_STATE_CHECK_BG);
rwData->unk_10 = roData->unk_1E; rwData->unk_10 = roData->unk_1E;
rwData->unk_08 = playerPosRot->pos.y - camera->playerPosDelta.y; rwData->unk_08 = playerPosRot->pos.y - camera->playerPosDelta.y;
if (roData->interfaceField & KEEPON4_FLAG_1) { if (roData->interfaceField & KEEPON4_FLAG_1) {
spA2 = CAM_DEG_TO_BINANG(roData->unk_08); atToEyeBasePitch = CAM_DEG_TO_BINANG(roData->unk_08);
spA0 = (s16)((s16)(playerPosRot->rot.y - 0x7FFF) - spA8.yaw) > 0 atToEyeBaseYaw = (s16)((s16)(playerPosRot->rot.y - 0x7FFF) - atToEyeNextDir.yaw) > 0
? (s16)(playerPosRot->rot.y - 0x7FFF) + CAM_DEG_TO_BINANG(roData->unk_0C) ? (s16)(playerPosRot->rot.y - 0x7FFF) + CAM_DEG_TO_BINANG(roData->unk_0C)
: (s16)(playerPosRot->rot.y - 0x7FFF) - CAM_DEG_TO_BINANG(roData->unk_0C); : (s16)(playerPosRot->rot.y - 0x7FFF) - CAM_DEG_TO_BINANG(roData->unk_0C);
} else if (roData->interfaceField & KEEPON4_FLAG_2) { } else if (roData->interfaceField & KEEPON4_FLAG_2) {
spA2 = CAM_DEG_TO_BINANG(roData->unk_08); atToEyeBasePitch = CAM_DEG_TO_BINANG(roData->unk_08);
spA0 = CAM_DEG_TO_BINANG(roData->unk_0C); atToEyeBaseYaw = CAM_DEG_TO_BINANG(roData->unk_0C);
} else if ((roData->interfaceField & KEEPON4_FLAG_3) && camera->target != NULL) { } else if ((roData->interfaceField & KEEPON4_FLAG_3) && camera->target != NULL) {
PosRot sp60; PosRot sp60;
sp60 = Actor_GetWorldPosShapeRot(camera->target); sp60 = Actor_GetWorldPosShapeRot(camera->target);
spA2 = CAM_DEG_TO_BINANG(roData->unk_08) - sp60.rot.x; atToEyeBasePitch = CAM_DEG_TO_BINANG(roData->unk_08) - sp60.rot.x;
spA0 = (s16)((s16)(sp60.rot.y - 0x7FFF) - spA8.yaw) > 0 atToEyeBaseYaw = (s16)((s16)(sp60.rot.y - 0x7FFF) - atToEyeNextDir.yaw) > 0
? (s16)(sp60.rot.y - 0x7FFF) + CAM_DEG_TO_BINANG(roData->unk_0C) ? (s16)(sp60.rot.y - 0x7FFF) + CAM_DEG_TO_BINANG(roData->unk_0C)
: (s16)(sp60.rot.y - 0x7FFF) - CAM_DEG_TO_BINANG(roData->unk_0C); : (s16)(sp60.rot.y - 0x7FFF) - CAM_DEG_TO_BINANG(roData->unk_0C);
spCC[1] = camera->target; lineOCCheckExclusions[1] = camera->target;
sp9C++; lineOCCheckNumExclusions++;
} else if ((roData->interfaceField & KEEPON4_FLAG_7) && camera->target != NULL) { } else if ((roData->interfaceField & KEEPON4_FLAG_7) && camera->target != NULL) {
PosRot sp4C; PosRot sp4C;
sp4C = Actor_GetWorld(camera->target); sp4C = Actor_GetWorld(camera->target);
spA2 = CAM_DEG_TO_BINANG(roData->unk_08); atToEyeBasePitch = CAM_DEG_TO_BINANG(roData->unk_08);
sp9E = Camera_XZAngle(&sp4C.pos, &playerPosRot->pos); sp9E = Camera_XZAngle(&sp4C.pos, &playerPosRot->pos);
spA0 = ((s16)(sp9E - spA8.yaw) > 0) ? sp9E + CAM_DEG_TO_BINANG(roData->unk_0C) atToEyeBaseYaw = ((s16)(sp9E - atToEyeNextDir.yaw) > 0) ? sp9E + CAM_DEG_TO_BINANG(roData->unk_0C)
: sp9E - CAM_DEG_TO_BINANG(roData->unk_0C); : sp9E - CAM_DEG_TO_BINANG(roData->unk_0C);
spCC[1] = camera->target; lineOCCheckExclusions[1] = camera->target;
sp9C++; lineOCCheckNumExclusions++;
} else if (roData->interfaceField & KEEPON4_FLAG_6) { } else if (roData->interfaceField & KEEPON4_FLAG_6) {
spA2 = CAM_DEG_TO_BINANG(roData->unk_08); atToEyeBasePitch = CAM_DEG_TO_BINANG(roData->unk_08);
spA0 = spA8.yaw; atToEyeBaseYaw = atToEyeNextDir.yaw;
} else { } else {
spA2 = spA8.pitch; atToEyeBasePitch = atToEyeNextDir.pitch;
spA0 = spA8.yaw; atToEyeBaseYaw = atToEyeNextDir.yaw;
} }
spB8.pitch = spA2; vecGeo.pitch = atToEyeBasePitch;
spB8.yaw = spA0; vecGeo.yaw = atToEyeBaseYaw;
spB8.r = roData->unk_04; vecGeo.r = roData->unk_04;
D_8015BD70 = Camera_AddVecGeoToVec3f(&D_8015BD50, &spB8); sEyeCandidate = Camera_AddVecGeoToVec3f(&sAtTarget, &vecGeo);
if (!(roData->interfaceField & KEEPON4_FLAG_0)) { if (!(roData->interfaceField & KEEPON4_FLAG_0)) {
angleCnt = ARRAY_COUNT(D_8011D3B0); angleCnt = ARRAY_COUNT(sCamCheckAroundOffsetsYaw);
for (i = 0; i < angleCnt; i++) { for (i = 0; i < angleCnt; i++) {
if (!CollisionCheck_LineOCCheck(camera->play, &camera->play->colChkCtx, &D_8015BD50, &D_8015BD70, if (!CollisionCheck_LineOCCheck(camera->play, &camera->play->colChkCtx, &sAtTarget, &sEyeCandidate,
spCC, sp9C) && lineOCCheckExclusions, lineOCCheckNumExclusions) &&
!Camera_BGCheck(camera, &D_8015BD50, &D_8015BD70)) { !Camera_BGCheck(camera, &sAtTarget, &sEyeCandidate)) {
break; break;
} }
spB8.yaw = D_8011D3B0[i] + spA0; vecGeo.yaw = sCamCheckAroundOffsetsYaw[i] + atToEyeBaseYaw;
spB8.pitch = D_8011D3CC[i] + spA2; vecGeo.pitch = sCamCheckAroundOffsetsPitch[i] + atToEyeBasePitch;
D_8015BD70 = Camera_AddVecGeoToVec3f(&D_8015BD50, &spB8); sEyeCandidate = Camera_AddVecGeoToVec3f(&sAtTarget, &vecGeo);
} }
#if DEBUG_FEATURES #if DEBUG_FEATURES
PRINTF("camera: item: BG&collision check %d time(s)\n", i); PRINTF("camera: item: BG&collision check %d time(s)\n", i);
#endif #endif
} }
rwData->unk_04 = (s16)(spB8.pitch - spA8.pitch) / (f32)rwData->unk_10; rwData->unk_04 = (s16)(vecGeo.pitch - atToEyeNextDir.pitch) / (f32)rwData->unk_10;
rwData->unk_00 = (s16)(spB8.yaw - spA8.yaw) / (f32)rwData->unk_10; rwData->unk_00 = (s16)(vecGeo.yaw - atToEyeNextDir.yaw) / (f32)rwData->unk_10;
rwData->unk_0C = spA8.yaw; rwData->unk_0C = atToEyeNextDir.yaw;
rwData->unk_0E = spA8.pitch; rwData->unk_0E = atToEyeNextDir.pitch;
camera->animState++; camera->animState++;
rwData->unk_12 = 1; rwData->unk_12 = 1;
break; break;
@ -3931,16 +3931,16 @@ s32 Camera_KeepOn4(Camera* camera) {
camera->xzOffsetUpdateRate = 0.25f; camera->xzOffsetUpdateRate = 0.25f;
camera->yOffsetUpdateRate = 0.25f; camera->yOffsetUpdateRate = 0.25f;
camera->atLERPStepScale = 0.75f; camera->atLERPStepScale = 0.75f;
Camera_LERPCeilVec3f(&D_8015BD50, at, 0.5f, 0.5f, 0.2f); Camera_LERPCeilVec3f(&sAtTarget, at, 0.5f, 0.5f, 0.2f);
if (roData->unk_10 != 0.0f) { if (roData->unk_10 != 0.0f) {
spB8.r = roData->unk_10; vecGeo.r = roData->unk_10;
spB8.pitch = 0; vecGeo.pitch = 0;
spB8.yaw = playerPosRot->rot.y; vecGeo.yaw = playerPosRot->rot.y;
*at = Camera_AddVecGeoToVec3f(at, &spB8); *at = Camera_AddVecGeoToVec3f(at, &vecGeo);
} }
camera->atLERPStepScale = 0.0f; camera->atLERPStepScale = 0.0f;
camera->dist = Camera_LERPCeilF(roData->unk_04, camera->dist, 0.25f, 2.0f); camera->dist = Camera_LERPCeilF(roData->unk_04, camera->dist, 0.25f, 2.0f);
spB8.r = camera->dist; vecGeo.r = camera->dist;
if (rwData->unk_10 != 0) { if (rwData->unk_10 != 0) {
camera->stateFlags |= CAM_STATE_LOCK_MODE; camera->stateFlags |= CAM_STATE_LOCK_MODE;
rwData->unk_0C += (s16)rwData->unk_00; rwData->unk_0C += (s16)rwData->unk_00;
@ -3967,9 +3967,9 @@ s32 Camera_KeepOn4(Camera* camera) {
} }
} }
} }
spB8.yaw = Camera_LERPCeilS(rwData->unk_0C, spA8.yaw, roData->unk_14, 4); vecGeo.yaw = Camera_LERPCeilS(rwData->unk_0C, atToEyeNextDir.yaw, roData->unk_14, 4);
spB8.pitch = Camera_LERPCeilS(rwData->unk_0E, spA8.pitch, roData->unk_14, 4); vecGeo.pitch = Camera_LERPCeilS(rwData->unk_0E, atToEyeNextDir.pitch, roData->unk_14, 4);
*eyeNext = Camera_AddVecGeoToVec3f(at, &spB8); *eyeNext = Camera_AddVecGeoToVec3f(at, &vecGeo);
*eye = *eyeNext; *eye = *eyeNext;
Camera_BGCheck(camera, at, eye); Camera_BGCheck(camera, at, eye);
camera->fov = Camera_LERPCeilF(roData->unk_18, camera->fov, camera->fovUpdateRate, 1.0f); camera->fov = Camera_LERPCeilF(roData->unk_18, camera->fov, camera->fovUpdateRate, 1.0f);

12
src/code/z_camera_data.inc.c
View file

@ -2574,12 +2574,14 @@ s32 sCameraLetterboxSize = 32;
s32 D_8011D3AC = -1; s32 D_8011D3AC = -1;
s16 D_8011D3B0[] = { // Used in Camera_KeepOn3 and Camera_KeepOn4 to check around an `at` position for an `eye` position such that the
0x0AAA, 0xF556, 0x1555, 0xEAAB, 0x2AAA, 0xD556, 0x3FFF, 0xC001, 0x5555, 0xAAAB, 0x6AAA, 0x9556, 0x7FFF, 0x0000, // `at`-`eye` segment is not obstructed by collision or colliders.
s16 sCamCheckAroundOffsetsYaw[] = {
0x0AAA, -0x0AAA, 0x1555, -0x1555, 0x2AAA, -0x2AAA, 0x3FFF,
-0x3FFF, 0x5555, -0x5555, 0x6AAA, -0x6AAA, 0x7FFF, 0x0000,
}; };
s16 sCamCheckAroundOffsetsPitch[] = {
s16 D_8011D3CC[] = { 0x0000, 0x02C6, 0x058C, 0x0000, 0x0000, -0x02C6, 0x0000, 0x0852, 0x0000, 0x0000, 0x0B18, 0x02C6, -0x058C, 0x0000,
0x0000, 0x02C6, 0x058C, 0x0000, 0x0000, 0xFD3A, 0x0000, 0x0852, 0x0000, 0x0000, 0x0B18, 0x02C6, 0xFA74, 0x0000,
}; };
s32 sUpdateCameraDirection = 0; s32 sUpdateCameraDirection = 0;