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

Re-enable haptic feedback 

(i.e. revert 567cb0c8f)
This commit is contained in:
YoshiRulz 2021-07-15 00:34:02 +10:00
parent 864086c510
commit 38b81ae10b
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -704,9 +704,7 @@ namespace BizHawk.Client.EmuHawk
// ...but prepare haptics first, those get read in ProcessInput // ...but prepare haptics first, those get read in ProcessInput
var finalHostController = (ControllerInputCoalescer) InputManager.ControllerInputCoalescer; var finalHostController = (ControllerInputCoalescer) InputManager.ControllerInputCoalescer;
// for now, vibrate the first gamepad when the Fast Forward hotkey is held, using the value from the previous (host) frame // for now, vibrate the first gamepad when the Fast Forward hotkey is held, using the value from the previous (host) frame
#if false // waiting on https://github.com/TASVideos/BizHawk/pull/2683
InputManager.ActiveController.SetHapticChannelStrength("Debug", InputManager.ClientControls.IsPressed("Fast Forward") ? int.MaxValue : 0); InputManager.ActiveController.SetHapticChannelStrength("Debug", InputManager.ClientControls.IsPressed("Fast Forward") ? int.MaxValue : 0);
#endif
InputManager.ActiveController.PrepareHapticsForHost(finalHostController); InputManager.ActiveController.PrepareHapticsForHost(finalHostController);
ProcessInput( ProcessInput(
_hotkeyCoalescer, _hotkeyCoalescer,

2
src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
View File

@ -236,7 +236,6 @@ namespace BizHawk.Client.EmuHawk
new AnalogBind("", 1.0f, 0.1f), new AnalogBind("", 1.0f, 0.1f),
CreateAnalogPanel CreateAnalogPanel
); );
#if false // waiting on https://github.com/TASVideos/BizHawk/pull/2683
LoadToPanel( LoadToPanel(
FeedbacksTab, FeedbacksTab,
_emulator.ControllerDefinition.Name, _emulator.ControllerDefinition.Name,
@ -245,7 +244,6 @@ namespace BizHawk.Client.EmuHawk
haptics, haptics,
new(string.Empty, string.Empty, 1.0f), new(string.Empty, string.Empty, 1.0f),
CreateFeedbacksPanel); CreateFeedbacksPanel);
#endif
if (AnalogControlsTab.Controls.Count == 0) if (AnalogControlsTab.Controls.Count == 0)
{ {