mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Code Issues Projects Releases Wiki Activity

More small cleanups, Improve legibility of func_800AAA9C by removing several unnecessary casts

Browse source
This commit is contained in:
Thar0 2020-04-05 03:08:01 +01:00
parent 668d35b77f
commit 00542fef56
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/code/z_view.c
View file

@ -240,7 +240,7 @@ s32 func_800AA890(View* view, Mtx* mtx) {
Matrix_RotateX(view->unk_104.x, 1); Matrix_RotateX(view->unk_104.x, 1);
Matrix_RotateY(view->unk_104.y, 1); Matrix_RotateY(view->unk_104.y, 1);
Matrix_RotateZ(view->unk_104.z, 1); Matrix_RotateZ(view->unk_104.z, 1);
Matrix_Scale(view->unk_110.x, view->unk_110.y, view->unk_110.z, 1); Matrix_Scale(view->unk_110.x, view->unk_110.y, view->unk_110.z, MTXMODE_APPLY);
Matrix_RotateZ(-view->unk_104.z, 1); Matrix_RotateZ(-view->unk_104.z, 1);
Matrix_RotateY(-view->unk_104.y, 1); Matrix_RotateY(-view->unk_104.y, 1);
Matrix_RotateX(-view->unk_104.x, 1); Matrix_RotateX(-view->unk_104.x, 1);
@ -289,17 +289,16 @@ s32 func_800AAA9C(View* view) {
view->unk_E0 = projection; view->unk_E0 = projection;
xlen = view->viewport.rightX - view->viewport.leftX; xlen = view->viewport.rightX - view->viewport.leftX;
ylen = view->viewport.bottomY - view->viewport.topY; ylen = view->viewport.bottomY - view->viewport.topY;
if ((u16)0xB == HREG(80)) { if (HREG(80) == 0xB) {
if ((u16)0xB != HREG(94)) { if (HREG(94) != 0xB) {
HREG(94) = (u16)0xB; HREG(94) = 0xB;
HREG(83) = (u16)0x3C; HREG(83) = 0x3C;
HREG(84) = (u16)0x3415; HREG(84) = 0x3415;
HREG(85) = (u16)0xA; HREG(85) = 0xA;
HREG(86) = (u16)0x3200; HREG(86) = 0x3200;
HREG(87) = (u16)0x64; HREG(87) = 0x64;
} }
guPerspective(projection, &view->unk_11C, (f32)HREG(83), (f32)HREG(84) / 10000.0f, (f32)HREG(85), (f32)HREG(86), guPerspective(projection, &view->unk_11C, HREG(83), HREG(84) / 10000.0f, HREG(85), HREG(86), HREG(87) / 100.0f);
(f32)HREG(87) / 100.0f);
} else { } else {
guPerspective(projection, &view->unk_11C, view->fieldOfView, (f32)xlen / (f32)ylen, view->fogDistance, guPerspective(projection, &view->unk_11C, view->fieldOfView, (f32)xlen / (f32)ylen, view->fogDistance,
view->zDepth, view->unk_24); view->zDepth, view->unk_24);
@ -324,7 +323,7 @@ s32 func_800AAA9C(View* view) {
gSPPerspNormalize(gfxCtx->polyXlu.p++, view->unk_11C); gSPPerspNormalize(gfxCtx->polyXlu.p++, view->unk_11C);
gSPMatrix(gfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(gfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
viewing = Graph_Alloc(gfxCtx, 0x40); viewing = Graph_Alloc(gfxCtx, sizeof(MtxF));
LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667); LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667);
view->unk_E4 = viewing; view->unk_E4 = viewing;
if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) { if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) {
@ -337,7 +336,7 @@ s32 func_800AAA9C(View* view) {
view->unk_40.x, view->unk_40.y, view->unk_40.z); view->unk_40.x, view->unk_40.y, view->unk_40.z);
view->unk_A0 = *viewing; view->unk_A0 = *viewing;
if ((QREG(88) & 2) != 0) { if (QREG(88) & 2) {
Matrix_MtxToMtxF(view->unk_E4, &mtxFv); Matrix_MtxToMtxF(view->unk_E4, &mtxFv);
osSyncPrintf("viewing\n"); osSyncPrintf("viewing\n");
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {