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

Fix for state gap when frame advancing and painting input (#2563) 

* Fix for state gap when frame advancing and painting input

* simplify
This commit is contained in:
alyosha-tas 2021-01-12 21:32:44 -05:00 committed by GitHub
parent 39c0011d09
commit 72e8fa031e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/IMainFormForTools.cs
View File

@ -78,6 +78,8 @@ namespace BizHawk.Client.EmuHawk
void PauseEmulator(); void PauseEmulator();
bool BlockFrameAdvance { get; set; }
/// <remarks>only referenced from <see cref="TAStudio"/></remarks> /// <remarks>only referenced from <see cref="TAStudio"/></remarks>
void RelinquishControl(IControlMainform master); void RelinquishControl(IControlMainform master);

5
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -768,6 +768,8 @@ namespace BizHawk.Client.EmuHawk
} }
} }
public bool BlockFrameAdvance { get; set; }
public event Action<bool> OnPauseChanged; public event Action<bool> OnPauseChanged;
public string CurrentlyOpenRom { get; private set; } // todo - delete me and use only args instead public string CurrentlyOpenRom { get; private set; } // todo - delete me and use only args instead
@ -2916,7 +2918,8 @@ namespace BizHawk.Client.EmuHawk
float atten = 0; float atten = 0;
if (runFrame || force) // BlockFrameAdvance (true when input it being editted in TAStudio) supercedes all other frame advance conditions
if ((runFrame || force) && !BlockFrameAdvance)
{ {
var isFastForwarding = InputManager.ClientControls["Fast Forward"] || IsTurboing || InvisibleEmulation; var isFastForwarding = InputManager.ClientControls["Fast Forward"] || IsTurboing || InvisibleEmulation;
var isFastForwardingOrRewinding = isFastForwarding || isRewinding || _unthrottled; var isFastForwardingOrRewinding = isFastForwarding || isRewinding || _unthrottled;

7
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -619,6 +619,11 @@ namespace BizHawk.Client.EmuHawk
_playbackInterrupted = !MainForm.EmulatorPaused; _playbackInterrupted = !MainForm.EmulatorPaused;
MainForm.PauseEmulator(); MainForm.PauseEmulator();
// Pausing the emulator is insufficient to actually stop frame advancing as the frame advance hotkey can
// still take effect. This can lead to desyncs by simultaneously changing input and frame advancing.
// So we want to block all frame advance operations while the user is changing input in the piano roll
MainForm.BlockFrameAdvance = true;
if (ControllerType.BoolButtons.Contains(buttonName)) if (ControllerType.BoolButtons.Contains(buttonName))
{ {
_patternPaint = false; _patternPaint = false;
@ -810,6 +815,8 @@ namespace BizHawk.Client.EmuHawk
{ {
CurrentTasMovie.ChangeLog?.EndBatch(); CurrentTasMovie.ChangeLog?.EndBatch();
} }
MainForm.BlockFrameAdvance = false;
} }
private void TasView_MouseUp(object sender, MouseEventArgs e) private void TasView_MouseUp(object sender, MouseEventArgs e)