piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 06:10:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

uuuh we should only do it once per scanline

Browse Source
This commit is contained in:
Arisotura
2019-09-15 02:08:47 +02:00
parent e418b353e8
commit 58c2790ea3
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/GPU2D.cpp
View File

@ -1465,6 +1465,8 @@ void GPU2D::DrawScanline_BGOBJ(u32 line)
else else
memset(WindowMask, 0xFF, 256); memset(WindowMask, 0xFF, 256);
ApplySpriteMosaicX();
switch (DispCnt & 0x7) switch (DispCnt & 0x7)
{ {
case 0: DrawScanlineBGMode<0>(line); break; case 0: DrawScanlineBGMode<0>(line); break;
@ -2236,30 +2238,32 @@ void GPU2D::DrawBG_Large(u32 line) // BG is always BG2
BGYRefInternal[0] += rotD; BGYRefInternal[0] += rotD;
} }
void GPU2D::InterleaveSprites(u32 prio) void GPU2D::ApplySpriteMosaicX()
{ {
// apply X mosaic if needed // apply X mosaic if needed
// X mosaic for sprites is applied after all sprites are rendered // X mosaic for sprites is applied after all sprites are rendered
if (OBJMosaicSize[0] > 0) if (OBJMosaicSize[0] == 0) return;
u32 lastcolor = OBJLine[0];
for (u32 i = 1; i < 256; i++)
{ {
u32 lastcolor = OBJLine[0]; if (!(OBJLine[i] & 0x100000))
for (u32 i = 1; i < 256; i++)
{ {
if (!(OBJLine[i] & 0x100000)) // not a mosaic'd sprite pixel
{ continue;
// not a mosaic'd sprite pixel
continue;
}
if ((!(OBJLine[i-1] & 0x100000)) || (CurOBJXMosaicTable[i] == 0))
lastcolor = OBJLine[i];
else
OBJLine[i] = lastcolor;
} }
}
if ((!(OBJLine[i-1] & 0x100000)) || (CurOBJXMosaicTable[i] == 0))
lastcolor = OBJLine[i];
else
OBJLine[i] = lastcolor;
}
}
void GPU2D::InterleaveSprites(u32 prio)
{
u16* pal = (u16*)&GPU::Palette[Num ? 0x600 : 0x200]; u16* pal = (u16*)&GPU::Palette[Num ? 0x600 : 0x200];
if (DispCnt & 0x80000000) if (DispCnt & 0x80000000)

1
src/GPU2D.h
View File

@ -154,6 +154,7 @@ private:
template<bool mosaic> void DrawBG_Extended(u32 line, u32 bgnum); template<bool mosaic> void DrawBG_Extended(u32 line, u32 bgnum);
template<bool mosaic> void DrawBG_Large(u32 line); template<bool mosaic> void DrawBG_Large(u32 line);
void ApplySpriteMosaicX();
void InterleaveSprites(u32 prio); void InterleaveSprites(u32 prio);
template<bool window> void DrawSprite_Rotscale(u16* attrib, u16* rotparams, u32 boundwidth, u32 boundheight, u32 width, u32 height, s32 xpos, s32 ypos); template<bool window> void DrawSprite_Rotscale(u16* attrib, u16* rotparams, u32 boundwidth, u32 boundheight, u32 width, u32 height, s32 xpos, s32 ypos);
template<bool window> void DrawSprite_Normal(u16* attrib, u32 width, s32 xpos, s32 ypos); template<bool window> void DrawSprite_Normal(u16* attrib, u32 width, s32 xpos, s32 ypos);