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

Virtualpads - when right-click auto-firing - take lag frames into account

This commit is contained in:
adelikat 2015-01-04 13:45:43 +00:00
parent 99f9d91671
commit 6c4a32d517
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
BizHawk.Client.Common/inputAdapters/InputAdapters.cs
View File

@ -5,7 +5,7 @@ using System.Linq;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Common.StringExtensions; using BizHawk.Common.StringExtensions;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.IEmulatorExtensions;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
{ {
@ -387,7 +387,8 @@ namespace BizHawk.Client.Common
public int On { get; set; } public int On { get; set; }
public int Off { get; set; } public int Off { get; set; }
public WorkingDictionary<string, int> buttonStarts = new WorkingDictionary<string, int>(); public WorkingDictionary<string, int> buttonStarts = new WorkingDictionary<string, int>();
public WorkingDictionary<string, int> lagStarts = new WorkingDictionary<string, int>(); // TODO: need a data structure not misc dictionaries
private readonly HashSet<string> _stickySet = new HashSet<string>(); private readonly HashSet<string> _stickySet = new HashSet<string>();
public IController Source { get; set; } public IController Source { get; set; }
@ -400,8 +401,8 @@ namespace BizHawk.Client.Common
public AutoFireStickyXorAdapter() public AutoFireStickyXorAdapter()
{ {
// On = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn; //On = Global.Config.AutofireOn < 1 ? 0 : Global.Config.AutofireOn;
// Off = Global.Config.AutofireOff < 1 ? 0 : Global.Config.AutofireOff; //Off = Global.Config.AutofireOff < 1 ? 0 : Global.Config.AutofireOff;
On = 1; On = 1;
Off = 1; Off = 1;
} }
@ -419,7 +420,13 @@ namespace BizHawk.Client.Common
if (_stickySet.Contains(button)) if (_stickySet.Contains(button))
{ {
var a = (Global.Emulator.Frame - buttonStarts[button]) % (On + Off); var lagcount = 0;
if (Global.Emulator.CanPollInput() && Global.Config.AutofireLagFrames)
{
lagcount = Global.Emulator.AsInputPollable().LagCount;
}
var a = ((Global.Emulator.Frame - lagcount) - (buttonStarts[button] - lagStarts[button])) % (On + Off);
if (a < On) if (a < On)
{ {
return source ^= true; return source ^= true;
@ -454,11 +461,21 @@ namespace BizHawk.Client.Common
{ {
_stickySet.Add(button); _stickySet.Add(button);
buttonStarts.Add(button, Global.Emulator.Frame); buttonStarts.Add(button, Global.Emulator.Frame);
if (Global.Emulator.CanPollInput())
{
lagStarts.Add(button, Global.Emulator.AsInputPollable().LagCount);
}
else
{
lagStarts.Add(button, 0);
}
} }
else else
{ {
_stickySet.Remove(button); _stickySet.Remove(button);
buttonStarts.Remove(button); buttonStarts.Remove(button);
lagStarts.Remove(button);
} }
} }
@ -477,7 +494,9 @@ namespace BizHawk.Client.Common
public void ClearStickies() public void ClearStickies()
{ {
this._stickySet.Clear(); _stickySet.Clear();
buttonStarts.Clear();
lagStarts.Clear();
} }
public void MassToggleStickyState(List<string> buttons) public void MassToggleStickyState(List<string> buttons)