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

[NES] fix nt viewer

This commit is contained in:
zeromus 2011-06-06 18:19:24 +00:00
parent 542d54a9d2
commit 51dbef0fd2
3 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation/Consoles/Nintendo/NES/PPU.regs.cs
View File

@ -252,7 +252,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
}
};
class Reg_2000
public class Reg_2000
{
PPU ppu;
public Reg_2000(PPU ppu)
@ -299,7 +299,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
int NMI_PendingCycles;
byte PPUGenLatch;
public PPUREGS ppur;
Reg_2000 reg_2000;
public Reg_2000 reg_2000;
Reg_2001 reg_2001;
byte reg_2003;
byte[] OAM;

73
BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Drawing.Imaging;
using System.Linq;
using System.Text;
using System.Windows.Forms;
@ -28,36 +29,62 @@ namespace BizHawk.MultiClient
Global.Config.NESNameTableWndy = this.Location.Y;
}
public void UpdateValues()
public unsafe void UpdateValues()
{
int NTAddr;
int AttributeAddr;
if (!(Global.Emulator is NES)) return;
if (!this.IsHandleCreated || this.IsDisposed) return;
NES.PPU ppu = (Global.Emulator as NES).ppu;
for (int table = 0; table < 4; table++)
{
for (int y = 0; y < 30; y++)
{
for (int x = 0; x < 32; x++)
{
NTAddr = (y * 32) + x;
AttributeAddr = 0x3C0 + ((y >> 2) << 3) + (x >> 2);
BitmapData bmpdata = NameTableView.nametables.LockBits(new Rectangle(0, 0, 512, 480), ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
int* dptr = (int*)bmpdata.Scan0.ToPointer();
int pitch = bmpdata.Stride / 4;
int pt_add = ppu.reg_2000.bg_pattern_hi ? 0x1000 : 0;
//TODO - buffer all the data from the ppu, because it will be read multiple times and that is slow
for (int i = 0; i < 8; i++)
{
for (int j = 0; j < 8; j++)
{
int cvalue = Nes.LookupColor(Nes.ppu.PALRAM[5]);
int ytable = 0, yline=0;
for (int y = 0; y < 480; y++)
{
if (y == 240)
{
ytable += 2;
yline = 240;
}
for (int x = 0; x < 512; x++, dptr++)
{
int table = (x >> 8) + ytable;
int ntaddr = (table << 10);
int px = x & 255;
int py = y - yline;
int tx = px>>3;
int ty = py>>3;
int ntbyte_ptr = ntaddr + (ty * 32) + tx;
int atbyte_ptr = ntaddr + 0x3C0 + ((ty >> 2) << 3) + (tx >> 2);
int nt = ppu.ppubus_peek(ntbyte_ptr + 0x2000);
int at = ppu.ppubus_peek(atbyte_ptr + 0x2000);
if((ty&1)!=0) at >>= 4;
if((tx&1)!=0) at >>= 2;
at &= 0x03;
at <<= 2;
int bgpx = x & 7;
int bgpy = y & 7;
int pt_addr = (nt << 4) + bgpy + pt_add;
int pt_0 = ppu.ppubus_peek(pt_addr);
int pt_1 = ppu.ppubus_peek(pt_addr + 8);
int pixel = ((pt_0 >> (7 - bgpx)) & 1) | (((pt_1 >> (7 - bgpx)) & 1) << 1);
pixel |= at;
pixel = ppu.PALRAM[pixel];
int cvalue = Nes.LookupColor(pixel);
*dptr = cvalue;
}
dptr += pitch - 512;
}
NameTableView.nametables.UnlockBits(bmpdata);
Color color = Color.FromArgb(cvalue);
this.NameTableView.nametables.SetPixel((x * 8) + i, (y * 8) + j, color);
}
}
}
}
}
NameTableView.Refresh();
}

2
BizHawk.MultiClient/NEStools/NESPPU.cs
View File

@ -56,7 +56,7 @@ namespace BizHawk.MultiClient
private byte GetBit(int address, int bit)
{
byte value = Nes.ppu.ppubus_read(address);
byte value = Nes.ppu.ppubus_peek(address);
return (byte)(((value >> (7 - bit)) & 1));
}