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

Fix bug with delta state rewinder (#2871)

This commit is contained in:
nattthebear 2021-07-20 16:47:10 -04:00 committed by GitHub
parent 56594840ad
commit 7cc73ca9b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.Common/rewind/ZeldaWinder.cs
View File

@ -106,7 +106,7 @@ namespace BizHawk.Client.Common
_count++;
return;
}
if (!_buffer.WillCapture(_masterFrame))
if (!_buffer.WouldCapture(frame - _masterFrame))
return;
{
@ -189,7 +189,7 @@ namespace BizHawk.Client.Common
_masterLength = (int)sss.Position;
_masterFrame = frame;
_count++;
});
}, force: true);
});
}
}

24
src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
View File

@ -148,31 +148,35 @@ namespace BizHawk.Client.Common
_backingStoreType == settings.BackingStore;
}
private bool ShouldCapture(int frame)
private bool ShouldCaptureForFrameDiff(int frameDiff)
{
if (Count == 0)
{
return true;
}
var frameDiff = frame - _states[HeadStateIndex].Frame;
if (frameDiff < 1)
{
// non-linear time is from a combination of other state changing mechanisms and the rewinder
// not much we can say here, so just take a state
return true;
}
return frameDiff >= ComputeIdealRewindInterval();
}
return frameDiff >= ComputeIdealRewindInterval();
private bool ShouldCapture(int frame)
{
var frameDiff = frame - _states[HeadStateIndex].Frame;
return ShouldCaptureForFrameDiff(frameDiff);
}
/// <summary>
/// Predict whether Capture() will capture a state. Useful if expensive work needs to happen before
/// Capture() is called.
/// Predict whether Capture() would capture a state, assuming a particular frame delta.
/// </summary>
/// <param name="frame">The same frame number to be passed to capture</param>
/// <returns>Whether capture will happen, assuming Capture() is passed the same frame and force = false</returns>
public bool WillCapture(int frame)
/// <param name="frameDelta">The assumed frame delta. Normally this will be equal to `nextStateFrame - GetState(Count - 1).Frame`.</param>
/// <returns>Whether Capture(nextStateFrame) would actually capture, assuming the frameDelta matched.</returns>
public bool WouldCapture(int frameDelta)
{
return ShouldCapture(frame);
return ShouldCaptureForFrameDiff(frameDelta);
}
/// <summary>