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

attempt to make rewind perform well while paused 

attempts to resolve #3053 by shuffling some bools around.

Specifically, `_runloopFrameProgress` is now set when either (continuously) frame advancing or rewinding.
This commit is contained in:
Morilli 2025-02-18 14:26:40 +01:00
parent b6a175bddf
commit d386a4fdcb
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2922,7 +2922,6 @@ namespace BizHawk.Client.EmuHawk
private void StepRunLoop_Core(bool force = false)
{
var runFrame = false;
_runloopFrameAdvance = false;
var currentTimestamp = Stopwatch.GetTimestamp();
double frameAdvanceTimestampDeltaMs = (double)(currentTimestamp - _frameAdvanceTimestamp) / Stopwatch.Frequency * 1000.0;
@ -2946,14 +2945,21 @@ namespace BizHawk.Client.EmuHawk
else
{
PauseEmulator();
oldFrameAdvanceCondition = false;
}
}
if (oldFrameAdvanceCondition || FrameInch)
bool frameAdvance = oldFrameAdvanceCondition || FrameInch;
if (!frameAdvance && _runloopFrameAdvance && _runloopFrameProgress)
{
// handle release of frame advance
_runloopFrameProgress = false;
PauseEmulator();
}
_runloopFrameAdvance = frameAdvance;
if (frameAdvance)
{
FrameInch = false;
_runloopFrameAdvance = true;
// handle the initial trigger of a frame advance
if (_frameAdvanceTimestamp == 0)
@ -2975,13 +2981,6 @@ namespace BizHawk.Client.EmuHawk
}
else
{
// handle release of frame advance: do we need to deactivate FrameProgress?
if (_runloopFrameProgress)
{
_runloopFrameProgress = false;
PauseEmulator();
}
_frameAdvanceTimestamp = 0;
}
@ -2995,6 +2994,7 @@ namespace BizHawk.Client.EmuHawk
}
bool isRewinding = Rewind(ref runFrame, currentTimestamp, out var returnToRecording);
_runloopFrameProgress |= isRewinding;
float atten = 0;