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

Remove haptics from ControllerDefinitionMerger (fixes #2690)

This commit is contained in:
YoshiRulz 2021-04-01 09:22:06 +10:00
parent ad1659eb68
commit 1ffc0435b3
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/BizHawk.Emulation.Common/ControllerDefinitionMerger.cs
View File

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
namespace BizHawk.Emulation.Common namespace BizHawk.Emulation.Common
{ {
@ -33,7 +32,6 @@ namespace BizHawk.Emulation.Common
foreach (var def in controllers) foreach (var def in controllers)
{ {
Dictionary<string, string> buttonAxisRemaps = new(); Dictionary<string, string> buttonAxisRemaps = new();
Dictionary<string, string> feedbackRemaps = new();
foreach (string s in def.BoolButtons) foreach (string s in def.BoolButtons)
{ {
@ -49,15 +47,8 @@ namespace BizHawk.Emulation.Common
buttonAxisRemaps[kvp.Key] = r; buttonAxisRemaps[kvp.Key] = r;
} }
foreach (var s in def.HapticsChannels)
{
string r = Allocate(s, ref plr, ref playerNext);
ret.HapticsChannels.Add(r);
feedbackRemaps[s] = r;
}
plr = playerNext; plr = playerNext;
unmergers.Add(new ControlDefUnMerger(buttonAxisRemaps, feedbackRemaps)); unmergers.Add(new ControlDefUnMerger(buttonAxisRemaps));
} }
return ret; return ret;
@ -68,22 +59,16 @@ namespace BizHawk.Emulation.Common
{ {
private class DummyController : IController private class DummyController : IController
{ {
/// <inheritdoc cref="ControlDefUnMerger._buttonAxisRemaps"/>
private readonly IReadOnlyDictionary<string, string> _buttonAxisRemaps; private readonly IReadOnlyDictionary<string, string> _buttonAxisRemaps;
/// <inheritdoc cref="ControlDefUnMerger._buttonAxisRemaps"/>
private readonly IReadOnlyDictionary<string, string> _feedbackRemaps;
private readonly IController _src; private readonly IController _src;
public DummyController( public DummyController(
IController src, IController src,
IReadOnlyDictionary<string, string> buttonAxisRemaps, IReadOnlyDictionary<string, string> buttonAxisRemaps)
IReadOnlyDictionary<string, string> feedbackRemaps)
{ {
_src = src; _src = src;
_buttonAxisRemaps = buttonAxisRemaps; _buttonAxisRemaps = buttonAxisRemaps;
_feedbackRemaps = feedbackRemaps;
} }
/// <exception cref="NotImplementedException">always</exception> /// <exception cref="NotImplementedException">always</exception>
@ -99,28 +84,18 @@ namespace BizHawk.Emulation.Common
return _src.AxisValue(_buttonAxisRemaps[name]); return _src.AxisValue(_buttonAxisRemaps[name]);
} }
public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Array.Empty<(string, int)>();
=> _src.GetHapticsSnapshot()
.Select(hapticsEntry => (_feedbackRemaps.First(kvpRemap => kvpRemap.Value == hapticsEntry.Name).Value, hapticsEntry.Strength)) // reverse lookup
.ToArray();
public void SetHapticChannelStrength(string name, int strength) => _src.SetHapticChannelStrength(_feedbackRemaps[name], strength); public void SetHapticChannelStrength(string name, int strength) {}
} }
/// <remarks>these need to be separate because it's expected that <c>"P1 Left"</c> will appear in both</remarks>
private readonly IReadOnlyDictionary<string, string> _buttonAxisRemaps; private readonly IReadOnlyDictionary<string, string> _buttonAxisRemaps;
/// <inheritdoc cref="_buttonAxisRemaps"/> public ControlDefUnMerger(IReadOnlyDictionary<string, string> buttonAxisRemaps)
private readonly IReadOnlyDictionary<string, string> _feedbackRemaps;
public ControlDefUnMerger(
IReadOnlyDictionary<string, string> buttonAxisRemaps,
IReadOnlyDictionary<string, string> feedbackRemaps)
{ {
_buttonAxisRemaps = buttonAxisRemaps; _buttonAxisRemaps = buttonAxisRemaps;
_feedbackRemaps = feedbackRemaps;
} }
public IController UnMerge(IController c) => new DummyController(c, _buttonAxisRemaps, _feedbackRemaps); public IController UnMerge(IController c) => new DummyController(c, _buttonAxisRemaps);
} }
} }