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

TAStudio - some tinkering with the GoToFrame() method logic, still more logic to be done here

This commit is contained in:
adelikat 2014-07-17 21:43:41 +00:00
parent 2332f9605c
commit 6d95ee97a3
2 changed files with 57 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
View File

@ -23,6 +23,12 @@ namespace BizHawk.Client.EmuHawk
{
TasView.ensureVisible(Global.Emulator.Frame);
}
if (StopFrame.HasValue && Global.Emulator.Frame == StopFrame.Value)
{
GlobalWin.MainForm.PauseEmulator();
StopFrame = null;
}
}
public void Restart()

65
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -25,6 +25,8 @@ namespace BizHawk.Client.EmuHawk
private bool _originalRewindStatus; // The client rewind status before TAStudio was engaged (used to restore when disengaged)
private MovieEndAction _originalEndAction; // The movie end behavior selected by the user (that is overridden by TAStudio)
private int? StopFrame = null; // This is the frame Tastudio
private Dictionary<string, string> GenerateColumnNames()
{
var lg = Global.MovieSession.LogGeneratorInstance();
@ -292,25 +294,60 @@ namespace BizHawk.Client.EmuHawk
// If near a greenzone item, load and emulate
// Do capturing and recording as needed
var goToFrame = frame == 0 ? 0 : frame - 1;
if (_tas[goToFrame].HasState) // Go back 1 frame and emulate
if (frame < _tas.InputLogLength)
{
_tas.SwitchToPlay();
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[goToFrame].State.ToArray())));
if (goToFrame > 0) // We can't emulate up to frame 0!
if (frame < Global.Emulator.Frame) // We are rewinding
{
Global.Emulator.FrameAdvance(true);
}
var goToFrame = frame == 0 ? 0 : frame - 1;
GlobalWin.DisplayManager.NeedsToPaint = true;
TasView.ensureVisible(frame);
RefreshDialog();
if (_tas[goToFrame].HasState) // Go back 1 frame and emulate
{
_tas.SwitchToPlay();
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[goToFrame].State.ToArray())));
if (goToFrame > 0) // We can't emulate up to frame 0!
{
Global.Emulator.FrameAdvance(true);
}
GlobalWin.DisplayManager.NeedsToPaint = true;
TasView.ensureVisible(frame);
RefreshDialog();
}
else
{
_tas.SwitchToPlay();
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[_tas.LastEmulatedFrame].State.ToArray())));
GlobalWin.MainForm.UnpauseEmulator();
StopFrame = frame;
// TODO: if turbo seek, ramp up the speed
}
}
else // We are going foward
{
var goToFrame = frame - 1;
if (_tas[goToFrame].HasState) // Can we go directly there?
{
_tas.SwitchToPlay();
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[goToFrame].State.ToArray())));
Global.Emulator.FrameAdvance(true);
GlobalWin.DisplayManager.NeedsToPaint = true;
TasView.ensureVisible(frame);
RefreshDialog();
}
else // TODO: this assume that there are no "gaps", instead of last emulated frame, we should do last frame from X
{
_tas.SwitchToPlay();
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[_tas.LastEmulatedFrame].State.ToArray())));
GlobalWin.MainForm.UnpauseEmulator();
StopFrame = frame;
// TODO: if turbo seek, ramp up the speed
}
}
}
else
else // Emulate to a future frame
{
// Find the earliest frame before this state
// TODO
}
}