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

[NES] separate color conversion logic for use in tools

This commit is contained in:
zeromus 2011-03-08 19:05:52 +00:00
parent 791f2bcc2f
commit fe51441596
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
View File

@ -132,6 +132,17 @@ namespace BizHawk.Emulation.Consoles.Nintendo
cpu.PendingCycles -= 512; cpu.PendingCycles -= 512;
} }
public int ConvertColor(int pixel)
{
int deemph = pixel >> 8;
int palentry = pixel & 0xFF;
int r = palette[palentry, 0];
int g = palette[palentry, 1];
int b = palette[palentry, 2];
Palettes.ApplyDeemphasis(ref r, ref g, ref b, deemph);
return (r << 16) | (g << 8) | b;
}
public byte ReadMemory(ushort addr) public byte ReadMemory(ushort addr)
{ {
if (addr < 0x0800) return ram[addr]; if (addr < 0x0800) return ram[addr];

8
BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
View File

@ -56,13 +56,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
for (int x = 0; x < 256; x++) for (int x = 0; x < 256; x++)
{ {
int pixel = emu.ppu.xbuf[i]; int pixel = emu.ppu.xbuf[i];
int deemph = pixel >> 8; pixels[i] = emu.ConvertColor(pixel);
int palentry = pixel & 0xFF;
int r = emu.palette[palentry, 0];
int g = emu.palette[palentry, 1];
int b = emu.palette[palentry, 2];
Palettes.ApplyDeemphasis(ref r, ref g, ref b, deemph);
pixels[i] = (r<<16)|(g<<8)|b;
i++; i++;
} }
return pixels; return pixels;