diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2024-09-11 09:59:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-11 16:59:23 +0900 |
| commit | 5441559b30d4419eb25e77abc4ff2eb1f34027aa (patch) | |
| tree | 0ee031e4e2bba3ec1806b547d9df639cc6428a61 /src/code/z_debug_display.c | |
| parent | 2e79b83bb81b1fd65a12a2b2a018de27271611a0 (diff) | |
Cleanup gSPMatrix, rename `Matrix_New` -> `Matrix_Finalize`, add `MATRIX_FINALIZE_AND_LOAD` (#1983)
* clean up gSPMatrix usage
* add weird hybrid macro gSPMATRIX_SET_NEW
* Matrix_NewMtx, MATRIX_NEW -> Matrix_Finalize, MATRIX_FINALIZE
* gSPMATRIX_SET_NEW -> MATRIX_FINALIZE_AND_LOAD
* format
Diffstat (limited to 'src/code/z_debug_display.c')
| -rw-r--r-- | src/code/z_debug_display.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 41ac98f86..d6b6e0aab 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -81,8 +81,7 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, PlayStat gDPLoadTextureBlock(POLY_XLU_DISP++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPMatrix(POLY_XLU_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_debug_display.c", 189), - G_MTX_MODELVIEW | G_MTX_LOAD); + MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_debug_display.c", 189); gSPDisplayList(POLY_XLU_DISP++, gDebugSpriteDL); CLOSE_DISPS(play->state.gfxCtx, "../z_debug_display.c", 192); @@ -100,8 +99,7 @@ void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* dlist, PlayState* Matrix_SetTranslateRotateYXZ(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, &dispObj->rot); Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_debug_display.c", 228), - G_MTX_MODELVIEW | G_MTX_LOAD); + MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_debug_display.c", 228); gSPDisplayList(POLY_XLU_DISP++, dlist); CLOSE_DISPS(play->state.gfxCtx, "../z_debug_display.c", 231); |