piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 05:17:40 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "improve line polygon check"

Browse Source 
This reverts commit 3405ef165f2dd7ec940a0b23743a639f23852966.
This commit is contained in:
Jaklyy 2023-09-10 12:19:43 -04:00
parent 7ba7422ff8
commit ea4293f40b
2 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/GPU3D.cpp
View File

@ -869,47 +869,12 @@ int ClipPolygon(GPU3D& gpu, Vertex* vertices, int nverts, int clipstart)
return nverts;
}
template<bool ogl>
bool ClipCoordsEqual(Vertex a, Vertex b)
bool ClipCoordsEqual(Vertex* a, Vertex* b)
{
if constexpr (ogl)
return a.Position[0] == b.Position[0] &&
a.Position[1] == b.Position[1] &&
a.Position[2] == b.Position[2] &&
a.Position[3] == b.Position[3];
else
return a.FinalPosition[0] == b.FinalPosition[0] &&
a.FinalPosition[1] == b.FinalPosition[1];
}
template<bool ogl>
bool LineCheck(Vertex* vertices, int nverts)
{
// todo: check for more lines (perfectly vertical, horizontal or diagonal) for opengl renderer?
if (nverts == 3)
{
if (ClipCoordsEqual<ogl>(vertices[0], vertices[1]) ||
ClipCoordsEqual<ogl>(vertices[0], vertices[2]) ||
ClipCoordsEqual<ogl>(vertices[1], vertices[2]))
{
return true;
}
}
else if (nverts == 4)
{
int vertsequal = 0;
for (int a = 0; a < 3; a++)
for (int b = a+1; b < 4; b++)
if (ClipCoordsEqual<ogl>(vertices[a], vertices[b]))
{
vertsequal++;
if (vertsequal == 2)
return true;
}
}
return false;
return a->Position[0] == b->Position[0] &&
a->Position[1] == b->Position[1] &&
a->Position[2] == b->Position[2] &&
a->Position[3] == b->Position[3];
}
void GPU3D::SubmitPolygon() noexcept
@ -1027,7 +992,21 @@ void GPU3D::SubmitPolygon() noexcept
clippedvertices[i] = TempVertexBuffer[i];
// detect lines, for the OpenGL renderer
int polytype = (GPU3D::CurrentRenderer->Accelerated) ? LineCheck<true>(clippedvertices, nverts) : 0;
int polytype = 0;
if (nverts == 3)
{
if (ClipCoordsEqual(&clippedvertices[0], &clippedvertices[1]) ||
ClipCoordsEqual(&clippedvertices[0], &clippedvertices[2]) ||
ClipCoordsEqual(&clippedvertices[1], &clippedvertices[2]))
{
polytype = 1;
}
}
else if (nverts == 4)
{
// TODO
}
// clipping
@ -1174,6 +1153,8 @@ void GPU3D::SubmitPolygon() noexcept
if (!poly->Translucent) NumOpaquePolygons++;
poly->Type = polytype;
if (LastStripPolygon && clipstart > 0)
{
if (nverts == lastpolyverts)
@ -1294,12 +1275,6 @@ void GPU3D::SubmitPolygon() noexcept
poly->FinalZ[i] = z;
poly->FinalW[i] = w;
}
// check for line polygons for the software renderer
// checkme: can a line polygon have more than 4 or less than 3 vertices?
polytype = (!GPU3D::CurrentRenderer->Accelerated) ? LineCheck<false>(*poly->Vertices, nverts) : polytype;
poly->Type = polytype;
if (PolygonMode >= 2)
LastStripPolygon = poly;

4
src/GPU3D_Soft.cpp
View File

@ -786,7 +786,7 @@ void SoftRenderer::RenderShadowMaskScanline(RendererPolygon* rp, s32 y)
{
l_filledge = ((rp->SlopeL.Negative || !rp->SlopeL.XMajor)
|| (y == polygon->YBottom-1) && rp->SlopeL.XMajor && (vlnext->FinalPosition[0] != vrnext->FinalPosition[0]))
|| polygon->Type;
|| (rp->SlopeL.Increment == rp->SlopeR.Increment) && (xstart+l_edgelen == xend+1);
r_filledge = (!rp->SlopeR.Negative && rp->SlopeR.XMajor) || (rp->SlopeR.Increment==0)
|| (y == polygon->YBottom-1) && rp->SlopeR.XMajor && (vlnext->FinalPosition[0] != vrnext->FinalPosition[0]);
}
@ -1028,7 +1028,7 @@ void SoftRenderer::RenderPolygonScanline(RendererPolygon* rp, s32 y)
{
l_filledge = ((rp->SlopeL.Negative || !rp->SlopeL.XMajor)
|| (y == polygon->YBottom-1) && rp->SlopeL.XMajor && (vlnext->FinalPosition[0] != vrnext->FinalPosition[0]))
|| polygon->Type;
|| (rp->SlopeL.Increment == rp->SlopeR.Increment) && (xstart+l_edgelen == xend+1);
r_filledge = (!rp->SlopeR.Negative && rp->SlopeR.XMajor) || (rp->SlopeR.Increment==0)
|| (y == polygon->YBottom-1) && rp->SlopeR.XMajor && (vlnext->FinalPosition[0] != vrnext->FinalPosition[0]);
}