Support controller analog triggers by Lgt2x · Pull Request #600 · DescentDevelopers/Descent3

Lgt2x · 2024-09-22T19:51:40Z

Pull Request Type

Description

Add support for analog triggers, such as those used in the xbox controllers. They are detected as axis by SDL2, but are unidirectional, so they should be mapped to functions expecting a [-1;1] range. We allow mapping them to other buttons. Button controls have also been made analog when it made sense, so triggers can have fine control over movement.

Left to do in this MR: implement ctTime and ctDownCount for analog triggers so they can be used for weapons, refine detection threshold for mappings

The controller code is a mess, this will need other passes to make it better.

Related Issues

Close #496

Screenshots (if applicable)

Checklist

I have tested my changes locally and verified that they work as intended.
I have documented any new or modified functionality.
I have reviewed the changes to ensure they do not introduce any unnecessary complexity or duplicate code.
I understand that by submitting this pull request, I am agreeing to license my contributions under the project's license.

Additional Comments

Descent3/args.cpp

winterheart · 2024-09-24T17:16:08Z

I've tested on Xbox Series controller on Linux, there some improvements compared to current main branch, no uncontrolled rotation anymore, but now my ship is constantly moving up, like left trigger constantly pushed. If I push right trigger, ship goes down, but after release ship again goes up.

Lgt2x · 2024-09-24T17:36:55Z

I've tested on Xbox Series controller on Linux, there some improvements compared to current main branch, no uncontrolled rotation anymore, but now my ship is constantly moving up, like left trigger constantly pushed. If I push right trigger, ship goes down, but after release ship again goes up.

You've mapped triggers to something like pitch? It's possible that default deadzone is too high, how does it go when you increase it here ? https://github.com/DescentDevelopers/Descent3/pull/600/files#diff-7f049cd870d2530a44058475c2746ae9ba2f1bddf3995756061cf046e72fc2cfR1332

And the mapping part goes smoothly?

winterheart · 2024-09-24T17:49:06Z

Just retested on new pilot with default configs, same thing happens.

Lgt2x · 2024-09-24T18:23:00Z

Just retested on new pilot with default configs, same thing happens.

Ok then that's the analog trigger detection threshold that's not set correctly. Migrating to the SDL2 GameController API will solve that

Lgt2x · 2024-10-06T21:37:19Z

I could reproduce the problem on an actual Xbox series controller, it's a problem with the default mapping that uses a trigger as an axis. While it can be remapped easily, short-term solution is to disable this default mapping. I'll update the PR later.

Lgt2x · 2024-10-15T20:06:34Z

Alright, finally came around to finishing this one! I'm not done at all with controllers, but at least I'm building familiarity. Triggers can be mapped to direction functions, and default mappings should not force them to be real axis anymore. XBox series controller should now work properly. Firing with trigger buttons is not supported yet.

Ready for anyone to test & review!

Default axis mappings could map controller triggers to functions that require bi-directional axis to work properly

Lgt2x · 2024-10-27T22:22:01Z

@winterheart could you please review and test this branch? thanks!

winterheart

New code eliminates uncontrolled rotation and elevate movements. There no forward / back, up / down movements on default joystick configuration, but I think we can do more polishing in SDL_GameController() enabling iteration.

ddio/sdlcontroller.cpp

winterheart · 2024-10-27T22:46:07Z

lib/joystick.h

 #define JOYSTICK_H

 #include <cstdint>
+#include <vector>


vector declaration is unused in header.

Lgt2x · 2024-10-28T20:41:03Z

New code eliminates uncontrolled rotation and elevate movements. There no forward / back, up / down movements on default joystick configuration, but I think we can do more polishing in SDL_GameController() enabling iteration.

Indeed, that's the very next steps, but out of scope for this PR. Movement mapped manually is always better than uncontrolled movement that you cannot remap. Comments fixed otherwise. Thanks for testing!

pzychotic · 2024-10-31T17:29:28Z

Descent3/Controls.cpp

+  if (ctl_hlb.value > 0.0f)
+    controls->heading_thrust += ctl_hlb.value;
+  if (ctl_hrb.value > 0.0f)
+    controls->heading_thrust -= ctl_hlb.value;


Is this a copy-paste error? Shouldn't it be -= ctl_hrb.value?

pzychotic · 2024-10-31T17:30:06Z

Descent3/Controls.cpp

+  if (ctl_blb.value > 0.0f)
+    controls->bank_thrust += ctl_blb.value;
+  if (ctl_brb.value > 0.0f)
+    controls->bank_thrust -= ctl_blb.value;


Same for -= ctl_brb.value?

pzychotic · 2024-10-31T17:39:57Z

I tried with a PS5 controller on Windows 11.

Analog triggers are detected as normal axis. The initialVal in

Descent3/ddio/sdljoy.cpp

Line 167 in deb9749

if (initialVal < -32768 * 0.75) {

is always 0 for all axis/triggers.

If I try to force the code to go into that if clause for analog triggers, they don't work at all. I can't even assign them in config menu.
If I don't do that, they always fire and trying to assign a control for an axis always assigns the left trigger/ U-axis.

I haven't found anything yet, to distinguish an analog trigger from an axis for the PS5 controller.

Lgt2x · 2024-10-31T22:48:08Z

Ugh that's a pain... No choice but to use the SDL2 game controller database to identify axes then. I'll update this PR for that.

Lgt2x · 2025-02-15T10:56:46Z

Closing this, I'll rework the PR after we have SDL3 (#663) with the new game controller API

Lgt2x marked this pull request as draft September 22, 2024 19:53

Lgt2x changed the title ~~Draft: Support analog triggers for Xbox controller~~ Draft: Support controller analog triggers Sep 22, 2024

Lgt2x mentioned this pull request Sep 22, 2024

[Runtime Issue]: XBox Controller registers triggers as [-1, 1] axes instead of [0, 1] #496

Open

20 tasks

winterheart reviewed Sep 24, 2024

View reviewed changes

Descent3/args.cpp Show resolved Hide resolved

Descent3/args.cpp Show resolved Hide resolved

Lgt2x force-pushed the analog-triggers branch 2 times, most recently from 3a52d34 to 4ec78bf Compare October 15, 2024 20:02

Lgt2x marked this pull request as ready for review October 15, 2024 20:02

Lgt2x changed the title ~~Draft: Support controller analog triggers~~ Support controller analog triggers Oct 23, 2024

Lgt2x force-pushed the analog-triggers branch from 4ec78bf to 12ab2a7 Compare October 27, 2024 22:19

Lgt2x added 10 commits October 27, 2024 23:20

Report bidirectional axis and triggers separately

ca89b4d

Forward axis trigger information to sdlcontroller.cpp

47be84b

Don't allow mapping trigger axis to 2-directional controls

c8987c8

Factorize get_controller_value for axis inputs

a95988d

Support mapping controller analog triggers to buttons

f9098b9

Read trigger analog value in the SDL adapter

e17871d

Make button for direction control analog

0d848ec

Read properly trigger analog value

09dc2ac

Unset default axis mappings that are analog triggers

e71e0d4

Default axis mappings could map controller triggers to functions that require bi-directional axis to work properly

POV: return analog value the same as digital

8879f62

winterheart reviewed Oct 27, 2024

View reviewed changes

Lgt2x force-pushed the analog-triggers branch from 12ab2a7 to deb9749 Compare October 28, 2024 20:38

Lgt2x added 2 commits October 28, 2024 21:39

Remove extra debug

f8a06f7

Replace C 'fabs' by 'std::abs'

deb9749

pzychotic reviewed Oct 31, 2024

View reviewed changes

Lgt2x closed this Feb 15, 2025

Conversation

Lgt2x commented Sep 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Type

Description

Related Issues

Screenshots (if applicable)

Checklist

Additional Comments

Uh oh!

Uh oh!

Uh oh!

winterheart commented Sep 24, 2024

Uh oh!

Lgt2x commented Sep 24, 2024

Uh oh!

winterheart commented Sep 24, 2024

Uh oh!

Lgt2x commented Sep 24, 2024

Uh oh!

Lgt2x commented Oct 6, 2024

Uh oh!

Lgt2x commented Oct 15, 2024

Uh oh!

Lgt2x commented Oct 27, 2024

Uh oh!

winterheart left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

winterheart Oct 27, 2024

Choose a reason for hiding this comment

Uh oh!

Lgt2x commented Oct 28, 2024

Uh oh!

pzychotic Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pzychotic Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pzychotic commented Oct 31, 2024

Uh oh!

Lgt2x commented Oct 31, 2024

Uh oh!

Lgt2x commented Feb 15, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Lgt2x commented Sep 22, 2024 •

edited

Loading

pzychotic Oct 31, 2024 •

edited

Loading

pzychotic Oct 31, 2024 •

edited

Loading