File melonds_PR1820.patch of Package melonds

Overview Repositories Revisions Requests Users Attributes Meta

File melonds_PR1820.patch of Package melonds (Revision 95046758b3bb0ef51be2e3fffc9e0f11)

Currently displaying revision 95046758b3bb0ef51be2e3fffc9e0f11 , Show latest

From 70f72ec5eb43a1843479572989a44ebfbfd550cb Mon Sep 17 00:00:00 2001
From: Jaklyy <102590697+Jaklyy@users.noreply.github.com>
Date: Mon, 28 Aug 2023 10:29:37 -0400
Subject: [PATCH 1/2] fix regression with facing view

Only the check for a polygon being counter-clockwise is supposed to be <=
---
 src/GPU3D.cpp      | 5 ++++-
 src/GPU3D.h        | 1 +
 src/GPU3D_Soft.cpp | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp
index dcd5bd72a..82850590f 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -558,6 +558,7 @@ void DoSavestate(Savestate* file)
 
         file->Bool32(&poly->FacingView);
         file->Bool32(&poly->Translucent);
+        file->Bool32(&poly->CounterClockwise);
 
         file->Bool32(&poly->IsShadowMask);
         file->Bool32(&poly->IsShadow);
@@ -1067,7 +1068,8 @@ void SubmitPolygon()
 
     dot = ((s64)v1->Position[0] * normalX) + ((s64)v1->Position[1] * normalY) + ((s64)v1->Position[3] * normalZ);
 
-    bool facingview = (dot <= 0);
+    bool facingview = (dot < 0);
+    bool counterclockwise = (dot <= 0);
 
     if (facingview)
     {
@@ -1285,6 +1287,7 @@ void SubmitPolygon()
     poly->Type = 0;
 
     poly->FacingView = facingview;
+    poly->CounterClockwise = counterclockwise;
 
     u32 texfmt = (TexParam >> 26) & 0x7;
     u32 polyalpha = (CurPolygonAttr >> 16) & 0x1F;
diff --git a/src/GPU3D.h b/src/GPU3D.h
index 4a7bfdc6c..de6cd3f22 100644
--- a/src/GPU3D.h
+++ b/src/GPU3D.h
@@ -65,6 +65,7 @@ struct Polygon
 
     bool FacingView;
     bool Translucent;
+    bool CounterClockwise;
 
     bool IsShadowMask;
     bool IsShadow;
diff --git a/src/GPU3D_Soft.cpp b/src/GPU3D_Soft.cpp
index 98514ab7e..3624e73c0 100644
--- a/src/GPU3D_Soft.cpp
+++ b/src/GPU3D_Soft.cpp
@@ -577,7 +577,7 @@ void SoftRenderer::SetupPolygonLeftEdge(SoftRenderer::RendererPolygon* rp, s32 y
     {
         rp->CurVL = rp->NextVL;
 
-        if (polygon->FacingView)
+        if (polygon->CounterClockwise)
         {
             rp->NextVL = rp->CurVL + 1;
             if (rp->NextVL >= polygon->NumVertices)
@@ -604,7 +604,7 @@ void SoftRenderer::SetupPolygonRightEdge(SoftRenderer::RendererPolygon* rp, s32
     {
         rp->CurVR = rp->NextVR;
 
-        if (polygon->FacingView)
+        if (polygon->CounterClockwise)
         {
             rp->NextVR = rp->CurVR - 1;
             if ((s32)rp->NextVR < 0)
@@ -635,7 +635,7 @@ void SoftRenderer::SetupPolygon(SoftRenderer::RendererPolygon* rp, Polygon* poly
     rp->CurVL = vtop;
     rp->CurVR = vtop;
 
-    if (polygon->FacingView)
+    if (polygon->CounterClockwise)
     {
         rp->NextVL = rp->CurVL + 1;
         if (rp->NextVL >= nverts) rp->NextVL = 0;

From aa88230c9728cdc0082b98066f7c9c39d95b62c9 Mon Sep 17 00:00:00 2001
From: Jaklyy <102590697+Jaklyy@users.noreply.github.com>
Date: Mon, 28 Aug 2023 17:37:02 -0400
Subject: [PATCH 2/2] only use dot < 0 for 'cull front face' polygons

this is the fix.
---
 src/GPU3D.cpp      | 7 ++-----
 src/GPU3D.h        | 1 -
 src/GPU3D_Soft.cpp | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp
index 82850590f..784ee8be5 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -558,7 +558,6 @@ void DoSavestate(Savestate* file)
 
         file->Bool32(&poly->FacingView);
         file->Bool32(&poly->Translucent);
-        file->Bool32(&poly->CounterClockwise);
 
         file->Bool32(&poly->IsShadowMask);
         file->Bool32(&poly->IsShadow);
@@ -1068,10 +1067,9 @@ void SubmitPolygon()
 
     dot = ((s64)v1->Position[0] * normalX) + ((s64)v1->Position[1] * normalY) + ((s64)v1->Position[3] * normalZ);
 
-    bool facingview = (dot < 0);
-    bool counterclockwise = (dot <= 0);
+    bool facingview = (dot <= 0);
 
-    if (facingview)
+    if (dot < 0)
     {
         if (!(CurPolygonAttr & (1<<7)))
         {
@@ -1287,7 +1285,6 @@ void SubmitPolygon()
     poly->Type = 0;
 
     poly->FacingView = facingview;
-    poly->CounterClockwise = counterclockwise;
 
     u32 texfmt = (TexParam >> 26) & 0x7;
     u32 polyalpha = (CurPolygonAttr >> 16) & 0x1F;
diff --git a/src/GPU3D.h b/src/GPU3D.h
index de6cd3f22..4a7bfdc6c 100644
--- a/src/GPU3D.h
+++ b/src/GPU3D.h
@@ -65,7 +65,6 @@ struct Polygon
 
     bool FacingView;
     bool Translucent;
-    bool CounterClockwise;
 
     bool IsShadowMask;
     bool IsShadow;
diff --git a/src/GPU3D_Soft.cpp b/src/GPU3D_Soft.cpp
index 3624e73c0..98514ab7e 100644
--- a/src/GPU3D_Soft.cpp
+++ b/src/GPU3D_Soft.cpp
@@ -577,7 +577,7 @@ void SoftRenderer::SetupPolygonLeftEdge(SoftRenderer::RendererPolygon* rp, s32 y
     {
         rp->CurVL = rp->NextVL;
 
-        if (polygon->CounterClockwise)
+        if (polygon->FacingView)
         {
             rp->NextVL = rp->CurVL + 1;
             if (rp->NextVL >= polygon->NumVertices)
@@ -604,7 +604,7 @@ void SoftRenderer::SetupPolygonRightEdge(SoftRenderer::RendererPolygon* rp, s32
     {
         rp->CurVR = rp->NextVR;
 
-        if (polygon->CounterClockwise)
+        if (polygon->FacingView)
         {
             rp->NextVR = rp->CurVR - 1;
             if ((s32)rp->NextVR < 0)
@@ -635,7 +635,7 @@ void SoftRenderer::SetupPolygon(SoftRenderer::RendererPolygon* rp, Polygon* poly
     rp->CurVL = vtop;
     rp->CurVR = vtop;
 
-    if (polygon->CounterClockwise)
+    if (polygon->FacingView)
     {
         rp->NextVL = rp->CurVL + 1;
         if (rp->NextVL >= nverts) rp->NextVL = 0;

Places

File melonds_PR1820.patch of Package melonds (Revision 95046758b3bb0ef51be2e3fffc9e0f11)

Places