1
0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00

Fix S2DEX_Obj_MoveMem: move viewport added.

This commit is contained in:
Sergey Lipskiy 2014-10-20 18:54:51 +07:00
parent 1952e1b882
commit adca07aabe
2 changed files with 15 additions and 4 deletions

View File

@ -30,10 +30,17 @@ void S2DEX_Obj_Sprite( u32 w0, u32 w1 )
void S2DEX_Obj_MoveMem( u32 w0, u32 w1 )
{
if (_SHIFTR( w0, 0, 16 ) == 0)
gSPObjMatrix( w1 );
else
gSPObjSubMatrix( w1 );
switch (_SHIFTR( w0, 0, 16 )) {
case S2DEX_MV_MATRIX:
gSPObjMatrix( w1 );
break;
case S2DEX_MV_SUBMUTRIX:
gSPObjSubMatrix( w1 );
break;
case S2DEX_MV_VIEWPORT:
gSPViewport( w1 );
break;
}
}
void S2DEX_Select_DL( u32 w0, u32 w1 )

View File

@ -202,6 +202,10 @@ void S2DEX_Obj_LdTx_Rect( u32 w0, u32 w1 );
void S2DEX_Obj_LdTx_Rect_R( u32 w0, u32 w1 );
void S2DEX_Init();
#define S2DEX_MV_MATRIX 0
#define S2DEX_MV_SUBMUTRIX 2
#define S2DEX_MV_VIEWPORT 8
#define S2DEX_BG_1CYC 0x01
#define S2DEX_BG_COPY 0x02
#define S2DEX_OBJ_RECTANGLE 0x03