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

InputManager - simplify by moving RewrieInputChain logic into SyncControls since it is only called from there, and does similar work

This commit is contained in:
adelikat 2020-06-06 10:39:40 -05:00
parent 3d48376436
commit e69cedfdfa
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/BizHawk.Client.Common/inputAdapters/InputManager.cs
View File

@ -51,13 +51,24 @@ namespace BizHawk.Client.Common
public Controller ClientControls { get; set; } public Controller ClientControls { get; set; }
private void RewireInputChain() public void SyncControls(IEmulator emulator, Config config)
{ {
var def = emulator.ControllerDefinition;
ActiveController = BindToDefinition(def, config.AllTrollers, config.AllTrollersAnalog);
AutoFireController = BindToDefinitionAF(emulator, config.AllTrollersAutoFire, config.AutofireOn, config.AutofireOff);
// allow propagating controls that are in the current controller definition but not in the prebaked one
// these two lines shouldn't be required anymore under the new system?
ActiveController.ForceType(new ControllerDefinition(def));
ClickyVirtualPadController.Definition = new ControllerDefinition(def);
// Wire up input chain
ControllerInputCoalescer.Clear(); ControllerInputCoalescer.Clear();
ControllerInputCoalescer.Definition = ActiveController.Definition; ControllerInputCoalescer.Definition = ActiveController.Definition;
UdLRControllerAdapter.Source = ActiveController.Or(AutoFireController); UdLRControllerAdapter.Source = ActiveController.Or(AutoFireController);
UdLRControllerAdapter.AllowUdlr = Global.Config.AllowUdlr; UdLRControllerAdapter.AllowUdlr = config.AllowUdlr;
StickyXorAdapter.Source = UdLRControllerAdapter; StickyXorAdapter.Source = UdLRControllerAdapter;
AutofireStickyXorAdapter.Source = StickyXorAdapter; AutofireStickyXorAdapter.Source = StickyXorAdapter;
@ -80,20 +91,6 @@ namespace BizHawk.Client.Common
} }
} }
public void SyncControls(IEmulator emulator, Config config)
{
var def = emulator.ControllerDefinition;
ActiveController = BindToDefinition(def, config.AllTrollers, config.AllTrollersAnalog);
AutoFireController = BindToDefinitionAF(emulator, config.AllTrollersAutoFire, config.AutofireOn, config.AutofireOff);
// allow propagating controls that are in the current controller definition but not in the prebaked one
// these two lines shouldn't be required anymore under the new system?
ActiveController.ForceType(new ControllerDefinition(def));
ClickyVirtualPadController.Definition = new ControllerDefinition(def);
RewireInputChain();
}
private static Controller BindToDefinition(ControllerDefinition def, IDictionary<string, Dictionary<string, string>> allBinds, IDictionary<string, Dictionary<string, AnalogBind>> analogBinds) private static Controller BindToDefinition(ControllerDefinition def, IDictionary<string, Dictionary<string, string>> allBinds, IDictionary<string, Dictionary<string, AnalogBind>> analogBinds)
{ {
var ret = new Controller(def); var ret = new Controller(def);