Add SDL motion input and rumble support #10000

jambonmcyeah · 2021-08-06T15:30:04Z

Add motion input and rumble support for the SDL controller interface, inspired by yuzu-emu/yuzu#6244. This is useful for Windows and MacOS users since it removes the need to have a DSU server to get motion input.

Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp

Source/Core/InputCommon/ControllerInterface/SDL/SDL.h

jambonmcyeah · 2021-08-06T16:01:23Z

I'm not familiar with Visual Studio so my approach of adding SDL into Externals is probably wrong. Would appreciate if someone can help me with that. 😃

AdmiralCurtiss · 2021-08-06T16:35:34Z

Yeah considering the size of the SDL, it's probably a better idea to instead add an actual git submodule of https://github.com/libsdl-org/SDL.git.

jambonmcyeah · 2021-08-06T19:40:40Z

Yeah considering the size of the SDL, it's probably a better idea to instead add an actual git submodule of https://github.com/libsdl-org/SDL.git.

Ok, I've done that and fixed the visual studio files also.

jambonmcyeah · 2021-08-06T19:46:57Z

I think this is ready for more review now

OatmealDome · 2021-08-08T00:34:21Z

Perhaps if SDL isn't found, the SDL from Externals should be used. (There are checks in Source/Core/InputCommon/CMakeLists.txt, but they might have to moved to the root CMakeLists?)

jambonmcyeah · 2021-08-10T21:44:26Z

Perhaps if SDL isn't found, the SDL from Externals should be used. (There are checks in Source/Core/InputCommon/CMakeLists.txt, but they might have to moved to the root CMakeLists?)

Just finished that as well. Let me know if there's more changes needed.

jambonmcyeah · 2021-08-10T22:05:48Z

This should hopefully fix the FreeBSD build failure.

jambonmcyeah · 2021-08-10T22:29:31Z

This should fix unit tests on Windows

jambonmcyeah · 2021-08-11T02:13:19Z

This should be everything fixed, just need to run it through CI to confirm that.

Simonx22 · 2021-08-11T17:56:48Z

I have tested this on Windows 10 v20H1 with my DualShock 4 Controller:

rumble works fine
buttons can be mapped just fine
motion control does not work

@OatmealDome also tried this on macOS 11 with a Switch Pro Controller, everything works except motion controls.

Is there anything special we need to do to get motion controls working?

jambonmcyeah · 2021-08-11T18:23:40Z

Maybe it's some background programs that are interfering with it. If you guys have Steam, DS4Windows or other programs that interact with controllers try closing them.

Also, the system SDL on the macOS build bot might be too old, version 2.0.14 or newer is required for motion controls.

I have personally tested on Windows 10 v21H1 with a DualShock 4 Controller in both bluetooth and wired mode and it works for me.

jambonmcyeah · 2021-08-11T18:57:59Z

Also macOS might have permission issues, so the solution to that is going to Security & Privacy -> Privacy -> Input Monitoring and allowing Dolphin (or Terminal if you're running dolphin from the terminal)

OatmealDome · 2021-08-11T19:12:58Z

Hmm, the universal buildbot uses SDL 2.0.14, so that should be fine. I tried my Pro Controller over Bluetooth and USB with Input Monitoring enabled for Dolphin, and motion isn't being registered in the controller configuration.

If I right click on the binding button to look at the list of inputs, none of the Accel or Gyro inputs appear in the list.

mbc07 · 2021-08-11T19:16:50Z

I tested with a DualShock 4 v2 on Windows 10 21H1 and it works (including motion) but:

SDL doesn't detect the controller when connected over Bluetooth, only over USB
Touchpad isn't accessible (only the touchpad click)
It's not possible to access the rumble motors individually, SDL reports only one motor which activates both

Those probably are SDL limitations, but not working over Bluetooth kinda defeats the hability of reading the motion sensors. Regardless it's still a great addition especially for macOS, which has a single DSU Server available that I heard is quite finicky to use...

mbc07 · 2021-08-11T19:25:28Z

Ah, nevermind, SDL can see the DualShock 4 over BT on Win10 (I forgot to add Dolphin to the HidHide whitelist earlier), however it can't access the motion sensors over BT (they don't appear in the Advanced Mapping window), rumble also doesn't work over BT (it can be selected in the Advanced Mapping windows but the controller doesn't rumble at all)...

jambonmcyeah · 2021-08-11T19:27:36Z

Adding touchpad support and individual motor rumble is doable. I'll add support for those after I figure out why it's not working for some people.
Bluetooth should work in theory, it works on both of my computers. (both for rumble and motion input)
I'll try to figure out what the problem is.

Simonx22 · 2021-08-11T19:29:47Z

Quick update on my issue: a reboot fixed the motion control issues. The pointer works fine now but the actual accelerometer itself shifts heavily to the right. I have tested this with Mario Kart Wii. Calibrating the motion controls doesn't seem to help much. It seems like the accelerometer is shifting further the longer I drive. Not sure if the shifting to the right is an SDL issue or something else with Dolphin.

mbc07 · 2021-08-11T19:37:59Z

@jambonmcyeah maybe it's the slightly communication differences between DualShock 4 v1 and v2 bitting again? The v2 (the one I have) is the newer model released with the PS4 Slim, that has the light bar visible through the touchpad, v1 is the model that launched with the PS4 "fat". PR #7614 also exhibited different behavior depending of the DualShock 4 model...

jambonmcyeah · 2021-08-11T19:43:27Z

The one I have seems to be the V2 version which may explain things.

jambonmcyeah · 2021-08-11T19:47:10Z

Also for the shifting problem I have it as well with the gyroscope. Have no idea what's causing the problem

jambonmcyeah · 2021-08-11T20:03:25Z

It shouldn't be SDL's problem since from my testing it doesn't seem to happen with other emulator which uses SDL like yuzu and cemu.
I looked through yuzu's SDL motion implementation and it doesn't seem like they are doing anything special.

CrusadingNinja · 2021-09-20T08:27:14Z

Is this still being worked on?

infirit · 2021-09-24T19:38:37Z

Sdl2 gamepad also works on linux so I would like to suggest to also enable it on linux as well. I am playing mario odyssey right now with my pro controller, rumble and motion work without joycond and hidnintendo kernel modules.

v1993 · 2021-09-25T16:14:03Z

@infirit If enabled on Linux, this would render evdev nodes of controller unusable due to limits of HIDAPI. While I understand that not needing to install hid_nintendo is handy, breaking working approach is not nice. In addition, on Linux SDL does not build with HIDAPI support by default (it would need to be explicitly enabled during build like it's done in yuzu) exactly to avoid conflict with evdev, so that's something to consider as well.

Becuase dolphin already supports evdev motion, only hid_nintendo is needed. Joycond and joycond-cemuhook are not.

RinMaru · 2021-11-07T20:21:15Z

While this gets rid of the need for cemuhook and better joy would it also be able to handle TN a wiimotes better since syncing is a problem?

phire · 2021-11-07T20:35:26Z

Becuase dolphin already supports evdev motion, only hid_nintendo is needed

Looks like native support for switch controllers will land in Linux 5.16, so you won't even need an extra kernel module. It will just work with dolphin's evdev.

shuffle2 · 2022-04-05T00:08:43Z

Source/Core/DolphinQt/DolphinQt.vcxproj

@@ -42,6 +42,9 @@
    <Manifest>
      <AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
    </Manifest>
+    <PostBuildEvent>


use a Copy task instead (see the end of this file , and add it there)

shuffle2 · 2022-04-05T00:08:46Z

Source/Core/DolphinLib.vcxproj

@@ -22,6 +22,11 @@
  <ImportGroup Condition="'$(Platform)'=='ARM64'">
    <Import Project="DolphinLib.ARM64.props" />
  </ImportGroup>
+  <ItemDefinitionGroup>


this belongs in base.props

shuffle2 · 2022-04-05T00:09:07Z

.gitignore

@@ -24,6 +24,9 @@ Source/Core/Common/scmrev.h
 *.VC.db
 .vs*/
 /Source/enc_temp_folder/
+/Source/x64


should be removed (after changing to own vcxproj file)

shuffle2 · 2022-04-05T00:09:48Z

Source/UnitTests/UnitTests.vcxproj

@@ -30,6 +30,9 @@
      <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Console</SubSystem>
    </Link>
+    <PostBuildEvent>
+      <Command>copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\SDL2.dll" "$(OutDir)"</Command>


should be removed

shuffle2 · 2022-04-05T00:10:26Z

Source/dolphin-emu.sln

 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86


revert these x86 additions, remove x86 config from sdl

shuffle2 · 2022-04-05T00:13:09Z

tbh I'm not a fan of adding sdl, but i made some comments for improvements of the pr anyway
sdl just seems like bloat and cruft.

edit: ah, i missed that you're using their vcxproj file from the submodule. unfortunately you need to make a version of the vcxproj file modeled after other things in Externals and use that instead. with that in place, can also just staticly link it.

shuffle2 · 2022-07-11T20:58:14Z

this PR should be closed now

SuperSamus · 2022-10-08T19:32:55Z

@infirit If enabled on Linux, this would render evdev nodes of controller unusable due to limits of HIDAPI. While I understand that not needing to install hid_nintendo is handy, breaking working approach is not nice. In addition, on Linux SDL does not build with HIDAPI support by default (it would need to be explicitly enabled during build like it's done in yuzu) exactly to avoid conflict with evdev, so that's something to consider as well.

Becuase dolphin already supports evdev motion, only hid_nintendo is needed. Joycond and joycond-cemuhook are not.

I don't know if it's relevant, but on other emulators, SDL for gamepads is enabled under Linux too.
For example, on DuckStation, Flycast, and PCSX2 (Qt), it's the only input interface available on Linux.
(For the former, only by default.)

lioncash reviewed Aug 6, 2021

View reviewed changes

Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp Outdated Show resolved Hide resolved

Source/Core/InputCommon/ControllerInterface/SDL/SDL.h Outdated Show resolved Hide resolved

jambonmcyeah force-pushed the master branch 2 times, most recently from 2e1d921 to c186c3b Compare August 6, 2021 15:59

jambonmcyeah requested a review from lioncash August 6, 2021 16:09

jambonmcyeah force-pushed the master branch 2 times, most recently from eb70c26 to 3971db9 Compare August 6, 2021 19:38

jambonmcyeah force-pushed the master branch 2 times, most recently from 3d74faf to 36623e2 Compare August 6, 2021 23:00

jambonmcyeah force-pushed the master branch 4 times, most recently from d06f5b6 to fff0333 Compare August 10, 2021 21:40

jambonmcyeah force-pushed the master branch from fff0333 to 80ec347 Compare August 10, 2021 22:05

jambonmcyeah force-pushed the master branch from 80ec347 to 003723c Compare August 10, 2021 22:29

jambonmcyeah added 2 commits November 9, 2021 14:37

Fix CMake builds on Windows

f5aa82c

Add SDL motion input and rumble support

aaadde1

jambonmcyeah force-pushed the master branch 2 times, most recently from e550e3b to f391ce0 Compare November 10, 2021 00:42

Add SDL as a submodule

808d58a

jambonmcyeah force-pushed the master branch from f391ce0 to 808d58a Compare November 10, 2021 05:25

shuffle2 reviewed Apr 5, 2022

View reviewed changes

shuffle2 mentioned this pull request Apr 5, 2022

Sdl motion #10561

Merged

AdmiralCurtiss closed this Jul 11, 2022

Add SDL motion input and rumble support #10000

Add SDL motion input and rumble support #10000

jambonmcyeah commented Aug 6, 2021

jambonmcyeah commented Aug 6, 2021

AdmiralCurtiss commented Aug 6, 2021

jambonmcyeah commented Aug 6, 2021 •

edited

jambonmcyeah commented Aug 6, 2021 •

edited

OatmealDome commented Aug 8, 2021 •

edited

jambonmcyeah commented Aug 10, 2021

jambonmcyeah commented Aug 10, 2021

jambonmcyeah commented Aug 10, 2021

jambonmcyeah commented Aug 11, 2021

Simonx22 commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021 •

edited

jambonmcyeah commented Aug 11, 2021 •

edited

OatmealDome commented Aug 11, 2021

mbc07 commented Aug 11, 2021

mbc07 commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021 •

edited

Simonx22 commented Aug 11, 2021

mbc07 commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021 •

edited

CrusadingNinja commented Sep 20, 2021

infirit commented Sep 24, 2021

v1993 commented Sep 25, 2021

RinMaru commented Nov 7, 2021

phire commented Nov 7, 2021

shuffle2 Apr 5, 2022

shuffle2 Apr 5, 2022

shuffle2 Apr 5, 2022 •

edited

shuffle2 Apr 5, 2022

shuffle2 Apr 5, 2022

shuffle2 commented Apr 5, 2022 •

edited

shuffle2 commented Jul 11, 2022

SuperSamus commented Oct 8, 2022 •

edited

Add SDL motion input and rumble support #10000

Add SDL motion input and rumble support #10000

Conversation

jambonmcyeah commented Aug 6, 2021

jambonmcyeah commented Aug 6, 2021

AdmiralCurtiss commented Aug 6, 2021

jambonmcyeah commented Aug 6, 2021 • edited

jambonmcyeah commented Aug 6, 2021 • edited

OatmealDome commented Aug 8, 2021 • edited

jambonmcyeah commented Aug 10, 2021

jambonmcyeah commented Aug 10, 2021

jambonmcyeah commented Aug 10, 2021

jambonmcyeah commented Aug 11, 2021

Simonx22 commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021 • edited

jambonmcyeah commented Aug 11, 2021 • edited

OatmealDome commented Aug 11, 2021

mbc07 commented Aug 11, 2021

mbc07 commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021 • edited

Simonx22 commented Aug 11, 2021

mbc07 commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021

jambonmcyeah commented Aug 11, 2021 • edited

CrusadingNinja commented Sep 20, 2021

infirit commented Sep 24, 2021

v1993 commented Sep 25, 2021

RinMaru commented Nov 7, 2021

phire commented Nov 7, 2021

shuffle2 Apr 5, 2022

Choose a reason for hiding this comment

shuffle2 Apr 5, 2022

Choose a reason for hiding this comment

shuffle2 Apr 5, 2022 • edited

Choose a reason for hiding this comment

shuffle2 Apr 5, 2022

Choose a reason for hiding this comment

shuffle2 Apr 5, 2022

Choose a reason for hiding this comment

shuffle2 commented Apr 5, 2022 • edited

shuffle2 commented Jul 11, 2022

SuperSamus commented Oct 8, 2022 • edited

jambonmcyeah commented Aug 6, 2021 •

edited

jambonmcyeah commented Aug 6, 2021 •

edited

OatmealDome commented Aug 8, 2021 •

edited

jambonmcyeah commented Aug 11, 2021 •

edited

jambonmcyeah commented Aug 11, 2021 •

edited

jambonmcyeah commented Aug 11, 2021 •

edited

jambonmcyeah commented Aug 11, 2021 •

edited

shuffle2 Apr 5, 2022 •

edited

shuffle2 commented Apr 5, 2022 •

edited

SuperSamus commented Oct 8, 2022 •

edited