diff --git a/include/PR/gbi.h b/include/PR/gbi.h index e32b91881c..1e83e197f4 100644 --- a/include/PR/gbi.h +++ b/include/PR/gbi.h @@ -4199,7 +4199,7 @@ _DW({ \ #endif /* _HW_VERSION_1 */ #define gDPSetScissor(pkt, mode, ulx, uly, lrx, lry) \ -{ \ +_DW({ \ Gfx *_g = (Gfx *)pkt; \ \ _g->words.w0 = _SHIFTL(G_SETSCISSOR, 24, 8) | \ @@ -4208,7 +4208,7 @@ _DW({ \ _g->words.w1 = _SHIFTL(mode, 24, 2) | \ _SHIFTL((int)((float)(lrx)*4.0F), 12, 12) | \ _SHIFTL((int)((float)(lry)*4.0F), 0, 12); \ -} +}) #define gDPSetScissorFrac(pkt, mode, ulx, uly, lrx, lry) \ diff --git a/include/functions.h b/include/functions.h index 2333252e40..f1a1ccda62 100644 --- a/include/functions.h +++ b/include/functions.h @@ -610,7 +610,7 @@ void func_800B14D4(void); // func_800B14D4 void func_800B1598(void); // func_800B1598 void func_800B165C(void); // func_800B165C void func_800B16B8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6); // func_800B16B8 -void EffectSS_SpawnSparkle(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_PTR param_5, UNK_PTR param_6, UNK_TYPE2 param_7, int param_8); // func_800B16F4 +void EffectSS_SpawnSparkle(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE4* param_5, UNK_TYPE4* param_6, UNK_TYPE2 param_7, int param_8); // func_800B16F4 void func_800B1830(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE4 param_8); // func_800B1830 void EffectSS_SpawnBomb2(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4); // func_800B1908 void func_800B1970(UNK_TYPE4 param_1, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6); // func_800B1970 @@ -626,7 +626,7 @@ void func_800B1DC8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_ void EffectSS_SpawnDodongoFire(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10); // func_800B1E0C void EffectSS_SpawnBubble(UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE4 uParm3, UNK_TYPE4 uParm4, UNK_TYPE4 param_5, UNK_TYPE4 param_6); // func_800B1E94 void EffectSS_SpawnGRipple(UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE2 uParm3, UNK_TYPE2 uParm4, UNK_TYPE2 param_5); // func_800B1EF4 -void EffectSS_SpawnGSplash(UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_PTR puParm3, UNK_PTR puParm4, UNK_TYPE1 uParm5, UNK_TYPE2 param_6); // func_800B1F4C +void EffectSS_SpawnGSplash(UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE4* puParm3, UNK_TYPE4* puParm4, UNK_TYPE1 uParm5, UNK_TYPE2 param_6); // func_800B1F4C void EffectSS_SpawnGFire(UNK_TYPE4 uParm1, Vec3f* pzParm2); // func_800B1FE0 void EffectSS_SpawnLightning(UNK_TYPE4 uParm1, Vec3f* pzParm2, ColorRGBA8* pzParm3, ColorRGBA8* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8); // func_800B2018 void func_800B2090(UNK_TYPE4 param_1, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8); // func_800B2090 @@ -657,9 +657,9 @@ void func_800B2DA4(void); // func_800B2DA4 void EffectSS_SpawnEnemyFire(UNK_TYPE4 uParm1, Actor* pzParm2, Vec3f* pzParm3, UNK_TYPE2 uParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7); // func_800B2DF4 void func_800B2E6C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7); // func_800B2E6C void EffectSS_SpawnExtra(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6); // func_800B2F18 -void EffectSS_SpawnDeadDekuBaba(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_PTR param_5, UNK_PTR param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE4 param_9); // func_800B2F80 +void EffectSS_SpawnDeadDekuBaba(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE1* param_5, UNK_TYPE1* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE4 param_9); // func_800B2F80 void func_800B3030(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE4 param_7); // func_800B3030 -void EffectSS_SpawnDeadDodongo(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_PTR param_5, UNK_PTR param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10); // func_800B3088 +void EffectSS_SpawnDeadDodongo(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE1* param_5, UNK_TYPE1* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10); // func_800B3088 void EffectSS_SpawnDeadDekuScrub(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE4 param_8); // func_800B3144 void func_800B31BC(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6); // func_800B31BC void EffectSS_SpawnIceSmoke(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5); // func_800B320C @@ -2727,36 +2727,36 @@ void func_8013EE04(void); // func_8013EE04 void func_8013EE24(void); // func_8013EE24 void func_8013EE38(void); // func_8013EE38 void func_8013EE48(void); // func_8013EE48 -void View_MapViewportToGfxVp(Vp* gfxVp, Viewport* viewport); // func_8013EE60 -void View_InitView(View* view, GraphicsContext* gCtxt); // func_8013EEF4 +void View_ViewportToVp(Vp* dest, Viewport* src); // func_8013EE60 +void View_Init(View* view, GraphicsContext* gCtxt); // func_8013EEF4 void View_SetViewOrientation(View* view, Vec3f* eye, Vec3f* focalPoint, Vec3f* upDir); // func_8013EF9C -void func_8013F050(View* view, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4); // func_8013F050 -void func_8013F0A0(View* view, UNK_TYPE4 param_2); // func_8013F0A0 -void func_8013F0C0(View* view, UNK_PTR param_2); // func_8013F0C0 -void func_8013F0D0(View* view, f32 uParm2, f32 uParm3, f32 uParm4); // func_8013F0D0 -void func_8013F100(View* view, UNK_PTR param_2, UNK_PTR param_3, UNK_PTR param_4); // func_8013F100 -void func_8013F120(View* view, UNK_TYPE4 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4); // func_8013F120 -void func_8013F15C(View* view, UNK_PTR param_2, UNK_PTR param_3, UNK_PTR param_4); // func_8013F15C -void func_8013F17C(View* view, Viewport* viewport); // func_8013F17C +void func_8013F050(View* view, Vec3f* eye, Vec3f* focalPoint, Vec3f* upDir); // func_8013F050 +void View_SetScale(View* view, f32 scale); // func_8013F0A0 +void View_GetScale(View* view, f32* scale); // func_8013F0C0 +void func_8013F0D0(View* view, f32 fovy, f32 zNear, f32 zFar); // func_8013F0D0 +void func_8013F100(View* view, f32* fovy, f32* zNear, f32* zFar); // func_8013F100 +void func_8013F120(View* view, f32 fovy, f32 zNear, f32 zFar); // func_8013F120 +void func_8013F15C(View* view, f32* fovy, f32* zNear, f32* zFar); // func_8013F15C +void View_SetViewport(View* view, Viewport* viewport); // func_8013F17C void View_GetViewport(View* view, Viewport* viewport); // func_8013F1B0 -void View_WriteScissor(Gfx** gfx, s32 leftX, s32 upperY, s32 rightX, s32 lowerY); // func_8013F1D8 -void View_WriteBlackFillColorAndScissor(View* view, Gfx** gfx); // func_8013F28C +void View_WriteScissor(Gfx** gfx, s32 ulx, s32 uly, s32 lrx, s32 lry); // func_8013F1D8 +void View_SyncAndWriteScissor(View* view, Gfx** gfx); // func_8013F28C void View_SetScissorForLetterbox(View* view); // func_8013F2F8 s32 View_SetQuakeRotation(View* view, f32 x, f32 y, f32 z); // func_8013F3F8 s32 View_SetQuakeScale(View* view, f32 x, f32 y, f32 z); // func_8013F420 s32 View_SetQuakeSpeed(View* view, f32 speed); // func_8013F448 s32 View_InitCameraQuake(View* view); // func_8013F45C s32 View_ClearQuake(View* view); // func_8013F4C0 -s32 View_SetQuake(View* view, f32 rotX, f32 rotY, f32 rotZ, f32 scaleX, f32 scaleY, f32 scaleZ, f32 speed); // func_8013F4F4 +s32 View_SetQuake(View* view, Vec3f rot, Vec3f scale, f32 speed); // func_8013F4F4 s32 View_StepQuake(View* view, RSPMatrix* matrix); // func_8013F54C -void View_RenderView(View* view, u32 uParm2); // func_8013F6FC +void View_RenderView(View* view, s32 uParm2); // func_8013F6FC s32 View_RenderToPerspectiveMatrix(View* view); // func_8013F748 s32 View_RenderToOrthographicMatrix(View* view); // func_8013FA1C s32 func_8013FBC8(View* view); // func_8013FBC8 s32 func_8013FD74(View* view); // func_8013FD74 s32 func_80140024(View* view); // func_80140024 -s32 func_801400CC(View* view, Gfx** param_2); // func_801400CC -void func_80140260(void); // func_80140260 +s32 func_801400CC(View* view, Gfx** gfxp); // func_801400CC +void func_80140260(OSViMode* vimode); // func_80140260 void func_8014026C(OSViMode* param_1, UNK_TYPE1 param_2, int param_3, int param_4, int param_5, int param_6, int param_7, int param_8, UNK_TYPE4 param_9, int param_10, short param_11, unsigned int param_12, UNK_TYPE4 param_13); // func_8014026C void func_80140730(void); // func_80140730 void func_80140810(void); // func_80140810 diff --git a/include/structs.h b/include/structs.h index ed33d84278..e59d187ef7 100644 --- a/include/structs.h +++ b/include/structs.h @@ -1474,31 +1474,31 @@ typedef struct { typedef struct { /* 0x000 */ u32 magic; -/* 0x004 */ GraphicsContext* graphics; +/* 0x004 */ GraphicsContext* gfxCtx; /* 0x008 */ Viewport viewport; -/* 0x018 */ f32 fov; -/* 0x01C */ f32 nearClippingPlane; -/* 0x020 */ f32 farClippingPlane; +/* 0x018 */ f32 fovy; +/* 0x01C */ f32 zNear; +/* 0x020 */ f32 zFar; /* 0x024 */ f32 scale; /* 0x028 */ Vec3f eye; /* 0x034 */ Vec3f focalPoint; /* 0x040 */ Vec3f upDir; /* 0x04C */ UNK_TYPE1 pad4C[0x4]; -/* 0x050 */ Vp gfxVp; -/* 0x060 */ RSPMatrix unk60; -/* 0x0A0 */ RSPMatrix unkA0; +/* 0x050 */ Vp vp; +/* 0x060 */ Mtx projection; +/* 0x0A0 */ Mtx viewing; /* 0x0E0 */ Mtx unkE0; -/* 0x120 */ Mtx* viewMatrix; -/* 0x124 */ Mtx* unk124; +/* 0x120 */ Mtx* projectionPtr; +/* 0x124 */ Mtx* viewingPtr; /* 0x128 */ Vec3f quakeRot; /* 0x134 */ Vec3f quakeScale; /* 0x140 */ f32 quakeSpeed; /* 0x144 */ Vec3f currQuakeRot; /* 0x150 */ Vec3f currQuakeScale; -/* 0x15C */ u16 perspNorm; +/* 0x15C */ u16 normal; /* 0x15E */ UNK_TYPE1 pad15E[0x2]; /* 0x160 */ u32 flags; // bit 3: Render to an orthographic perspective -/* 0x164 */ UNK_TYPE1 pad164[0x4]; +/* 0x164 */ UNK_TYPE4 unk164; } View; // size = 0x168 typedef void(*fault_update_input_func)(Input* input); diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index f960fbcca8..93a41c87dc 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -387,7 +387,7 @@ SECTIONS build/asm/code_0x8013A240.o(.text) build/asm/z_sub_s.o(.text) build/asm/code_0x8013EC10.o(.text) - build/asm/z_view.o(.text) + build/src/code/z_view.o(.text) build/asm/z_vimode.o(.text) build/asm/code_0x80140E80.o(.text) build/asm/z_vismono.o(.text) @@ -571,7 +571,7 @@ SECTIONS build/asm/code_rodata_0x80138BA0.o(.text) build/asm/code_rodata_z_sub_s.o(.text) build/asm/code_rodata_0x8013EC10.o(.text) - build/asm/code_rodata_z_view.o(.text) + build/src/code/z_view.o(.rodata) build/asm/code_rodata_z_vimode.o(.text) build/asm/code_rodata_0x80140E80.o(.text) build/asm/code_rodata_z_vr_box.o(.text) diff --git a/src/boot_O2_g3_trapuv/fault.c b/src/boot_O2_g3_trapuv/fault.c index 647861de0e..07f9782e95 100644 --- a/src/boot_O2_g3_trapuv/fault.c +++ b/src/boot_O2_g3_trapuv/fault.c @@ -896,7 +896,7 @@ void Fault_Start(void){ faultCtxt->faultActive = 0; faultContextStruct.faultHandlerEnabled = 1; osCreateMesgQueue(&faultCtxt->queue, faultCtxt->msg, 1); - StackCheck_Init(&faultStackEntry, (u32)faultStack, (u32)&faultStack[1536], 0, 0x100, faultThreadName); + StackCheck_Init(&faultStackEntry, faultStack, &faultStack[1536], 0, 0x100, faultThreadName); osCreateThread(&faultCtxt->thread, 2, (osCreateThread_func)Fault_ThreadEntry, 0, &faultStack[1536], 0x7f); osStartThread(&faultCtxt->thread); } diff --git a/src/code/z_view.c b/src/code/z_view.c new file mode 100644 index 0000000000..a41ea56f67 --- /dev/null +++ b/src/code/z_view.c @@ -0,0 +1,415 @@ +#include +#include + +void View_ViewportToVp(Vp* dest, Viewport* src) { + s32 width = src->rightX - src->leftX; + s32 height = src->bottomY - src->topY; + + dest->vp.vscale[0] = width * 2; + dest->vp.vscale[1] = height * 2; + dest->vp.vscale[2] = 0x01FF; + dest->vp.vscale[3] = 0; + dest->vp.vtrans[0] = ((src->leftX * 2) + width) * 2; + dest->vp.vtrans[1] = ((src->topY * 2) + height) * 2; + dest->vp.vtrans[2] = 0x01FF; + dest->vp.vtrans[3] = 0; + + if (src->leftX == 0 && src->rightX == 576 && src->topY == 0 && src->bottomY) {} +} + +void View_Init(View* view, GraphicsContext* gfxCtx) { + view->gfxCtx = gfxCtx; + view->viewport.topY = 0; + view->viewport.bottomY = 240; + view->viewport.leftX = 0; + view->viewport.rightX = 320; + view->magic = 0x56494557; // "VIEW" + + view->unk164 = 0; + view->flags = 1 | 2 | 4; + + if (1); + + view->scale = 1.0f; + view->upDir.y = 1.0f; + view->fovy = 60.0f; + view->eye.x = 0.0f; + view->eye.y = 0.0f; + view->focalPoint.x = 0.0f; + view->upDir.x = 0.0f; + view->upDir.z = 0.0f; + view->zNear = 10.0f; + view->zFar = 12800.0f; + view->eye.z = -1.0f; + + View_InitCameraQuake(view); +} + +void View_SetViewOrientation(View* view, Vec3f* eye, Vec3f* focalPoint, Vec3f* upDir) { + if (eye->x == focalPoint->x && eye->z == focalPoint->z) { + eye->z += 0.1f; + upDir->z = 0.0f; + upDir->x = 0.0f; + upDir->y = 1.0f; + } + + view->eye = *eye; + view->focalPoint = *focalPoint; + view->upDir = *upDir; + view->flags |= 1; +} + +void func_8013F050(View* view, Vec3f* eye, Vec3f* focalPoint, Vec3f* upDir) { + view->eye = *eye; + view->focalPoint = *focalPoint; + view->upDir = *upDir; +} + +void View_SetScale(View* view, f32 scale) { + view->flags |= 4; + view->scale = scale; +} + +void View_GetScale(View* view, f32* scale) { + *scale = view->scale; +} + +void func_8013F0D0(View* view, f32 fovy, f32 zNear, f32 zFar) { + view->fovy = fovy; + view->zNear = zNear; + view->zFar = zFar; + view->flags |= 4; +} + +void func_8013F100(View* view, f32* fovy, f32* zNear, f32* zFar) { + *fovy = view->fovy; + *zNear = view->zNear; + *zFar = view->zFar; +} + +void func_8013F120(View* view, f32 fovy, f32 zNear, f32 zFar) { + view->fovy = fovy; + view->zNear = zNear; + view->zFar = zFar; + view->flags |= 8; + view->scale = 1.0f; +} + +void func_8013F15C(View* view, f32* fovy, f32* zNear, f32* zFar) { + *fovy = view->fovy; + *zNear = view->zNear; + *zFar = view->zFar; +} + +void View_SetViewport(View* view, Viewport* viewport) { + view->viewport = *viewport; + view->flags |= 2; +} + +void View_GetViewport(View* view, Viewport* viewport) { + *viewport = view->viewport; +} + +void View_WriteScissor(Gfx** gfx, s32 ulx, s32 uly, s32 lrx, s32 lry) { + Gfx* gfxp = *gfx; + + gDPSetScissor(gfxp++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + + *gfx = gfxp; +} + +void View_SyncAndWriteScissor(View* view, Gfx** gfx) { + Gfx* gfxp = *gfx; + s32 ulx = view->viewport.leftX; + s32 uly = view->viewport.topY; + s32 lrx = view->viewport.rightX; + s32 lry = view->viewport.bottomY; + + gDPPipeSync(gfxp++); + View_WriteScissor(&gfxp, ulx, uly, lrx, lry); + + *gfx = gfxp; +} + +void View_SetScissorForLetterbox(View* view) { + s32 letterboxY; + s32 letterboxX; + s32 pad1; + s32 ulx; + s32 uly; + s32 lrx; + s32 lry; + s32 pad2; + GraphicsContext* gfxCtx; + + gfxCtx = view->gfxCtx; + + letterboxY = ShrinkWindow_GetLetterboxMagnitude(); + letterboxX = -1; // The following is optimized to varX = 0 but affects codegen + + if (letterboxX < 0) { + letterboxX = 0; + } + if (letterboxX > 160) { + letterboxX = 160; + } + + if (letterboxY < 0) { + letterboxY = 0; + } else if (letterboxY > 120) { + letterboxY = 120; + } + + ulx = view->viewport.leftX + letterboxX; + uly = view->viewport.topY + letterboxY; + lrx = view->viewport.rightX - letterboxX; + lry = view->viewport.bottomY - letterboxY; + + gDPPipeSync(gfxCtx->polyOpa.p++); + { + s32 pad3; + Gfx* polyOpa; + + polyOpa = gfxCtx->polyOpa.p; + View_WriteScissor(&polyOpa, ulx, uly, lrx, lry); + gfxCtx->polyOpa.p = polyOpa; + } + + gDPPipeSync(gfxCtx->polyXlu.p++); + { + Gfx* polyXlu; + s32 pad4; + + polyXlu = gfxCtx->polyXlu.p; + View_WriteScissor(&polyXlu, ulx, uly, lrx, lry); + gfxCtx->polyXlu.p = polyXlu; + } +} + +s32 View_SetQuakeRotation(View* view, f32 x, f32 y, f32 z) { + view->quakeRot.x = x; + view->quakeRot.y = y; + view->quakeRot.z = z; + return 1; +} + +s32 View_SetQuakeScale(View* view, f32 x, f32 y, f32 z) { + view->quakeScale.x = x; + view->quakeScale.y = y; + view->quakeScale.z = z; + return 1; +} + +s32 View_SetQuakeSpeed(View* view, f32 speed) { + view->quakeSpeed = speed; + return 1; +} + +s32 View_InitCameraQuake(View* view) { + view->quakeRot.x = 0.0f; + view->quakeRot.y = 0.0f; + view->quakeRot.z = 0.0f; + view->quakeScale.x = 1.0f; + view->quakeScale.y = 1.0f; + view->quakeScale.z = 1.0f; + view->currQuakeRot = view->quakeRot; + view->currQuakeScale = view->quakeScale; + view->quakeSpeed = 0.0f; + return 1; +} + +s32 View_ClearQuake(View* view) { + view->quakeRot.x = 0.0f; + view->quakeRot.y = 0.0f; + view->quakeRot.z = 0.0f; + view->quakeScale.x = 1.0f; + view->quakeScale.y = 1.0f; + view->quakeScale.z = 1.0f; + view->quakeSpeed = 1.0f; + return 1; +} + +s32 View_SetQuake(View* view, Vec3f rot, Vec3f scale, f32 speed) { + view->quakeRot = rot; + view->quakeScale = scale; + view->quakeSpeed = speed; + return 1; +} + +s32 View_StepQuake(View* view, RSPMatrix* matrix) { + z_Matrix mf; + + if (view->quakeSpeed == 0.0f) { + return 0; + } else if (view->quakeSpeed == 1.0f) { + view->currQuakeRot = view->quakeRot; + view->currQuakeScale = view->quakeScale; + view->quakeSpeed = 0.0f; + } else { + view->currQuakeRot.x += ((view->quakeRot.x - view->currQuakeRot.x) * view->quakeSpeed); + view->currQuakeRot.y += ((view->quakeRot.y - view->currQuakeRot.y) * view->quakeSpeed); + view->currQuakeRot.z += ((view->quakeRot.z - view->currQuakeRot.z) * view->quakeSpeed); + + view->currQuakeScale.x += ((view->quakeScale.x - view->currQuakeScale.x) * view->quakeSpeed); + view->currQuakeScale.y += ((view->quakeScale.y - view->currQuakeScale.y) * view->quakeSpeed); + view->currQuakeScale.z += ((view->quakeScale.z - view->currQuakeScale.z) * view->quakeSpeed); + } + + SysMatrix_FromRSPMatrix(matrix, &mf); + SysMatrix_SetCurrentState(&mf); + SysMatrix_RotateStateAroundXAxis(view->currQuakeRot.x); + SysMatrix_InsertYRotation_f(view->currQuakeRot.y, 1); + SysMatrix_InsertZRotation_f(view->currQuakeRot.z, 1); + SysMatrix_InsertScale(view->currQuakeScale.x, view->currQuakeScale.y, view->currQuakeScale.z, 1); + SysMatrix_InsertZRotation_f(-view->currQuakeRot.z, 1); + SysMatrix_InsertYRotation_f(-view->currQuakeRot.y, 1); + SysMatrix_RotateStateAroundXAxis(-view->currQuakeRot.x); + SysMatrix_GetStateAsRSPMatrix(matrix); + + return 1; +} + +void View_RenderView(View* view, s32 uParm2) { + uParm2 = (view->flags & uParm2) | uParm2 >> 4; + + if (uParm2 & 8) { + View_RenderToOrthographicMatrix(view); + } else { + View_RenderToPerspectiveMatrix(view); + } +} + +#ifdef NON_MATCHING +// saved register usage is wrong, stack, regalloc +s32 View_RenderToPerspectiveMatrix(View* view) { + f32 aspect; + s32 width; + s32 height; + Vp* vp; + Mtx* projection; + Mtx* viewing; + GraphicsContext* gfxCtx; + + gfxCtx = view->gfxCtx; + + { + Vp* _vp = (Vp*)gfxCtx->polyOpa.d - 1; + vp = _vp; + gfxCtx->polyOpa.d = (Gfx*)_vp; + } + View_ViewportToVp(vp, &view->viewport); + view->vp = *vp; + + View_SetScissorForLetterbox(view); + + gSPViewport(gfxCtx->polyOpa.p++, vp); + gSPViewport(gfxCtx->polyXlu.p++, vp); + + { + Mtx* _m = (Mtx*)gfxCtx->polyOpa.d - 1; + projection = _m; + gfxCtx->polyOpa.d = (Gfx*)_m; + } + view->projectionPtr = projection; + + width = view->viewport.rightX - view->viewport.leftX; + height = view->viewport.bottomY - view->viewport.topY; + aspect = (f32)width / (f32)height; + + guPerspective(projection, &view->normal, view->fovy, aspect, view->zNear, view->zFar, view->scale); + + view->projection = *projection; + + View_StepQuake(view, projection); + + gSPPerspNormalize(gfxCtx->polyOpa.p++, view->normal); + gSPMatrix(gfxCtx->polyOpa.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPPerspNormalize(gfxCtx->polyXlu.p++, view->normal); + gSPMatrix(gfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + + { + Mtx* _m = (Mtx*)gfxCtx->polyOpa.d - 1; + viewing = _m; + gfxCtx->polyOpa.d = (Gfx*)_m; + } + view->viewingPtr = viewing; + + if (view->eye.x == view->focalPoint.x && view->eye.y == view->focalPoint.y && view->eye.z == view->focalPoint.z) { + view->eye.z += 2.0f; + } + + guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->focalPoint.x, view->focalPoint.y, view->focalPoint.z, + view->upDir.x, view->upDir.y, view->upDir.z); + + view->viewing = *viewing; + + gSPMatrix(gfxCtx->polyOpa.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPMatrix(gfxCtx->polyXlu.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + + return 1; +} +#else +GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToPerspectiveMatrix.asm") +#endif + +#ifdef NON_MATCHING +// this needs a momumental amount of work +s32 View_RenderToOrthographicMatrix(View* view) { + Vp* vp; + Mtx* projection; + GraphicsContext* gfxCtx; + + gfxCtx = view->gfxCtx; + + { + Vp* _vp = (Vp*)gfxCtx->polyOpa.d - 1; + vp = _vp; + gfxCtx->polyOpa.d = (Gfx*)_vp; + } + View_ViewportToVp(vp, &view->viewport); + view->vp = *vp; + + View_SetScissorForLetterbox(view); + + gSPViewport(gfxCtx->polyOpa.p++, vp); + gSPViewport(gfxCtx->polyXlu.p++, vp); + gSPViewport(gfxCtx->overlay.p++, vp); + + { + Mtx* _m = (Mtx*)gfxCtx->polyOpa.d - 1; + projection = _m; + gfxCtx->polyOpa.d = (Gfx*)_m; + } + view->projectionPtr = projection; + + guOrtho(projection, -0.5f ,0.5f, screenWidth * -0.5f, screenWidth * 0.5f, + screenHeight * -0.5f, screenHeight * 0.5f, view->zNear); + + view->projection = *projection; + + gSPMatrix(gfxCtx->polyOpa.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); + + return 1; +} +#else +GLOBAL_ASM("asm/non_matchings/z_view/View_RenderToOrthographicMatrix.asm") +#endif + +GLOBAL_ASM("asm/non_matchings/z_view/func_8013FBC8.asm") + +GLOBAL_ASM("asm/non_matchings/z_view/func_8013FD74.asm") + +s32 func_80140024(View* view) { + guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, + view->focalPoint.x, view->focalPoint.y, view->focalPoint.z, + view->upDir.x, view->upDir.y, view->upDir.z); + + view->unkE0 = *view->viewingPtr; + view->viewingPtr = &view->unkE0; + + return 1; +} + +GLOBAL_ASM("asm/non_matchings/z_view/func_801400CC.asm") + diff --git a/tables/files_with_nonmatching.txt b/tables/files_with_nonmatching.txt index 79a7b2cfc0..83f5c93c58 100644 --- a/tables/files_with_nonmatching.txt +++ b/tables/files_with_nonmatching.txt @@ -17,3 +17,4 @@ z_room z_scene_proc z_std_dma z_scene +z_view diff --git a/tables/functions.txt b/tables/functions.txt index 223e04512a..a2f8889b1f 100644 --- a/tables/functions.txt +++ b/tables/functions.txt @@ -607,7 +607,7 @@ 0x800B1598:("func_800B1598","void","void"), 0x800B165C:("func_800B165C","void","void"), 0x800B16B8:("func_800B16B8","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6"), - 0x800B16F4:("EffectSS_SpawnSparkle","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_PTR param_5, UNK_PTR param_6, UNK_TYPE2 param_7, int param_8"), + 0x800B16F4:("EffectSS_SpawnSparkle","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE4* param_5, UNK_TYPE4* param_6, UNK_TYPE2 param_7, int param_8"), 0x800B1830:("func_800B1830","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7, UNK_TYPE4 param_8"), 0x800B1908:("EffectSS_SpawnBomb2","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4"), 0x800B1970:("func_800B1970","void","UNK_TYPE4 param_1, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6"), @@ -623,7 +623,7 @@ 0x800B1E0C:("EffectSS_SpawnDodongoFire","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10"), 0x800B1E94:("EffectSS_SpawnBubble","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE4 uParm3, UNK_TYPE4 uParm4, UNK_TYPE4 param_5, UNK_TYPE4 param_6"), 0x800B1EF4:("EffectSS_SpawnGRipple","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE2 uParm3, UNK_TYPE2 uParm4, UNK_TYPE2 param_5"), - 0x800B1F4C:("EffectSS_SpawnGSplash","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_PTR puParm3, UNK_PTR puParm4, UNK_TYPE1 uParm5, UNK_TYPE2 param_6"), + 0x800B1F4C:("EffectSS_SpawnGSplash","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, UNK_TYPE4* puParm3, UNK_TYPE4* puParm4, UNK_TYPE1 uParm5, UNK_TYPE2 param_6"), 0x800B1FE0:("EffectSS_SpawnGFire","void","UNK_TYPE4 uParm1, Vec3f* pzParm2"), 0x800B2018:("EffectSS_SpawnLightning","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, ColorRGBA8* pzParm3, ColorRGBA8* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8"), 0x800B2090:("func_800B2090","void","UNK_TYPE4 param_1, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8"), @@ -654,9 +654,9 @@ 0x800B2DF4:("EffectSS_SpawnEnemyFire","void","UNK_TYPE4 uParm1, Actor* pzParm2, Vec3f* pzParm3, UNK_TYPE2 uParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7"), 0x800B2E6C:("func_800B2E6C","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7"), 0x800B2F18:("EffectSS_SpawnExtra","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6"), - 0x800B2F80:("EffectSS_SpawnDeadDekuBaba","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_PTR param_5, UNK_PTR param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE4 param_9"), + 0x800B2F80:("EffectSS_SpawnDeadDekuBaba","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE1* param_5, UNK_TYPE1* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE4 param_9"), 0x800B3030:("func_800B3030","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE4 param_7"), - 0x800B3088:("EffectSS_SpawnDeadDodongo","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_PTR param_5, UNK_PTR param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10"), + 0x800B3088:("EffectSS_SpawnDeadDodongo","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE1* param_5, UNK_TYPE1* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10"), 0x800B3144:("EffectSS_SpawnDeadDekuScrub","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7, UNK_TYPE4 param_8"), 0x800B31BC:("func_800B31BC","void","UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE4 param_6"), 0x800B320C:("EffectSS_SpawnIceSmoke","void","UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5"), @@ -2724,36 +2724,36 @@ 0x8013EE24:("func_8013EE24","void","void"), 0x8013EE38:("func_8013EE38","void","void"), 0x8013EE48:("func_8013EE48","void","void"), - 0x8013EE60:("View_MapViewportToGfxVp","void","Vp* gfxVp, Viewport* viewport"), - 0x8013EEF4:("View_InitView","void","View* view, GraphicsContext* gCtxt"), + 0x8013EE60:("View_ViewportToVp","void","Vp* dest, Viewport* src"), + 0x8013EEF4:("View_Init","void","View* view, GraphicsContext* gCtxt"), 0x8013EF9C:("View_SetViewOrientation","void","View* view, Vec3f* eye, Vec3f* focalPoint, Vec3f* upDir"), - 0x8013F050:("func_8013F050","void","View* view, Vec3f* param_2, Vec3f* param_3, Vec3f* param_4"), - 0x8013F0A0:("func_8013F0A0","void","View* view, UNK_TYPE4 param_2"), - 0x8013F0C0:("func_8013F0C0","void","View* view, UNK_PTR param_2"), - 0x8013F0D0:("func_8013F0D0","void","View* view, f32 uParm2, f32 uParm3, f32 uParm4"), - 0x8013F100:("func_8013F100","void","View* view, UNK_PTR param_2, UNK_PTR param_3, UNK_PTR param_4"), - 0x8013F120:("func_8013F120","void","View* view, UNK_TYPE4 param_2, UNK_TYPE4 param_3, UNK_TYPE4 param_4"), - 0x8013F15C:("func_8013F15C","void","View* view, UNK_PTR param_2, UNK_PTR param_3, UNK_PTR param_4"), - 0x8013F17C:("func_8013F17C","void","View* view, Viewport* viewport"), + 0x8013F050:("func_8013F050","void","View* view, Vec3f* eye, Vec3f* focalPoint, Vec3f* upDir"), + 0x8013F0A0:("View_SetScale","void","View* view, f32 scale"), + 0x8013F0C0:("View_GetScale","void","View* view, f32* scale"), + 0x8013F0D0:("func_8013F0D0","void","View* view, f32 fovy, f32 zNear, f32 zFar"), + 0x8013F100:("func_8013F100","void","View* view, f32* fovy, f32* zNear, f32* zFar"), + 0x8013F120:("func_8013F120","void","View* view, f32 fovy, f32 zNear, f32 zFar"), + 0x8013F15C:("func_8013F15C","void","View* view, f32* fovy, f32* zNear, f32* zFar"), + 0x8013F17C:("View_SetViewport","void","View* view, Viewport* viewport"), 0x8013F1B0:("View_GetViewport","void","View* view, Viewport* viewport"), - 0x8013F1D8:("View_WriteScissor","void","Gfx** gfx, s32 leftX, s32 upperY, s32 rightX, s32 lowerY"), - 0x8013F28C:("View_WriteBlackFillColorAndScissor","void","View* view, Gfx** gfx"), + 0x8013F1D8:("View_WriteScissor","void","Gfx** gfx, s32 ulx, s32 uly, s32 lrx, s32 lry"), + 0x8013F28C:("View_SyncAndWriteScissor","void","View* view, Gfx** gfx"), 0x8013F2F8:("View_SetScissorForLetterbox","void","View* view"), 0x8013F3F8:("View_SetQuakeRotation","s32","View* view, f32 x, f32 y, f32 z"), 0x8013F420:("View_SetQuakeScale","s32","View* view, f32 x, f32 y, f32 z"), 0x8013F448:("View_SetQuakeSpeed","s32","View* view, f32 speed"), 0x8013F45C:("View_InitCameraQuake","s32","View* view"), 0x8013F4C0:("View_ClearQuake","s32","View* view"), - 0x8013F4F4:("View_SetQuake","s32","View* view, f32 rotX, f32 rotY, f32 rotZ, f32 scaleX, f32 scaleY, f32 scaleZ, f32 speed"), + 0x8013F4F4:("View_SetQuake","s32","View* view, Vec3f rot, Vec3f scale, f32 speed"), 0x8013F54C:("View_StepQuake","s32","View* view, RSPMatrix* matrix"), - 0x8013F6FC:("View_RenderView","void","View* view, u32 uParm2"), + 0x8013F6FC:("View_RenderView","void","View* view, s32 uParm2"), 0x8013F748:("View_RenderToPerspectiveMatrix","s32","View* view"), 0x8013FA1C:("View_RenderToOrthographicMatrix","s32","View* view"), 0x8013FBC8:("func_8013FBC8","s32","View* view"), 0x8013FD74:("func_8013FD74","s32","View* view"), 0x80140024:("func_80140024","s32","View* view"), - 0x801400CC:("func_801400CC","s32","View* view, Gfx** param_2"), - 0x80140260:("func_80140260","void","void"), + 0x801400CC:("func_801400CC","s32","View* view, Gfx** gfxp"), + 0x80140260:("func_80140260","void","OSViMode* vimode"), 0x8014026C:("func_8014026C","void","OSViMode* param_1, UNK_TYPE1 param_2, int param_3, int param_4, int param_5, int param_6, int param_7, int param_8, UNK_TYPE4 param_9, int param_10, short param_11, unsigned int param_12, UNK_TYPE4 param_13"), 0x80140730:("func_80140730","void","void"), 0x80140810:("func_80140810","void","void"),