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

some more sticky renames for clarity 

SetSticky and ClearStickies sounds an awful like they affect the same thing, also this makes it clear whether to set a hold or an autofire
This commit is contained in:
Morilli 2024-09-22 23:56:53 +02:00
parent 5a4f093d50
commit 23815b4783
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/Api/Classes/JoypadApi.cs
View File

@ -97,7 +97,7 @@ namespace BizHawk.Client.Common
{
try
{
_inputManager.StickyXorAdapter.SetAxis(controller == null ? control : $"P{controller} {control}", value);
_inputManager.StickyXorAdapter.SetAxisHold(controller == null ? control : $"P{controller} {control}", value);
}
catch
{

18
src/BizHawk.Client.Common/inputAdapters/StickyAdapters.cs
View File

@ -38,9 +38,9 @@ namespace BizHawk.Client.Common
public void SetHapticChannelStrength(string name, int strength) => Source.SetHapticChannelStrength(name, strength);
public void SetSticky(string button, bool isSticky)
public void SetButtonHold(string button, bool enabled)
{
if (isSticky)
if (enabled)
{
_buttonHolds.Add(button);
}
@ -50,11 +50,11 @@ namespace BizHawk.Client.Common
}
}
public void SetAxis(string name, int? value)
public void SetAxisHold(string name, int? value)
{
if (value is int i)
if (value.HasValue)
{
_axisHolds[name] = i;
_axisHolds[name] = value.Value;
}
else
{
@ -140,9 +140,9 @@ namespace BizHawk.Client.Common
_offFrames = Math.Max(offFrames, 1);
}
public void SetSticky(string button, bool isSticky, AutoPatternBool pattern = null)
public void SetButtonAutofire(string button, bool enabled, AutoPatternBool pattern = null)
{
if (isSticky)
if (enabled)
{
pattern ??= new AutoPatternBool(_onFrames, _offFrames);
_boolPatterns[button] = pattern;
@ -153,7 +153,7 @@ namespace BizHawk.Client.Common
}
}
public void SetAxis(string name, int? value, AutoPatternAxis pattern = null)
public void SetAxisAutofire(string name, int? value, AutoPatternAxis pattern = null)
{
if (value.HasValue)
{
@ -186,7 +186,7 @@ namespace BizHawk.Client.Common
{
foreach (var button in buttons.Where(button => !_justPressed.Contains(button)))
{
SetSticky(button, !_boolPatterns.ContainsKey(button));
SetButtonAutofire(button, !_boolPatterns.ContainsKey(button));
}
_justPressed = buttons;

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

@ -471,7 +471,7 @@ namespace BizHawk.Client.EmuHawk
if (index < BoolPatterns.Length)
{
AutoPatternBool p = BoolPatterns[index];
InputManager.AutofireStickyXorAdapter.SetSticky(button, isOn.Value, p);
InputManager.AutofireStickyXorAdapter.SetButtonAutofire(button, isOn.Value, p);
}
}
else
@ -496,7 +496,7 @@ namespace BizHawk.Client.EmuHawk
if (index < AxisPatterns.Length)
{
AutoPatternAxis p = AxisPatterns[index];
InputManager.AutofireStickyXorAdapter.SetAxis(button, value, p);
InputManager.AutofireStickyXorAdapter.SetAxisAutofire(button, value, p);
}
}
}

4
src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
View File

@ -75,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
public void Clear()
{
_stickyXorAdapter.SetAxis(Name, null);
_stickyXorAdapter.SetAxisHold(Name, null);
IsSet = false;
}
@ -149,7 +149,7 @@ namespace BizHawk.Client.EmuHawk
if (!_programmaticallyChangingValue)
{
CurrentValue = AnalogTrackBar.Value;
_stickyXorAdapter.SetAxis(Name, AnalogTrackBar.Value);
_stickyXorAdapter.SetAxisHold(Name, AnalogTrackBar.Value);
}
}

4
src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogStick.cs
View File

@ -138,8 +138,8 @@ namespace BizHawk.Client.EmuHawk
{
AnalogStick.Clear(fromCallback: true);
SetNumericsFromAnalog();
_stickyXorAdapter.SetAxis(AnalogStick.XName, null);
_stickyXorAdapter.SetAxis(AnalogStick.YName, null);
_stickyXorAdapter.SetAxisHold(AnalogStick.XName, null);
_stickyXorAdapter.SetAxisHold(AnalogStick.YName, null);
}
public void Clear() => AnalogStick.Clear();

8
src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadButton.cs
View File

@ -31,8 +31,8 @@ namespace BizHawk.Client.EmuHawk
RightClicked = false;
Checked = false;
//HOOMOO
InputManager.AutofireStickyXorAdapter.SetSticky(Name, false);
InputManager.StickyXorAdapter.SetSticky(Name, false);
InputManager.AutofireStickyXorAdapter.SetButtonAutofire(Name, false);
InputManager.StickyXorAdapter.SetButtonHold(Name, false);
}
}
@ -133,11 +133,11 @@ namespace BizHawk.Client.EmuHawk
{
if (RightClicked)
{
InputManager.AutofireStickyXorAdapter.SetSticky(Name, Checked);
InputManager.AutofireStickyXorAdapter.SetButtonAutofire(Name, Checked);
}
else
{
InputManager.StickyXorAdapter.SetSticky(Name, Checked);
InputManager.StickyXorAdapter.SetButtonHold(Name, Checked);
}
if (!Checked)

2
src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadDiscManager.cs
View File

@ -125,7 +125,7 @@ namespace BizHawk.Client.EmuHawk
private void lvDiscs_SelectedIndexChanged(object sender, EventArgs e)
{
// emergency measure: if no selection, set no disc
_inputManager.StickyXorAdapter.SetAxis(_discSelectName, lvDiscs.SelectedIndices.Count == 0 ? 0 : lvDiscs.SelectedIndices[0]);
_inputManager.StickyXorAdapter.SetAxisHold(_discSelectName, lvDiscs.SelectedIndices.Count == 0 ? 0 : lvDiscs.SelectedIndices[0]);
}
private void btnClose_Click(object sender, EventArgs e)

8
src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
View File

@ -58,8 +58,8 @@ namespace BizHawk.Client.EmuHawk
public void Clear()
{
_stickyXorAdapter.SetAxis(XName, null);
_stickyXorAdapter.SetAxis(YName, null);
_stickyXorAdapter.SetAxisHold(XName, null);
_stickyXorAdapter.SetAxisHold(YName, null);
_overrideX = null;
_overrideY = null;
_isSet = false;
@ -196,7 +196,7 @@ namespace BizHawk.Client.EmuHawk
XNumeric.Value = XNumeric.Maximum;
}
_stickyXorAdapter.SetAxis(XName, (XNumeric.Value.ConvertToF32() * MultiplierX).RoundToInt());
_stickyXorAdapter.SetAxisHold(XName, (XNumeric.Value.ConvertToF32() * MultiplierX).RoundToInt());
_isSet = true;
}
}
@ -218,7 +218,7 @@ namespace BizHawk.Client.EmuHawk
YNumeric.Value = YNumeric.Maximum;
}
_stickyXorAdapter.SetAxis(YName, (YNumeric.Value.ConvertToF32() * MultiplierY).RoundToInt());
_stickyXorAdapter.SetAxisHold(YName, (YNumeric.Value.ConvertToF32() * MultiplierY).RoundToInt());
_isSet = true;
}
}

4
src/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/components/AnalogStickPanel.cs
View File

@ -170,8 +170,8 @@ namespace BizHawk.Client.EmuHawk
private void SetAnalog()
{
_stickyXorAdapter.SetAxis(XName, HasValue ? X : null);
_stickyXorAdapter.SetAxis(YName, HasValue ? Y : null);
_stickyXorAdapter.SetAxisHold(XName, HasValue ? X : null);
_stickyXorAdapter.SetAxisHold(YName, HasValue ? Y : null);
Refresh();
}