diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-10-23 11:51:00 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-22 17:51:00 -0700 |
| commit | ec9b5839ade6b9ab5b9aa51260865ea7b894b496 (patch) | |
| tree | 604896076ead17ff59a48b4bafed00f705b3924b /docs/tutorial/draw_functions.md | |
| parent | 694d3b396558a4d9faa3f9d91354ab484d6affa9 (diff) | |
Cleanup gSPMatrix, rename `Matrix_New` -> `Matrix_Finalize`, add MATRIX_FINALIZE_AND_LOAD (#1729)
* mtx-finalize
* cleanup gSPMatrix
Diffstat (limited to 'docs/tutorial/draw_functions.md')
| -rw-r--r-- | docs/tutorial/draw_functions.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/tutorial/draw_functions.md b/docs/tutorial/draw_functions.md index e551907d3..34bd26a39 100644 --- a/docs/tutorial/draw_functions.md +++ b/docs/tutorial/draw_functions.md @@ -222,7 +222,7 @@ void ObjTree_Draw(Actor* thisx, PlayState* play) { temp_s0->polyOpa.p = temp_v0 + 8; temp_v0->words.w0 = 0xDA380003; sp28 = temp_v0; - sp28->words.w1 = Matrix_NewMtx(play->state.gfxCtx); + sp28->words.w1 = Matrix_Finalize(play->state.gfxCtx); temp_v0_2 = temp_s0->polyOpa.p; temp_s0->polyOpa.p = temp_v0_2 + 8; temp_v0_2->words.w1 = (u32) &D_06000680; @@ -232,7 +232,7 @@ void ObjTree_Draw(Actor* thisx, PlayState* play) { temp_s0->polyOpa.p = temp_v0_3 + 8; temp_v0_3->words.w0 = 0xDA380003; sp20 = temp_v0_3; - sp20->words.w1 = Matrix_NewMtx(play->state.gfxCtx); + sp20->words.w1 = Matrix_Finalize(play->state.gfxCtx); temp_v0_4 = temp_s0->polyOpa.p; temp_s0->polyOpa.p = temp_v0_4 + 8; temp_v0_4->words.w1 = (u32) &D_060007C8; @@ -247,7 +247,7 @@ We can see there are four blocks here, although only two different macros: temp_s0->polyOpa.p = temp_v0 + 8; temp_v0->words.w0 = 0xDA380003; sp28 = temp_v0; - sp28->words.w1 = Matrix_NewMtx(play->state.gfxCtx); + sp28->words.w1 = Matrix_Finalize(play->state.gfxCtx); ``` gfxdis gives @@ -260,7 +260,7 @@ gSPMatrix(POLY_OPA_DISP++, 0x12345678, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVI so it becomes ```C -gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); +MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx); ``` ```C @@ -286,7 +286,7 @@ gSPDisplayList(POLY_OPA_DISP++, D_06000680); temp_s0->polyOpa.p = temp_v0_3 + 8; temp_v0_3->words.w0 = 0xDA380003; sp20 = temp_v0_3; - sp20->words.w1 = Matrix_NewMtx(play->state.gfxCtx); + sp20->words.w1 = Matrix_Finalize(play->state.gfxCtx); ``` This is the same as the first one. Indeed, it's identical. @@ -310,11 +310,11 @@ void ObjTree_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx); Gfx_SetupDL25_Opa(play->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, D_06000680); Matrix_RotateZYX(sp36, 0, sp34, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, D_060007C8); CLOSE_DISPS(play->state.gfxCtx); |