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

implement bitwise logic for axes 

noticable in inputdisplay or when trying to set axis autofire
This commit is contained in:
Morilli 2024-09-27 00:07:38 +02:00
parent 509bd1504a
commit 6d9aa4d467
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BizHawk.Client.Common/controllers/AutofireController.cs
View File

@ -41,11 +41,7 @@ namespace BizHawk.Client.Common
_buttonStarts.Clear();
}
/// <exception cref="NotImplementedException">always</exception>
public int AxisValue(string name)
{
throw new NotImplementedException();
}
public int AxisValue(string name) => Definition.Axes[name].Neutral;
public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Array.Empty<(string, int)>();

16
src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs
View File

@ -18,9 +18,11 @@ namespace BizHawk.Client.Common
return false;
}
// pass axes solely from the original source
// this works in the code because SourceOr is the autofire controller
public int AxisValue(string name) => Source.AxisValue(name);
public int AxisValue(string name)
{
int neutralValue = Source.Definition.Axes[name].Neutral;
return SourceAnd.AxisValue(name) != neutralValue ? Source.AxisValue(name) : neutralValue;
}
public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Source.GetHapticsSnapshot();
@ -77,9 +79,11 @@ namespace BizHawk.Client.Common
| (SourceOr?.IsPressed(button) ?? false);
}
// pass axes solely from the original source
// this works in the code because SourceOr is the autofire controller
public int AxisValue(string name) => Source.AxisValue(name);
public int AxisValue(string name)
{
int sourceValue = Source.AxisValue(name);
return sourceValue != Source.Definition.Axes[name].Neutral ? sourceValue : SourceOr.AxisValue(name);
}
public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Source.GetHapticsSnapshot();