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

7800: you can see stuff that doesn't look retarded now

This commit is contained in:
goyuken 2012-12-12 00:30:36 +00:00
parent da0a8822c9
commit c22ad34844
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
BizHawk.Emulation/Consoles/Atari/7800/Atari7800.cs
View File

@ -15,18 +15,14 @@ namespace BizHawk
_frame++; _frame++;
_islag = true; _islag = true;
//TODO theMachine.ComputeNextFrame(videoProvider.fb);
FrameBuffer fb = theMachine.CreateFrameBuffer();
//new FrameBuffer(262, 320); //TODO: 262 is NTSC
theMachine.ComputeNextFrame(fb);
if (_islag) if (_islag)
{ {
LagCount++; LagCount++;
} }
videoProvider.FillFrameBuffer(fb); videoProvider.FillFrameBuffer();
} }
/* TODO */ /* TODO */
@ -125,7 +121,6 @@ namespace BizHawk
this.hsbios = highscoreBIOS; this.hsbios = highscoreBIOS;
NTSC_BIOS = new Bios7800(ntsc_bios); NTSC_BIOS = new Bios7800(ntsc_bios);
PAL_BIOS = new Bios7800(pal_bios); PAL_BIOS = new Bios7800(pal_bios);
videoProvider = new MyVideoProvider(this);
soundProvider = new MySoundProvider(this); //TODO soundProvider = new MySoundProvider(this); //TODO
HardReset(); HardReset();
} }
@ -154,6 +149,7 @@ namespace BizHawk
//theMachine = new Machine7800NTSC(cart, null, null, logger); //theMachine = new Machine7800NTSC(cart, null, null, logger);
//TODO: clean up, the hs and bios are passed in, the bios has an object AND byte array in the core, and naming is inconsistent //TODO: clean up, the hs and bios are passed in, the bios has an object AND byte array in the core, and naming is inconsistent
theMachine.Reset(); theMachine.Reset();
videoProvider = new MyVideoProvider(theMachine.CreateFrameBuffer());
} }
void SyncState(Serializer ser) //TODO void SyncState(Serializer ser) //TODO
@ -172,20 +168,18 @@ namespace BizHawk
class MyVideoProvider : IVideoProvider class MyVideoProvider : IVideoProvider
{ {
public int top = 0; //TODO: I should delete these probably public FrameBuffer fb { get; private set; }
public int bottom = 262; public MyVideoProvider(FrameBuffer fb)
public int left = 0;
public int right = 320;
Atari7800 emu;
public MyVideoProvider(Atari7800 emu)
{ {
this.emu = emu; this.fb = fb;
BufferWidth = fb.VisiblePitch;
BufferHeight = fb.Scanlines;
buffer = new int[BufferWidth * BufferHeight];
} }
int[] buffer = new int[262 * 320]; //TODO: use videobuffer values for this if there's a logical way int[] buffer;
public void FillFrameBuffer(FrameBuffer fb) //TODO: don't recalculate consantly, fill this on frame advance instead public void FillFrameBuffer()
{ {
int s = 0; int s = 0;
int t = 0; int t = 0;
@ -211,9 +205,9 @@ namespace BizHawk
} }
public int VirtualWidth { get { return BufferWidth; } } public int VirtualWidth { get { return BufferWidth; } }
public int BufferWidth { get { return right - left + 1; } } public int BufferWidth { get; private set; }
public int BufferHeight { get { return bottom - top + 1; } } public int BufferHeight { get; private set; }
public int BackgroundColor { get { return 0; } } public int BackgroundColor { get { return unchecked((int)0xff000000); } }
} }
MySoundProvider soundProvider; MySoundProvider soundProvider;