Emulation/not64
1
0
Fork 0
mirror of https://github.com/extremscorner/not64.git synced 2024-05-29 01:07:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed depth range issues.

Browse source
This commit is contained in:
Extrems 2020-05-18 17:30:39 -04:00
parent 0d0562ec3b
commit 1c519b2c0f
2 changed files with 24 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
glN64_GX/OpenGL.cpp
View file

@ -608,8 +608,12 @@ void OGL_UpdateViewport()
(int)(gSP.viewport.width * OGL.scaleX), (int)(gSP.viewport.height * OGL.scaleY) );
glDepthRange( 0.0f, 1.0f );//gSP.viewport.nearz, gSP.viewport.farz );
#else // !__GX__
GX_SetViewport((f32) (OGL.GXorigX + gSP.viewport.x * OGL.GXscaleX),(f32) (OGL.GXorigY + gSP.viewport.y * OGL.GXscaleY),
(f32) (gSP.viewport.width * OGL.GXscaleX),(f32) (gSP.viewport.height * OGL.GXscaleY), 0.0f, 1.0f);
if (OGL.GXpolyOffset)
GX_SetViewport((f32) (OGL.GXorigX + gSP.viewport.x * OGL.GXscaleX),(f32) (OGL.GXorigY + gSP.viewport.y * OGL.GXscaleY),
(f32) (gSP.viewport.width * OGL.GXscaleX),(f32) (gSP.viewport.height * OGL.GXscaleY), gSP.viewport.nearz, gSP.viewport.farz - GXpolyOffsetFactor);
else
GX_SetViewport((f32) (OGL.GXorigX + gSP.viewport.x * OGL.GXscaleX),(f32) (OGL.GXorigY + gSP.viewport.y * OGL.GXscaleY),
(f32) (gSP.viewport.width * OGL.GXscaleX),(f32) (gSP.viewport.height * OGL.GXscaleY), gSP.viewport.nearz, gSP.viewport.farz);
#endif // __GX__
}
@ -1160,39 +1164,11 @@ void OGL_DrawTriangles()
//Update MV & P Matrices
if(OGL.GXupdateMtx)
{
if(OGL.GXpolyOffset)
{
if(OGL.GXuseCombW)
{
CopyMatrix( OGL.GXprojTemp, OGL.GXcombW );
OGL.GXprojTemp[2][2] += GXpolyOffsetFactor;
GX_LoadProjectionMtx(OGL.GXprojTemp, GX_PERSPECTIVE);
}
else
{
CopyMatrix( OGL.GXprojTemp, OGL.GXprojIdent );
OGL.GXprojTemp[2][3] -= GXpolyOffsetFactor;
GX_LoadProjectionMtx(OGL.GXprojTemp, GX_ORTHOGRAPHIC);
}
}
OGL_UpdateViewport();
if(OGL.GXuseCombW)
GX_LoadProjectionMtx(OGL.GXcombW, GX_PERSPECTIVE);
else
{
//TODO: handle this case when !G_ZBUFFER
/* if(!(gSP.geometryMode & G_ZBUFFER))
{
CopyMatrix( OGL.GXprojTemp, OGL.GXproj );
OGL.GXprojTemp[2][2] = 0.0;
OGL.GXprojTemp[2][3] = -1.0;
if(OGL.GXprojTemp[3][2] == -1)
GX_LoadProjectionMtx(OGL.GXprojTemp, GX_PERSPECTIVE);
else
GX_LoadProjectionMtx(OGL.GXprojTemp, GX_ORTHOGRAPHIC);
}*/
if(OGL.GXuseCombW)
GX_LoadProjectionMtx(OGL.GXcombW, GX_PERSPECTIVE);
else
GX_LoadProjectionMtx(OGL.GXprojIdent, GX_ORTHOGRAPHIC);
}
GX_LoadProjectionMtx(OGL.GXprojIdent, GX_ORTHOGRAPHIC);
OGL.GXupdateMtx = false;
}
@ -1319,28 +1295,11 @@ void OGL_DrawLine( SPVertex *vertices, int v0, int v1, float width )
//Update MV & P Matrices
if(OGL.GXupdateMtx)
{
if(OGL.GXpolyOffset)
{
if(OGL.GXuseCombW)
{
CopyMatrix( OGL.GXprojTemp, OGL.GXcombW );
OGL.GXprojTemp[2][2] += GXpolyOffsetFactor;
GX_LoadProjectionMtx(OGL.GXprojTemp, GX_PERSPECTIVE);
}
else
{
CopyMatrix( OGL.GXprojTemp, OGL.GXprojIdent );
OGL.GXprojTemp[2][3] -= GXpolyOffsetFactor;
GX_LoadProjectionMtx(OGL.GXprojTemp, GX_ORTHOGRAPHIC);
}
}
OGL_UpdateViewport();
if(OGL.GXuseCombW)
GX_LoadProjectionMtx(OGL.GXcombW, GX_PERSPECTIVE);
else
{
if(OGL.GXuseCombW)
GX_LoadProjectionMtx(OGL.GXcombW, GX_PERSPECTIVE);
else
GX_LoadProjectionMtx(OGL.GXprojIdent, GX_ORTHOGRAPHIC);
}
GX_LoadProjectionMtx(OGL.GXprojIdent, GX_ORTHOGRAPHIC);
OGL.GXupdateMtx = false;
}
@ -1423,8 +1382,6 @@ void OGL_DrawRect( int ulx, int uly, int lrx, int lry, float *color )
GX_SetCullMode (GX_CULL_NONE);
Mtx44 GXprojection;
guOrtho(GXprojection, 0, VI.height, 0, VI.width, 1.0f, -1.0f);
if(OGL.GXpolyOffset)
GXprojection[2][3] -= GXpolyOffsetFactor;
GX_LoadProjectionMtx(GXprojection, GX_ORTHOGRAPHIC);
GX_LoadPosMtxImm(OGL.GXmodelViewIdent,GX_PNMTX0);
@ -1515,10 +1472,7 @@ void OGL_DrawTexturedRect( float ulx, float uly, float lrx, float lry, float uls
GX_SetCullMode (GX_CULL_NONE);
Mtx44 GXprojection;
guOrtho(GXprojection, 0, VI.height, 0, VI.width, 1.0f, -1.0f);
if(OGL.GXpolyOffset)
GXprojection[2][3] -= GXpolyOffsetFactor;
GX_LoadProjectionMtx(GXprojection, GX_ORTHOGRAPHIC);
GX_LoadPosMtxImm(OGL.GXmodelViewIdent,GX_PNMTX0);
GX_SetViewport((f32) OGL.GXorigX,(f32) OGL.GXorigY,(f32) OGL.GXwidth,(f32) OGL.GXheight, 0.0f, 1.0f);

17
glN64_GX/gSP.cpp
View file

@ -127,7 +127,8 @@ void gSPCombineMatrices()
if (OGL.GXprojTemp[2][3] != 0.0f)
{
OGL.GXcombW[2][3] = (1.0f / OGL.GXprojTemp[2][3]) * GXprojZScale;
OGL.GXcombW[2][3] = GXprojZScale / OGL.GXprojTemp[2][3];
OGL.GXcombW[2][2] = -GXprojZOffset + (OGL.GXcombW[2][3] * OGL.GXprojTemp[3][3]);
OGL.GXuseCombW = true;
OGL.GXupdateMtx = true;
}
@ -373,20 +374,20 @@ void gSPViewport( u32 v )
#ifndef _BIG_ENDIAN
gSP.viewport.vscale[0] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 2], 2 );
gSP.viewport.vscale[1] = _FIXED2FLOAT( *(s16*)&RDRAM[address ], 2 );
gSP.viewport.vscale[2] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 6], 10 );// * 0.00097847357f;
gSP.viewport.vscale[2] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 6], 10 ) + FIXED2FLOATRECIP10;
gSP.viewport.vscale[3] = *(s16*)&RDRAM[address + 4];
gSP.viewport.vtrans[0] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 10], 2 );
gSP.viewport.vtrans[1] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 8], 2 );
gSP.viewport.vtrans[2] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 14], 10 );// * 0.00097847357f;
gSP.viewport.vtrans[2] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 14], 10 ) + FIXED2FLOATRECIP10;
gSP.viewport.vtrans[3] = *(s16*)&RDRAM[address + 12];
#else // !_BIG_ENDIAN -> This is to correct for big endian
gSP.viewport.vscale[0] = _FIXED2FLOAT( *(s16*)&RDRAM[address ], 2 );
gSP.viewport.vscale[1] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 2], 2 );
gSP.viewport.vscale[2] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 4], 10 );// * 0.00097847357f;
gSP.viewport.vscale[2] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 4], 10 ) + FIXED2FLOATRECIP10;
gSP.viewport.vscale[3] = *(s16*)&RDRAM[address + 6];
gSP.viewport.vtrans[0] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 8], 2 );
gSP.viewport.vtrans[1] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 10], 2 );
gSP.viewport.vtrans[2] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 12], 10 );// * 0.00097847357f;
gSP.viewport.vtrans[2] = _FIXED2FLOAT( *(s16*)&RDRAM[address + 12], 10 ) + FIXED2FLOATRECIP10;
gSP.viewport.vtrans[3] = *(s16*)&RDRAM[address + 14];
#endif // _BIG_ENDIAN
@ -432,7 +433,8 @@ void gSPForceMatrix( u32 mptr )
if (OGL.GXprojTemp[2][3] != 0.0f)
{
OGL.GXcombW[2][3] = (1.0f / OGL.GXprojTemp[2][3]) * GXprojZScale;
OGL.GXcombW[2][3] = GXprojZScale / OGL.GXprojTemp[2][3];
OGL.GXcombW[2][2] = -GXprojZOffset + (OGL.GXcombW[2][3] * OGL.GXprojTemp[3][3]);
OGL.GXuseCombW = true;
OGL.GXupdateMtx = true;
}
@ -1232,7 +1234,8 @@ void gSPInsertMatrix( u32 where, u32 num )
if (OGL.GXprojTemp[2][3] != 0.0f)
{
OGL.GXcombW[2][3] = (1.0f / OGL.GXprojTemp[2][3]) * GXprojZScale;
OGL.GXcombW[2][3] = GXprojZScale / OGL.GXprojTemp[2][3];
OGL.GXcombW[2][2] = -GXprojZOffset + (OGL.GXcombW[2][3] * OGL.GXprojTemp[3][3]);
OGL.GXuseCombW = true;
OGL.GXupdateMtx = true;
}