diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-12-07 13:13:18 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 02:13:18 +0000 |
| commit | 6ae28a789ac6a5a3c4cac69f7ecabc82b0d150e5 (patch) | |
| tree | 1486e7009177d370c67ffb345fe1646c24c786ad /src/code/z_debug_display.c | |
| parent | 93d7fe080b09b54f953f5213f550235b2a593b8a (diff) | |
Macro Clean up (#454)
* Add OS macros
* MTXMODE cleanup
* format
* More matrix mode macros missed
Diffstat (limited to 'src/code/z_debug_display.c')
| -rw-r--r-- | src/code/z_debug_display.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 2fe6b7977..f9c9f60b4 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -68,10 +68,10 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, GlobalCo func_8012C6FC(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); - Matrix_InsertTranslation(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, 0); - Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, 1); - Matrix_InsertMatrix(&globalCtx->mf_187FC, 1); - Matrix_InsertRotation(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, 1); + Matrix_InsertTranslation(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_InsertMatrix(&globalCtx->mf_187FC, MTXMODE_APPLY); + Matrix_InsertRotation(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); 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); @@ -95,7 +95,7 @@ void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* arg1, GlobalContex gSPSetLights1(POLY_XLU_DISP++, sDebugDisplayLight1); Matrix_SetStateRotationAndTranslation(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, &dispObj->rot); - Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, 1); + Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, arg1); |