File melonds_PR1687.patch of Package melonds

Overview Repositories Revisions Requests Users Attributes Meta

File melonds_PR1687.patch of Package melonds (Revision 521eeb7f7c1f8b4262c537aee158cb4a)

Currently displaying revision 521eeb7f7c1f8b4262c537aee158cb4a , Show latest

From fb36f1873b105032dd718c857343930f6002d603 Mon Sep 17 00:00:00 2001
From: fleroviux <fleroviux@gmail.com>
Date: Thu, 25 May 2023 16:22:55 +0200
Subject: [PATCH 1/2] Make horizontal sprite mosaic (more) accurate

---
 src/GPU2D_Soft.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/GPU2D_Soft.cpp b/src/GPU2D_Soft.cpp
index 66095e179..5af55df42 100644
--- a/src/GPU2D_Soft.cpp
+++ b/src/GPU2D_Soft.cpp
@@ -1561,7 +1561,6 @@ void SoftRenderer::ApplySpriteMosaicX()
     if (CurUnit->OBJMosaicSize[0] == 0) return;
 
     u32* objLine = OBJLine[CurUnit->Num];
-    u8* objIndex = OBJIndex[CurUnit->Num];
 
     u8* curOBJXMosaicTable = MosaicTable[CurUnit->OBJMosaicSize[1]];
 
@@ -1569,14 +1568,10 @@ void SoftRenderer::ApplySpriteMosaicX()
 
     for (u32 i = 1; i < 256; i++)
     {
-        if (!(objLine[i] & 0x100000))
-        {
-            // not a mosaic'd sprite pixel
-            continue;
-        }
+        u32 currentcolor = objLine[i];
 
-        if ((objIndex[i] != objIndex[i-1]) || (curOBJXMosaicTable[i] == 0))
-            lastcolor = objLine[i];
+        if (!(lastcolor & currentcolor & 0x100000) || curOBJXMosaicTable[i] == 0)
+            lastcolor = currentcolor;
         else
             objLine[i] = lastcolor;
     }

From b399f024c7f35fda7b2a2b2278e2efd8eb89410b Mon Sep 17 00:00:00 2001
From: fleroviux <fleroviux@gmail.com>
Date: Thu, 25 May 2023 17:35:12 +0200
Subject: [PATCH 2/2] Vertical sprite mosaic should not extend the sprite's
 bounding area

---
 src/GPU2D_Soft.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GPU2D_Soft.cpp b/src/GPU2D_Soft.cpp
index 5af55df42..69378e7e0 100644
--- a/src/GPU2D_Soft.cpp
+++ b/src/GPU2D_Soft.cpp
@@ -1723,9 +1723,9 @@ void SoftRenderer::DrawSprites(u32 line, Unit* unit)
                 }
 
                 u32 ypos = attrib[0] & 0xFF;
-                ypos = (sprline - ypos) & 0xFF;
-                if (ypos >= (u32)boundheight)
+                if (((line - ypos) & 0xFF) >= (u32)boundheight)
                     continue;
+                ypos = (sprline - ypos) & 0xFF;
 
                 s32 xpos = (s32)(attrib[1] << 23) >> 23;
                 if (xpos <= -boundwidth)

Places

File melonds_PR1687.patch of Package melonds (Revision 521eeb7f7c1f8b4262c537aee158cb4a)

Places