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

simplify StickyAdapters a bit

This commit is contained in:
adelikat 2020-03-01 15:59:30 -06:00
parent 2349a92de6
commit 10df3b194e
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
View File

@ -13,7 +13,7 @@ namespace BizHawk.Client.Common
public bool IsPressed(string button) public bool IsPressed(string button)
{ {
var source = Source.IsPressed(button); var source = Source.IsPressed(button);
source ^= _stickySet.Contains(button); source ^= CurrentStickies.Contains(button);
return source; return source;
} }
@ -38,8 +38,6 @@ namespace BizHawk.Client.Common
private List<string> _justPressed = new List<string>(); private List<string> _justPressed = new List<string>();
private readonly HashSet<string> _stickySet = new HashSet<string>();
// if SetFloat() is called (typically virtual pads), then that float will entirely override the Source input // if SetFloat() is called (typically virtual pads), then that float will entirely override the Source input
// otherwise, the source is passed thru. // otherwise, the source is passed thru.
private readonly WorkingDictionary<string, float?> _floatSet = new WorkingDictionary<string, float?>(); private readonly WorkingDictionary<string, float?> _floatSet = new WorkingDictionary<string, float?>();
@ -56,39 +54,33 @@ namespace BizHawk.Client.Common
} }
} }
public void ClearStickyFloats() public void ClearStickyFloats() => _floatSet.Clear();
{
_floatSet.Clear();
}
public void SetSticky(string button, bool isSticky) public void SetSticky(string button, bool isSticky)
{ {
if (isSticky) if (isSticky)
{ {
_stickySet.Add(button); CurrentStickies.Add(button);
} }
else else
{ {
_stickySet.Remove(button); CurrentStickies.Remove(button);
} }
} }
public void Unset(string button) public void Unset(string button)
{ {
_stickySet.Remove(button); CurrentStickies.Remove(button);
_floatSet.Remove(button); _floatSet.Remove(button);
} }
public bool IsSticky(string button) public bool IsSticky(string button) => CurrentStickies.Contains(button);
{
return _stickySet.Contains(button);
}
public HashSet<string> CurrentStickies => _stickySet; public HashSet<string> CurrentStickies { get; } = new HashSet<string>();
public void ClearStickies() public void ClearStickies()
{ {
_stickySet.Clear(); CurrentStickies.Clear();
_floatSet.Clear(); _floatSet.Clear();
} }
@ -96,13 +88,13 @@ namespace BizHawk.Client.Common
{ {
foreach (var button in buttons.Where(button => !_justPressed.Contains(button))) foreach (var button in buttons.Where(button => !_justPressed.Contains(button)))
{ {
if (_stickySet.Contains(button)) if (CurrentStickies.Contains(button))
{ {
_stickySet.Remove(button); CurrentStickies.Remove(button);
} }
else else
{ {
_stickySet.Add(button); CurrentStickies.Add(button);
} }
} }