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

O2Hawk: More display work

This commit is contained in:
alyosha-tas 2019-12-16 11:50:00 -05:00
parent 0fcb6cbaa7
commit 89c87b0581
8 changed files with 101 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/gamedb/gamedb_Odyssey2.txt
View File

@ -1,4 +1,6 @@
SHA1:26A044C68FF08F574F6649B731B82CACA8C0E797 Death Race O2 SHA1:26A044C68FF08F574F6649B731B82CACA8C0E797 Death Race O2
SHA1:E04D12B6290370B76F90E76D9DE75B6470B4F913 redgreen O2 SHA1:E04D12B6290370B76F90E76D9DE75B6470B4F913 redgreen O2
SHA1:38D4AAB263E10B1DAC3410C120536EE079826BCB Fatso 2 O2
SHA1:3720DD6B5EE3DC62C5AF2EA9D915A2B83DE9463D Chief Chef O2

3
BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
View File

@ -99,6 +99,7 @@ namespace BizHawk.Emulation.Common.Components.I8048
IRQS = 5; IRQS = 5;
instr_pntr = irq_pntr = 0; instr_pntr = irq_pntr = 0;
Regs[PX + 1] = 0xFF;
} }
// Memory Access // Memory Access
@ -238,7 +239,7 @@ namespace BizHawk.Emulation.Common.Components.I8048
F1 = !F1; F1 = !F1;
break; break;
case DA: case DA:
DA_Func(cur_instr[instr_pntr++]); DA_Func(A);
break; break;
case AND8: case AND8:
AND8_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]); AND8_Func(cur_instr[instr_pntr++], cur_instr[instr_pntr++]);

6
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/MemoryMap.cs
View File

@ -24,7 +24,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
} }
else else
{ {
return mapper.ReadMemory((ushort)(addr - 0x400)); return mapper.ReadMemory((ushort)((addr - 0x400) | rom_bank));
} }
} }
@ -162,6 +162,10 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
cart_b1 = value.Bit(1); cart_b1 = value.Bit(1);
cart_b0 = value.Bit(0); cart_b0 = value.Bit(0);
rom_bank = (ushort)(cart_b0 ? 1 : 0);
rom_bank |= (ushort)(cart_b1 ? 2 : 0);
rom_bank = (ushort)(rom_bank << 11);
//Console.WriteLine("main ctrl: " + value + " " + ppu_en + " " + RAM_en + " " + cpu.TotalExecutedCycles); //Console.WriteLine("main ctrl: " + value + " " + ppu_en + " " + RAM_en + " " + cpu.TotalExecutedCycles);
} }
else else

4
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IEmulator.cs
View File

@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
public bool FrameAdvance(IController controller, bool render, bool rendersound) public bool FrameAdvance(IController controller, bool render, bool rendersound)
{ {
//Console.WriteLine("-----------------------FRAME-----------------------"); // Console.WriteLine("-----------------------FRAME-----------------------");
if (_tracer.Enabled) if (_tracer.Enabled)
{ {
@ -197,7 +197,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
} }
} }
public int VirtualWidth => 213; public int VirtualWidth => 372;
public int VirtualHeight => 240; public int VirtualHeight => 240;
public int BufferWidth => 186; public int BufferWidth => 186;
public int BufferHeight => 240; public int BufferHeight => 240;

12
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.ISettable.cs
View File

@ -33,11 +33,21 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
return ret; return ret;
} }
private O2Settings _settings = new O2Settings(); public O2Settings _settings = new O2Settings();
public O2SyncSettings _syncSettings = new O2SyncSettings(); public O2SyncSettings _syncSettings = new O2SyncSettings();
public class O2Settings public class O2Settings
{ {
[DisplayName("Display Characters")]
[Description("When true, displays character.")]
[DefaultValue(true)]
public bool Show_Chars { get; set; }
[DisplayName("Display Sprites")]
[Description("When true, displays sprites.")]
[DefaultValue(true)]
public bool Show_Sprites { get; set; }
public O2Settings Clone() public O2Settings Clone()
{ {
return (O2Settings)MemberwiseClone(); return (O2Settings)MemberwiseClone();

1
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.IStatable.cs
View File

@ -72,6 +72,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
ser.Sync(nameof(lum_en), ref lum_en); ser.Sync(nameof(lum_en), ref lum_en);
ser.Sync(nameof(copy_en), ref copy_en); ser.Sync(nameof(copy_en), ref copy_en);
ser.Sync(nameof(kybrd_en), ref kybrd_en); ser.Sync(nameof(kybrd_en), ref kybrd_en);
ser.Sync(nameof(rom_bank), ref rom_bank);
// memory domains // memory domains
ser.Sync(nameof(RAM), ref RAM, false); ser.Sync(nameof(RAM), ref RAM, false);

3
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/O2Hawk.cs
View File

@ -25,6 +25,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
public byte addr_latch; public byte addr_latch;
public byte kb_byte; public byte kb_byte;
public bool ppu_en, RAM_en, kybrd_en, copy_en, lum_en, cart_b0, cart_b1; public bool ppu_en, RAM_en, kybrd_en, copy_en, lum_en, cart_b0, cart_b1;
public ushort rom_bank;
public const bool P15 = true; public const bool P15 = true;
public byte[] _bios; public byte[] _bios;
@ -133,6 +134,8 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
RAM_Bank = 1; // RAM bank always starts as 1 (even writing zero still sets 1) RAM_Bank = 1; // RAM bank always starts as 1 (even writing zero still sets 1)
WritePort(1, 0xFF);
ppu.Reset(); ppu.Reset();
serialport.Reset(); serialport.Reset();

139
BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/PPU.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Common.NumberExtensions; using BizHawk.Common.NumberExtensions;
using BizHawk.Common.BufferExtensions;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
@ -20,31 +19,13 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
public byte VDC_ctrl, VDC_status, VDC_collision, VDC_color; public byte VDC_ctrl, VDC_status, VDC_collision, VDC_color;
public byte Frame_Col, Pixel_Stat; public byte Frame_Col, Pixel_Stat;
public uint[] BG_palette = new uint[32];
public uint[] OBJ_palette = new uint[32];
public bool HDMA_active;
// register variables // register variables
public byte LCDC;
public byte STAT;
public byte scroll_y;
public byte scroll_x;
public int LY; public int LY;
public byte LY_actual; public byte LY_actual;
public byte LY_inc; public byte LY_inc;
public byte LYC; public byte LYC;
public byte DMA_addr;
public byte BGP;
public byte obj_pal_0;
public byte obj_pal_1;
public byte window_y;
public byte window_x;
public bool DMA_start;
public int DMA_clock;
public int DMA_inc;
public byte DMA_byte;
public int cycle; public int cycle;
public bool VBL; public bool VBL;
public bool HBL; public bool HBL;
@ -120,6 +101,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
else if (addr < 0x80) else if (addr < 0x80)
{ {
Quad_Chars[addr - 0x40] = value; Quad_Chars[addr - 0x40] = value;
//Quad_Chars[0x0E] = 0x7;
} }
else if (addr < 0xA0) else if (addr < 0xA0)
{ {
@ -182,72 +164,120 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
if (LY < 240) if (LY < 240)
{ {
// sprites // sprites
for (int i = 0; i < 4; i++) for (int i = 3; i >= 0; i--)
{ {
if ((LY >= Sprites[i * 4]) && (LY < (Sprites[i * 4] + 8))) int double_size = Sprites[i * 4 + 2].Bit(2) ? 4 : 2;
if ((LY >= Sprites[i * 4]) && (LY < (Sprites[i * 4] + 8 * double_size)))
{ {
if (((cycle - 43) >= Sprites[i * 4 + 1]) && ((cycle - 43) < (Sprites[i * 4 + 1] + 8))) if (((cycle - 43) >= Sprites[i * 4 + 1]) && ((cycle - 43) < (Sprites[i * 4 + 1] + 8 * (double_size / 2))))
{ {
// character is in drawing region, pick a pixel // character is in drawing region, pick a pixel
int offset_y = LY - Sprites[i * 4]; int offset_y = (LY - Sprites[i * 4]) >> (double_size / 2);
int offset_x = ((cycle - 43) - Sprites[i * 4 + 1]); int offset_x = ((cycle - 43) - Sprites[i * 4 + 1]) >> (double_size / 2 - 1);
int pixel_pick = (Sprite_Shapes[i * 8 + offset_y] >> offset_x) & 1; int pixel_pick = (Sprite_Shapes[i * 8 + offset_y] >> offset_x) & 1;
if (pixel_pick == 1) if (pixel_pick == 1)
{ {
Core._vidbuffer[LY * 186 + (cycle - 43)] = (int) Color_Palette_SPR[(Sprites[i * 4 + 2] >> 3) & 0x7]; if (Core._settings.Show_Sprites)
{
Core._vidbuffer[LY * 186 + (cycle - 43)] = (int) Color_Palette_SPR[(Sprites[i * 4 + 2] >> 3) & 0x7];
}
Pixel_Stat |= (byte)(i << 1); Pixel_Stat |= (byte)(i << 1);
} }
} }
} }
} }
// single characters // single characters
for (int i = 0; i < 12; i++) for (int i = 0; i < 12; i++)
{ {
if ((LY >= Foreground[i * 4]) && (LY < (Foreground[i * 4] + 8))) if ((LY >= Foreground[i * 4]) && (LY < (Foreground[i * 4] + 8 * 2)))
{ {
if (((cycle - 43) >= Foreground[i * 4 + 1]) && ((cycle - 43) < (Foreground[i * 4 + 1] + 8))) if (((cycle - 43) >= Foreground[i * 4 + 1]) && ((cycle - 43) < (Foreground[i * 4 + 1] + 8)))
{ {
// sprite is in drawing region, pick a pixel // sprite is in drawing region, pick a pixel
int offset_y = LY - Foreground[i * 4]; int offset_y = (LY - Foreground[i * 4]) >> 1;
int offset_x = 7 - ((cycle - 43) - Foreground[i * 4 + 1]); int offset_x = 7 - ((cycle - 43) - Foreground[i * 4 + 1]);
int char_sel = Foreground[i * 4 + 2] + ((Foreground[i * 4 + 3] & 1) << 8); int char_sel = Foreground[i * 4 + 2];
int pixel_pick = (Internal_Graphics[(char_sel + offset_y) % 0x200] >> offset_x) & 1; int char_pick = (char_sel - (((~(Foreground[i * 4] >> 1)) + 1) & 0xFF));
if (char_pick < 0)
{
char_pick &= 0xFF;
char_pick = char_pick >> 1;
char_pick |= (Foreground[i * 4 + 3] & 1) << 7;
char_pick = char_pick << 1;
}
else
{
char_pick &= 0xFF;
char_pick = char_pick >> 1;
char_pick |= (~(Foreground[i * 4 + 3] & 1)) << 7;
char_pick &= 0xFF;
char_pick = char_pick << 1;
}
int pixel_pick = (Internal_Graphics[(char_pick + offset_y) % 0x200] >> offset_x) & 1;
if (pixel_pick == 1) if (pixel_pick == 1)
{ {
Core._vidbuffer[LY * 186 + (cycle - 43)] = (int)Color_Palette_SPR[(Foreground[i * 4 + 3] >> 1) & 0x7]; if (Core._settings.Show_Chars)
{
Core._vidbuffer[LY * 186 + (cycle - 43)] = (int) Color_Palette_SPR[(Foreground[i * 4 + 3] >> 1) & 0x7];
}
Pixel_Stat |= 0x80; Pixel_Stat |= 0x80;
} }
} }
} }
} }
// quads // quads
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
if ((LY >= Quad_Chars[i * 16 + 12]) && (LY < (Quad_Chars[i * 16 + 12] + 8))) if ((LY >= Quad_Chars[i * 16]) && (LY < (Quad_Chars[i * 16] + 8 * 2)))
{ {
if (((cycle - 43) >= Quad_Chars[i * 16 + 12 + 1]) && ((cycle - 43) < (Quad_Chars[i * 16 + 12 + 1] + 64))) if (((cycle - 43) >= Quad_Chars[i * 16 + 1]) && ((cycle - 43) < (Quad_Chars[i * 16 + 1] + 64)))
{ {
// sprite is in drawing region, pick a pixel // sprite is in drawing region, pick a pixel
int offset_y = LY - Quad_Chars[i * 16 + 12]; int offset_y = (LY - Quad_Chars[i * 16]) >> 1;
int offset_x = 63 - ((cycle - 43) - Quad_Chars[i * 16 + 12 + 1]); int offset_x = 63 - ((cycle - 43) - Quad_Chars[i * 16 + 1]);
int quad_num = 0; int quad_num = 3;
while (offset_x > 15) while (offset_x > 15)
{ {
offset_x -= 16; offset_x -= 16;
quad_num++; quad_num--;
} }
if (offset_x <= 7) if (offset_x > 7)
{ {
int char_sel = Quad_Chars[i * 16 + 4 * quad_num + 2] + ((Quad_Chars[i * 16 + 4 * quad_num + 3] & 1) << 8); offset_x -= 8;
int char_sel = Quad_Chars[i * 16 + 4 * quad_num + 2];
int pixel_pick = (Internal_Graphics[(char_sel + offset_y) % 0x200] >> offset_x) & 1; int char_pick = (char_sel - (((~(Quad_Chars[i * 16] >> 1)) + 1) & 0xFF));
if (char_pick < 0)
{
char_pick &= 0xFF;
char_pick = char_pick >> 1;
char_pick |= (Quad_Chars[i * 16 + 4 * quad_num + 3] & 1) << 7;
char_pick = char_pick << 1;
}
else
{
char_pick &= 0xFF;
char_pick = char_pick >> 1;
char_pick |= (~(Quad_Chars[i * 16 + 4 * quad_num + 3] & 1)) << 7;
char_pick &= 0xFF;
char_pick = char_pick << 1;
}
int pixel_pick = (Internal_Graphics[(char_pick + offset_y) % 0x200] >> offset_x) & 1;
if (pixel_pick == 1) if (pixel_pick == 1)
{ {
@ -332,12 +362,12 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
AudioReset(); AudioReset();
} }
public static readonly byte[] Internal_Graphics = { 0x3C, 0x66, 0x66, 0x66, 0x66, 0x66, 0x3C, 00, // 0 0x00 public static readonly byte[] Internal_Graphics = { 0x7C, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 00, // 0 0x00
0x18, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3C, 00, // 1 0x01 0x18, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3C, 00, // 1 0x01
0x3C, 0x66, 0x0C, 0x18, 0x30, 0x60, 0x7E, 00, // 2 0x02 0x3C, 0x66, 0x0C, 0x18, 0x30, 0x60, 0x7E, 00, // 2 0x02
0x3C, 0x66, 0x06, 0x1C, 0x06, 0x66, 0x3C, 00, // 3 0x03 0x3C, 0x66, 0x06, 0x1C, 0x06, 0x66, 0x3C, 00, // 3 0x03
0xCC, 0xCC, 0xCC, 0xFE, 0x0C, 0x0C, 0x0C, 00, // 4 0x04 0xCC, 0xCC, 0xCC, 0xFE, 0x0C, 0x0C, 0x0C, 00, // 4 0x04
0x7E, 0x60, 0x60, 0x3C, 0x60, 0x66, 0x3C, 00, // 5 0x05 0x7E, 0x60, 0x60, 0x3C, 0x06, 0x66, 0x3C, 00, // 5 0x05
0x3C, 0x66, 0x60, 0x7C, 0x66, 0x66, 0x3C, 00, // 6 0x06 0x3C, 0x66, 0x60, 0x7C, 0x66, 0x66, 0x3C, 00, // 6 0x06
0xFE, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 00, // 7 0x07 0xFE, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 00, // 7 0x07
0x3C, 0x66, 0x66, 0x3C, 0x66, 0x66, 0x3C, 00, // 8 0x08 0x3C, 0x66, 0x66, 0x3C, 0x66, 0x66, 0x3C, 00, // 8 0x08
@ -364,7 +394,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
0xC6, 0xC6, 0xC6, 0xFE, 0xC6, 0xC6, 0xC6, 00, // H 0x1D 0xC6, 0xC6, 0xC6, 0xFE, 0xC6, 0xC6, 0xC6, 00, // H 0x1D
0x06, 0x06, 0x06, 0x06, 0x06, 0xC6, 0x7C, 00, // J 0x1E 0x06, 0x06, 0x06, 0x06, 0x06, 0xC6, 0x7C, 00, // J 0x1E
0xC6, 0xCC, 0xD8, 0xF0, 0xD8, 0xCC, 0xC6, 00, // K 0x1F 0xC6, 0xCC, 0xD8, 0xF0, 0xD8, 0xCC, 0xC6, 00, // K 0x1F
0x38, 0x6C, 0xC6, 0xC6, 0xF7, 0xC6, 0xC6, 00, // A 0x20 0x38, 0x6C, 0xC6, 0xC6, 0xFE, 0xC6, 0xC6, 00, // A 0x20
0x7E, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x7E, 00, // Z 0x21 0x7E, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x7E, 00, // Z 0x21
0xC6, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0xC6, 00, // X 0x22 0xC6, 0xC6, 0x6C, 0x38, 0x6C, 0xC6, 0xC6, 00, // X 0x22
0x7C, 0xC6, 0xC0, 0xC0, 0xC0, 0xC6, 0x7C, 00, // C 0x23 0x7C, 0xC6, 0xC0, 0xC0, 0xC0, 0xC6, 0x7C, 00, // C 0x23
@ -378,7 +408,7 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
0x00, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, 00, // = 0x2B 0x00, 0x00, 0x7E, 0x00, 0x7E, 0x00, 0x00, 00, // = 0x2B
0x66, 0x66, 0x66, 0x3C, 0x18, 0x18, 0x18, 00, // Y 0x2C 0x66, 0x66, 0x66, 0x3C, 0x18, 0x18, 0x18, 00, // Y 0x2C
0xC6, 0xE6, 0xF6, 0xFE, 0xDE, 0xCE, 0xC6, 00, // N 0x2D 0xC6, 0xE6, 0xF6, 0xFE, 0xDE, 0xCE, 0xC6, 00, // N 0x2D
0x03, 0x06, 0xC0, 0x18, 0x30, 0x60, 0xC0, 00, // / 0x2E 0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0xC0, 00, // / 0x2E
0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 00, // (box) 0x2F 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 00, // (box) 0x2F
0xCE, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCE, 00, // 10 0x30 0xCE, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCE, 00, // 10 0x30
0x00, 0x00, 0x3C, 0x7E, 0x7E, 0x7E, 0x3C, 00, // (ball) 0x31 0x00, 0x00, 0x3C, 0x7E, 0x7E, 0x7E, 0x3C, 00, // (ball) 0x31
@ -428,7 +458,6 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
0xFFCECECE, // light grey 0xFFCECECE, // light grey
0xFF000000, // black 0xFF000000, // black
0xFFFFFFFF, // white 0xFFFFFFFF, // white
}; };
@ -448,28 +477,10 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk
ser.Sync(nameof(Frame_Col), ref Frame_Col); ser.Sync(nameof(Frame_Col), ref Frame_Col);
ser.Sync(nameof(Pixel_Stat), ref Pixel_Stat); ser.Sync(nameof(Pixel_Stat), ref Pixel_Stat);
ser.Sync(nameof(BG_palette), ref BG_palette, false);
ser.Sync(nameof(OBJ_palette), ref OBJ_palette, false);
ser.Sync(nameof(HDMA_active), ref HDMA_active);
ser.Sync(nameof(LCDC), ref LCDC);
ser.Sync(nameof(STAT), ref STAT);
ser.Sync(nameof(scroll_y), ref scroll_y);
ser.Sync(nameof(scroll_x), ref scroll_x);
ser.Sync(nameof(LY), ref LY); ser.Sync(nameof(LY), ref LY);
ser.Sync(nameof(LY_actual), ref LY_actual); ser.Sync(nameof(LY_actual), ref LY_actual);
ser.Sync(nameof(LY_inc), ref LY_inc); ser.Sync(nameof(LY_inc), ref LY_inc);
ser.Sync(nameof(LYC), ref LYC); ser.Sync(nameof(LYC), ref LYC);
ser.Sync(nameof(DMA_addr), ref DMA_addr);
ser.Sync(nameof(BGP), ref BGP);
ser.Sync(nameof(obj_pal_0), ref obj_pal_0);
ser.Sync(nameof(obj_pal_1), ref obj_pal_1);
ser.Sync(nameof(window_y), ref window_y);
ser.Sync(nameof(window_x), ref window_x);
ser.Sync(nameof(DMA_start), ref DMA_start);
ser.Sync(nameof(DMA_clock), ref DMA_clock);
ser.Sync(nameof(DMA_inc), ref DMA_inc);
ser.Sync(nameof(DMA_byte), ref DMA_byte);
ser.Sync(nameof(cycle), ref cycle); ser.Sync(nameof(cycle), ref cycle);
ser.Sync(nameof(VBL), ref VBL); ser.Sync(nameof(VBL), ref VBL);
ser.Sync(nameof(HBL), ref HBL); ser.Sync(nameof(HBL), ref HBL);