mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-14 22:08:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc Cleanup 2 (#1521)

Browse Source 
* begin cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* fake matches

* more cleanup

* more cleanup

* small thing

* PR Review

* PR Review
This commit is contained in:
engineer124
2024-03-23 22:04:07 +11:00
committed by GitHub
parent a7fa8cc241
commit 5bef89a6ff
84 changed files with 746 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_camera.c
+4 -6
View File
@@ -1075,7 +1075,7 @@ Vec3f Camera_CalcUpVec(s16 pitch, s16 yaw, s16 roll) {
Vec3f rollMtxRow1;
Vec3f rollMtxRow2;
Vec3f rollMtxRow3;
f32 pad;
s32 pad;
// Axis to roll around
u.x = cosP * sinY;
@@ -1391,7 +1391,7 @@ s32 Camera_CalcAtForNormal1(Camera* camera, VecGeo* arg1, f32 yOffset, f32 forwa
*/
s32 Camera_CalcAtForParallel(Camera* camera, VecGeo* arg1, f32 yOffset, f32 xzOffsetMax, f32* focalActorPosY,
s16 flags) {
f32 pad;
s32 pad;
Vec3f focalActorAtOffsetTarget;
Vec3f atTarget;
f32 fovHeight;
@@ -2477,9 +2477,7 @@ s32 Camera_Normal3(Camera* camera) {
sp62 = BINANG_SUB(focalActorPosRot->rot.y, BINANG_ROT180(sp68.yaw));
sp78 = OLib_Vec3fToVecGeo(&camera->unk_0F0);
phi_v1_2 = focalActorPosRot->rot.y - sp78.yaw;
if (phi_v1_2 < 0) {
phi_v1_2 *= -1;
}
phi_v1_2 = ABS_ALT(phi_v1_2);
if (phi_v1_2 < 0x555A) {
temp_f2 = 1.0f;
@@ -3299,7 +3297,7 @@ s32 Camera_Jump3(Camera* camera) {
f32 phi_f2_2;
f32 temp_f0;
f32 temp1;
f32 pad;
s32 pad;
Jump3ReadOnlyData* roData = &camera->paramData.jump3.roData;
Jump3ReadWriteData* rwData = &camera->paramData.jump3.rwData;
f32 focalActorHeight = Camera_GetFocalActorHeight(camera);