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

fix toon highlight mode. GBAtek is wrong.

Browse Source
This commit is contained in:
StapleButter 2017-06-28 09:19:38 +02:00
parent f113f2f26e
commit 5f6e8cc30b
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/GPU3D_Soft.cpp
View File

@ -709,11 +709,26 @@ u32 RenderPixel(Polygon* polygon, u8 vr, u8 vg, u8 vb, s16 s, s16 t)
if (blendmode == 2) if (blendmode == 2)
{ {
u16 tooncolor = RenderToonTable[vr >> 1]; if (RenderDispCnt & (1<<1))
{
// highlight mode: color is calculated normally
// except all vertex color components are set
// to the red component
// the toon color is added to the final color
vr = (tooncolor << 1) & 0x3E; if (vr) vr++; vg = vr;
vg = (tooncolor >> 4) & 0x3E; if (vg) vg++; vb = vr;
vb = (tooncolor >> 9) & 0x3E; if (vb) vb++; }
else
{
// toon mode: vertex color is replaced by toon color
u16 tooncolor = RenderToonTable[vr >> 1];
vr = (tooncolor << 1) & 0x3E; if (vr) vr++;
vg = (tooncolor >> 4) & 0x3E; if (vg) vg++;
vb = (tooncolor >> 9) & 0x3E; if (vb) vb++;
}
} }
if ((RenderDispCnt & (1<<0)) && (((polygon->TexParam >> 26) & 0x7) != 0)) if ((RenderDispCnt & (1<<0)) && (((polygon->TexParam >> 26) & 0x7) != 0))
@ -771,6 +786,12 @@ u32 RenderPixel(Polygon* polygon, u8 vr, u8 vg, u8 vb, s16 s, s16 t)
if ((blendmode == 2) && (RenderDispCnt & (1<<1))) if ((blendmode == 2) && (RenderDispCnt & (1<<1)))
{ {
u16 tooncolor = RenderToonTable[vr >> 1];
vr = (tooncolor << 1) & 0x3E; if (vr) vr++;
vg = (tooncolor >> 4) & 0x3E; if (vg) vg++;
vb = (tooncolor >> 9) & 0x3E; if (vb) vb++;
r += vr; r += vr;
g += vg; g += vg;
b += vb; b += vb;