diff options
| author | AloXado320 <38191089+AloXado320@users.noreply.github.com> | 2024-08-25 21:15:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-25 20:15:09 -0600 |
| commit | bb3cbe0500197f894c83230a9a170a2cbe7aa3e8 (patch) | |
| tree | 6d588a1338aa97d4073f154ede07abb05192583b /src | |
| parent | e8ba89ddb634ecaeae8f8e0054afe88ad354e3d8 (diff) | |
Fix skybox and speedometer (#65)
* Update Torch and LUS
* Fix skybox and speedometer
Diffstat (limited to 'src')
| -rw-r--r-- | src/racing/skybox_and_splitscreen.c | 14 | ||||
| -rw-r--r-- | src/render_objects.c | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/racing/skybox_and_splitscreen.c b/src/racing/skybox_and_splitscreen.c index 0ed25a38b..55f8c8e00 100644 --- a/src/racing/skybox_and_splitscreen.c +++ b/src/racing/skybox_and_splitscreen.c @@ -426,7 +426,7 @@ void func_802A487C(Vtx *arg0, UNUSED struct UnkStruct_800DC5EC *arg1, UNUSED s32 guOrtho(&gGfxPool->mtxScreen, 0.0f, SCREEN_WIDTH, 0.0f, SCREEN_HEIGHT, 0.0f, 5.0f, 1.0f); gSPPerspNormalize(gDisplayListHead++, 0xFFFF); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxScreen), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPMatrix(gDisplayListHead++, D_0D008E98, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gDisplayListHead++, LOAD_ASSET(D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPVertex(gDisplayListHead++, &arg0[4], 4, 0); gSP2Triangles(gDisplayListHead++, 0, 3, 1, 0, 1, 3, 2, 0); } @@ -446,6 +446,16 @@ void func_802A4A0C(Vtx *vtx, struct UnkStruct_800DC5EC *arg1, UNUSED s32 arg2, U f32 sp58; func_802A450C(vtx); + // Widescreen skybox + vtx[0].v.ob[0] = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH); + vtx[1].v.ob[0] = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH); + vtx[2].v.ob[0] = -OTRGetRectDimensionFromLeftEdge(0); + vtx[3].v.ob[0] = -OTRGetRectDimensionFromLeftEdge(0); + vtx[4].v.ob[0] = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH); + vtx[5].v.ob[0] = OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH); + vtx[6].v.ob[0] = -OTRGetRectDimensionFromLeftEdge(0); + vtx[7].v.ob[0] = -OTRGetRectDimensionFromLeftEdge(0); + sp5C[0] = 0.0f; sp5C[1] = 0.0f; sp5C[2] = 30000.0f; @@ -478,7 +488,7 @@ void func_802A4A0C(Vtx *vtx, struct UnkStruct_800DC5EC *arg1, UNUSED s32 arg2, U guOrtho(&gGfxPool->mtxScreen, 0.0f, SCREEN_WIDTH, 0.0f, SCREEN_HEIGHT, 0.0f, 5.0f, 1.0f); gSPPerspNormalize(gDisplayListHead++, 0xFFFF); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxScreen), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPMatrix(gDisplayListHead++, D_0D008E98, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gDisplayListHead++, LOAD_ASSET(D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPVertex(gDisplayListHead++, &vtx[0], 4, 0); gSP2Triangles(gDisplayListHead++, 0, 3, 1, 0, 1, 3, 2, 0); if (gCurrentCourseId == COURSE_RAINBOW_ROAD) { diff --git a/src/render_objects.c b/src/render_objects.c index 9472de30e..14c5bfa8c 100644 --- a/src/render_objects.c +++ b/src/render_objects.c @@ -2349,7 +2349,7 @@ void func_8004EB38(s32 playerId) { } void func_8004ED40(s32 arg0) { - func_8004A2F4(playerHUD[arg0].speedometerX, playerHUD[arg0].speedometerY, 0U, 1.0f, D_8018D300, D_8018D308, D_8018D310, 0xFF, common_texture_speedometer, D_0D0064B0, 64, 96, 64, 48); + func_8004A2F4(playerHUD[arg0].speedometerX, playerHUD[arg0].speedometerY, 0U, 1.0f, D_8018D300, D_8018D308, D_8018D310, 0xFF, LOAD_ASSET(common_texture_speedometer), LOAD_ASSET(D_0D0064B0), 64, 96, 64, 48); func_8004A258(D_8018CFEC, D_8018CFF4, D_8016579E, 1.0f, common_texture_speedometer_needle, D_0D005FF0, 0x40, 0x20, 0x40, 0x20); } |