ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2D: implement enough of mode6 to fix #65 -- shows 3D layer. large BG still needs to be done.

This commit is contained in:
StapleButter 2017-06-28 17:01:20 +02:00
parent 5f6e8cc30b
commit 209a639461
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/GPU2D.cpp
View File

@ -920,6 +920,36 @@ void GPU2D::DrawScanlineBGMode(u32 line, u32* spritebuf, u32* dst)
} }
} }
void GPU2D::DrawScanlineBGMode6(u32 line, u32* spritebuf, u32* dst)
{
if (Num)
{
printf("GPU2D: MODE6 ON SUB GPU???\n");
return;
}
for (int i = 3; i >= 0; i--)
{
if ((BGCnt[2] & 0x3) == i)
{
if (DispCnt & 0x0400)
{
printf("GPU2D: MODE6 LARGE BG TODO\n");
}
}
if ((BGCnt[0] & 0x3) == i)
{
if (DispCnt & 0x0100)
{
if (DispCnt & 0x8)
DrawBG_3D(line, dst);
}
}
if (DispCnt & 0x1000)
InterleaveSprites(spritebuf, 0x8000 | (i<<16), dst);
}
}
void GPU2D::DrawScanline_Mode1(u32 line, u32* dst) void GPU2D::DrawScanline_Mode1(u32 line, u32* dst)
{ {
u32 linebuf[256*2 + 64]; u32 linebuf[256*2 + 64];
@ -950,6 +980,7 @@ void GPU2D::DrawScanline_Mode1(u32 line, u32* dst)
memset(spritebuf, 0, 256*4); memset(spritebuf, 0, 256*4);
if (DispCnt & 0x1000) DrawSprites(line, spritebuf); if (DispCnt & 0x1000) DrawSprites(line, spritebuf);
// TODO: what happens in mode 7? mode 6 on the sub engine?
switch (DispCnt & 0x7) switch (DispCnt & 0x7)
{ {
case 0: DrawScanlineBGMode<0>(line, spritebuf, linebuf); break; case 0: DrawScanlineBGMode<0>(line, spritebuf, linebuf); break;
@ -958,6 +989,7 @@ void GPU2D::DrawScanline_Mode1(u32 line, u32* dst)
case 3: DrawScanlineBGMode<3>(line, spritebuf, linebuf); break; case 3: DrawScanlineBGMode<3>(line, spritebuf, linebuf); break;
case 4: DrawScanlineBGMode<4>(line, spritebuf, linebuf); break; case 4: DrawScanlineBGMode<4>(line, spritebuf, linebuf); break;
case 5: DrawScanlineBGMode<5>(line, spritebuf, linebuf); break; case 5: DrawScanlineBGMode<5>(line, spritebuf, linebuf); break;
case 6: DrawScanlineBGMode6(line, spritebuf, linebuf); break;
} }
// color special effects // color special effects

1
src/GPU2D.h
View File

@ -105,6 +105,7 @@ private:
u32 OBJExtPalStatus; u32 OBJExtPalStatus;
template<u32 bgmode> void DrawScanlineBGMode(u32 line, u32* spritebuf, u32* dst); template<u32 bgmode> void DrawScanlineBGMode(u32 line, u32* spritebuf, u32* dst);
void DrawScanlineBGMode6(u32 line, u32* spritebuf, u32* dst);
void DrawScanline_Mode1(u32 line, u32* dst); void DrawScanline_Mode1(u32 line, u32* dst);
void DrawPixel(u32* dst, u16 color, u32 flag); void DrawPixel(u32* dst, u16 color, u32 flag);