diff --git a/source/level/layertile3d.cpp b/source/level/layertile3d.cpp index 2aba1d78f..0a0f28840 100644 --- a/source/level/layertile3d.cpp +++ b/source/level/layertile3d.cpp @@ -113,16 +113,15 @@ sVtx *P0,*P1,*P2; u32 T0,T1,T2; s32 ClipZ; sOT *ThisOT; -MATRIX &CamMtx=CGameScene::GetCamMtx(); +//MATRIX &CamMtx=CGameScene::GetCamMtx(); VECTOR BlkPos; -extern int RenderZ; - SetGeomScreen(RenderZ); - CamMtx.t[2]=RenderZ; - SetTransMatrix(&CamMtx); +//extern int RenderZ; +// CamMtx.t[2]=RenderZ; +// SetTransMatrix(&CamMtx); - SetIdentNoTrans(&CamMtx); - SetRotMatrix(&CamMtx); +// SetIdentNoTrans(&CamMtx); +// SetRotMatrix(&CamMtx); // Setup Trans Matrix BlkPos.vx=XOfs-(ShiftX); diff --git a/source/utils/utils.h b/source/utils/utils.h index 4b7c6bd7f..2a5142969 100644 --- a/source/utils/utils.h +++ b/source/utils/utils.h @@ -45,6 +45,25 @@ inline void SetIdent(MATRIX *Mtx) Mtx->t[0]=0; Mtx->t[1]=0; Mtx->t[2]=0; } + +/*****************************************************************************/ +inline void SetIdentTrans(MATRIX *Mtx,VECTOR *T) +{ + Mtx->m[0][0]=ONE; Mtx->m[0][1]=0; Mtx->m[0][2]=0; + Mtx->m[1][0]=0; Mtx->m[1][1]=ONE; Mtx->m[1][2]=0; + Mtx->m[2][0]=0; Mtx->m[2][1]=0; Mtx->m[2][2]=ONE; + Mtx->t[0]=T->vx; Mtx->t[1]=T->vy; Mtx->t[2]=T->vz; +} + +/*****************************************************************************/ +inline void SetIdentTrans(MATRIX *Mtx,s32 X,s32 Y,s32 Z) +{ + Mtx->m[0][0]=ONE; Mtx->m[0][1]=0; Mtx->m[0][2]=0; + Mtx->m[1][0]=0; Mtx->m[1][1]=ONE; Mtx->m[1][2]=0; + Mtx->m[2][0]=0; Mtx->m[2][1]=0; Mtx->m[2][2]=ONE; + Mtx->t[0]=X; Mtx->t[1]=Y; Mtx->t[2]=Z; +} + /*****************************************************************************/ inline void SetIdentNoTrans(MATRIX *Mtx) {