diff options
| author | fig02 <fig02srl@gmail.com> | 2020-10-29 17:31:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-29 17:31:09 -0400 |
| commit | 3c5fe66dcd45cd5cb100c02196021d8d13341991 (patch) | |
| tree | 8de26c4588a0d2e41661fb381a1d1796d6b9bd49 /src/code/z_debug_display.c | |
| parent | 92bb1fb21006189ced43ab28753a12adc9aa21fc (diff) | |
Use macros for oGfxCtx accesses (#465)
* fix colliderinit typo
* fix initchain
* reloc
* add defines
* add defines
* missed some on merge
* rename gfxCtx and add comment
* remove space
Diffstat (limited to 'src/code/z_debug_display.c')
| -rw-r--r-- | src/code/z_debug_display.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 571bb8240..e802e9b8e 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -74,19 +74,19 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalCont func_80094678(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); Matrix_Translate(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, MTXMODE_NEW); Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY); Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); Matrix_RotateRPY(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); - gDPLoadTextureBlock(oGfxCtx->polyXlu.p++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, + 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(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, &D_04004298); + gSPDisplayList(POLY_XLU_DISP++, &D_04004298); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 192); } @@ -96,16 +96,16 @@ void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext func_8009435C(globalCtx->state.gfxCtx); - gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); - gSPSetLights1(oGfxCtx->polyXlu.p++, sDebugObjectLights); + gSPSetLights1(POLY_XLU_DISP++, sDebugObjectLights); func_800D1694(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(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 228), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 228), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(oGfxCtx->polyXlu.p++, dlist); + gSPDisplayList(POLY_XLU_DISP++, dlist); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 231); } |