Basic implementation of player 0 graphics
This commit is contained in:
parent
5493904312
commit
8a73d50e0b
|
@ -11,8 +11,12 @@ namespace BizHawk.Emulation.Consoles.Atari
|
|||
{
|
||||
MOS6502 Cpu;
|
||||
UInt32 PF; // PlayField data
|
||||
byte background;
|
||||
UInt32 BKcolor, PFcolor;
|
||||
byte BKcolor, PFcolor, P0color;
|
||||
byte grp0;
|
||||
byte resetP0 = 0;
|
||||
bool PFpriority = false;
|
||||
bool P0Reflect = false;
|
||||
|
||||
int[] frameBuffer;
|
||||
public bool frameComplete;
|
||||
|
||||
|
@ -20,42 +24,39 @@ namespace BizHawk.Emulation.Consoles.Atari
|
|||
uint[] scanline = new uint[160];
|
||||
int scanlinePos;
|
||||
|
||||
int drawClocksStart;
|
||||
int drawLastUpdate;
|
||||
|
||||
UInt32[] palette = new UInt32[]{
|
||||
0x000000, 0, 0x4a4a4a, 0, 0x6f6f6f, 0, 0x8e8e8e, 0,
|
||||
0xaaaaaa, 0, 0xc0c0c0, 0, 0xd6d6d6, 0, 0xececec, 0,
|
||||
0x484800, 0, 0x69690f, 0, 0x86861d, 0, 0xa2a22a, 0,
|
||||
0xbbbb35, 0, 0xd2d240, 0, 0xe8e84a, 0, 0xfcfc54, 0,
|
||||
0x7c2c00, 0, 0x904811, 0, 0xa26221, 0, 0xb47a30, 0,
|
||||
0xc3903d, 0, 0xd2a44a, 0, 0xdfb755, 0, 0xecc860, 0,
|
||||
0x901c00, 0, 0xa33915, 0, 0xb55328, 0, 0xc66c3a, 0,
|
||||
0xd5824a, 0, 0xe39759, 0, 0xf0aa67, 0, 0xfcbc74, 0,
|
||||
0x940000, 0, 0xa71a1a, 0, 0xb83232, 0, 0xc84848, 0,
|
||||
0xd65c5c, 0, 0xe46f6f, 0, 0xf08080, 0, 0xfc9090, 0,
|
||||
0x840064, 0, 0x97197a, 0, 0xa8308f, 0, 0xb846a2, 0,
|
||||
0xc659b3, 0, 0xd46cc3, 0, 0xe07cd2, 0, 0xec8ce0, 0,
|
||||
0x500084, 0, 0x68199a, 0, 0x7d30ad, 0, 0x9246c0, 0,
|
||||
0xa459d0, 0, 0xb56ce0, 0, 0xc57cee, 0, 0xd48cfc, 0,
|
||||
0x140090, 0, 0x331aa3, 0, 0x4e32b5, 0, 0x6848c6, 0,
|
||||
0x7f5cd5, 0, 0x956fe3, 0, 0xa980f0, 0, 0xbc90fc, 0,
|
||||
0x000094, 0, 0x181aa7, 0, 0x2d32b8, 0, 0x4248c8, 0,
|
||||
0x545cd6, 0, 0x656fe4, 0, 0x7580f0, 0, 0x8490fc, 0,
|
||||
0x001c88, 0, 0x183b9d, 0, 0x2d57b0, 0, 0x4272c2, 0,
|
||||
0x548ad2, 0, 0x65a0e1, 0, 0x75b5ef, 0, 0x84c8fc, 0,
|
||||
0x003064, 0, 0x185080, 0, 0x2d6d98, 0, 0x4288b0, 0,
|
||||
0x54a0c5, 0, 0x65b7d9, 0, 0x75cceb, 0, 0x84e0fc, 0,
|
||||
0x004030, 0, 0x18624e, 0, 0x2d8169, 0, 0x429e82, 0,
|
||||
0x54b899, 0, 0x65d1ae, 0, 0x75e7c2, 0, 0x84fcd4, 0,
|
||||
0x004400, 0, 0x1a661a, 0, 0x328432, 0, 0x48a048, 0,
|
||||
0x5cba5c, 0, 0x6fd26f, 0, 0x80e880, 0, 0x90fc90, 0,
|
||||
0x143c00, 0, 0x355f18, 0, 0x527e2d, 0, 0x6e9c42, 0,
|
||||
0x87b754, 0, 0x9ed065, 0, 0xb4e775, 0, 0xc8fc84, 0,
|
||||
0x303800, 0, 0x505916, 0, 0x6d762b, 0, 0x88923e, 0,
|
||||
0xa0ab4f, 0, 0xb7c25f, 0, 0xccd86e, 0, 0xe0ec7c, 0,
|
||||
0x482c00, 0, 0x694d14, 0, 0x866a26, 0, 0xa28638, 0,
|
||||
0xbb9f47, 0, 0xd2b656, 0, 0xe8cc63, 0, 0xfce070, 0
|
||||
UInt32[] palette = new UInt32[]{
|
||||
0x000000, 0, 0x4a4a4a, 0, 0x6f6f6f, 0, 0x8e8e8e, 0,
|
||||
0xaaaaaa, 0, 0xc0c0c0, 0, 0xd6d6d6, 0, 0xececec, 0,
|
||||
0x484800, 0, 0x69690f, 0, 0x86861d, 0, 0xa2a22a, 0,
|
||||
0xbbbb35, 0, 0xd2d240, 0, 0xe8e84a, 0, 0xfcfc54, 0,
|
||||
0x7c2c00, 0, 0x904811, 0, 0xa26221, 0, 0xb47a30, 0,
|
||||
0xc3903d, 0, 0xd2a44a, 0, 0xdfb755, 0, 0xecc860, 0,
|
||||
0x901c00, 0, 0xa33915, 0, 0xb55328, 0, 0xc66c3a, 0,
|
||||
0xd5824a, 0, 0xe39759, 0, 0xf0aa67, 0, 0xfcbc74, 0,
|
||||
0x940000, 0, 0xa71a1a, 0, 0xb83232, 0, 0xc84848, 0,
|
||||
0xd65c5c, 0, 0xe46f6f, 0, 0xf08080, 0, 0xfc9090, 0,
|
||||
0x840064, 0, 0x97197a, 0, 0xa8308f, 0, 0xb846a2, 0,
|
||||
0xc659b3, 0, 0xd46cc3, 0, 0xe07cd2, 0, 0xec8ce0, 0,
|
||||
0x500084, 0, 0x68199a, 0, 0x7d30ad, 0, 0x9246c0, 0,
|
||||
0xa459d0, 0, 0xb56ce0, 0, 0xc57cee, 0, 0xd48cfc, 0,
|
||||
0x140090, 0, 0x331aa3, 0, 0x4e32b5, 0, 0x6848c6, 0,
|
||||
0x7f5cd5, 0, 0x956fe3, 0, 0xa980f0, 0, 0xbc90fc, 0,
|
||||
0x000094, 0, 0x181aa7, 0, 0x2d32b8, 0, 0x4248c8, 0,
|
||||
0x545cd6, 0, 0x656fe4, 0, 0x7580f0, 0, 0x8490fc, 0,
|
||||
0x001c88, 0, 0x183b9d, 0, 0x2d57b0, 0, 0x4272c2, 0,
|
||||
0x548ad2, 0, 0x65a0e1, 0, 0x75b5ef, 0, 0x84c8fc, 0,
|
||||
0x003064, 0, 0x185080, 0, 0x2d6d98, 0, 0x4288b0, 0,
|
||||
0x54a0c5, 0, 0x65b7d9, 0, 0x75cceb, 0, 0x84e0fc, 0,
|
||||
0x004030, 0, 0x18624e, 0, 0x2d8169, 0, 0x429e82, 0,
|
||||
0x54b899, 0, 0x65d1ae, 0, 0x75e7c2, 0, 0x84fcd4, 0,
|
||||
0x004400, 0, 0x1a661a, 0, 0x328432, 0, 0x48a048, 0,
|
||||
0x5cba5c, 0, 0x6fd26f, 0, 0x80e880, 0, 0x90fc90, 0,
|
||||
0x143c00, 0, 0x355f18, 0, 0x527e2d, 0, 0x6e9c42, 0,
|
||||
0x87b754, 0, 0x9ed065, 0, 0xb4e775, 0, 0xc8fc84, 0,
|
||||
0x303800, 0, 0x505916, 0, 0x6d762b, 0, 0x88923e, 0,
|
||||
0xa0ab4f, 0, 0xb7c25f, 0, 0xccd86e, 0, 0xe0ec7c, 0,
|
||||
0x482c00, 0, 0x694d14, 0, 0x866a26, 0, 0xa28638, 0,
|
||||
0xbb9f47, 0, 0xd2b656, 0, 0xe8cc63, 0, 0xfce070, 0
|
||||
};
|
||||
|
||||
public TIA(MOS6502 cpu, int[] frameBuffer)
|
||||
|
@ -94,14 +95,32 @@ namespace BizHawk.Emulation.Consoles.Atari
|
|||
}
|
||||
|
||||
UInt32 color;
|
||||
color = palette[BKcolor];
|
||||
|
||||
if ((PF & PFmask) != 0)
|
||||
{
|
||||
color = palette[PFcolor];
|
||||
}
|
||||
else
|
||||
|
||||
// Player 1
|
||||
if (pixelPos >= resetP0 && pixelPos < (resetP0 + 8))
|
||||
{
|
||||
color = palette[BKcolor];
|
||||
byte mask = (byte)(0x80 >> (pixelPos - resetP0));
|
||||
if (P0Reflect)
|
||||
{
|
||||
mask = reverseBits(mask);
|
||||
}
|
||||
if ((grp0 & mask) != 0)
|
||||
{
|
||||
color = palette[P0color];
|
||||
}
|
||||
}
|
||||
|
||||
if ((PF & PFmask) != 0 && PFpriority == true)
|
||||
{
|
||||
color = palette[PFcolor];
|
||||
}
|
||||
|
||||
scanline[pixelPos] = color;
|
||||
|
||||
scanlinePos++;
|
||||
|
@ -120,7 +139,7 @@ namespace BizHawk.Emulation.Consoles.Atari
|
|||
{
|
||||
for (int col = 0; col < 320; col++)
|
||||
{
|
||||
if (scanlinesBuffer.Count != null && scanlinesBuffer.Count > row)
|
||||
if (scanlinesBuffer.Count > row)
|
||||
{
|
||||
frameBuffer[row * 320 + col] = (int)(scanlinesBuffer[row][col / 2]);
|
||||
}
|
||||
|
@ -181,6 +200,40 @@ namespace BizHawk.Emulation.Consoles.Atari
|
|||
execute(1);
|
||||
}
|
||||
}
|
||||
else if (maskedAddr == 0x06) // COLUP0
|
||||
{
|
||||
P0color = value;
|
||||
}
|
||||
else if (maskedAddr == 0x08) // COLUPF
|
||||
{
|
||||
PFcolor = value;
|
||||
}
|
||||
else if (maskedAddr == 0x09) // COLUBK
|
||||
{
|
||||
BKcolor = value;
|
||||
}
|
||||
else if (maskedAddr == 0x0A) // CTRLPF
|
||||
{
|
||||
if ((value & 0x04) != 0)
|
||||
{
|
||||
PFpriority = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
PFpriority = false;
|
||||
}
|
||||
}
|
||||
else if (maskedAddr == 0x0B) // REFP0
|
||||
{
|
||||
if ((value & 0x04) != 0)
|
||||
{
|
||||
P0Reflect = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
P0Reflect = false;
|
||||
}
|
||||
}
|
||||
else if (maskedAddr == 0x0D) // PF0
|
||||
{
|
||||
PF = (UInt32)((PF & 0x0FFFF) + ((reverseBits(value) & 0x0F) << 16));
|
||||
|
@ -193,15 +246,14 @@ namespace BizHawk.Emulation.Consoles.Atari
|
|||
{
|
||||
PF = (UInt32)((PF & 0xFFF00) + reverseBits(value));
|
||||
}
|
||||
else if (maskedAddr == 0x08) // COLUPF
|
||||
else if (maskedAddr == 0x10) // RESP0
|
||||
{
|
||||
PFcolor = (UInt32)(value);
|
||||
resetP0 = (byte)(scanlinePos - 68);
|
||||
}
|
||||
else if (maskedAddr == 0x09) // COLUBK
|
||||
else if (maskedAddr == 0x1B) // GRP0
|
||||
{
|
||||
BKcolor = (UInt32)(value);
|
||||
grp0 = value;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public byte reverseBits(byte value)
|
||||
|
|
Loading…
Reference in New Issue