Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support controller analog triggers #600

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Support controller analog triggers #600

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ca89b4d
Report bidirectional axis and triggers separately
Lgt2x Sep 22, 2024
47be84b
Forward axis trigger information to sdlcontroller.cpp
Lgt2x Sep 22, 2024
c8987c8
Don't allow mapping trigger axis to 2-directional controls
Lgt2x Sep 22, 2024
a95988d
Factorize get_controller_value for axis inputs
Lgt2x Sep 22, 2024
f9098b9
Support mapping controller analog triggers to buttons
Lgt2x Sep 22, 2024
e17871d
Read trigger analog value in the SDL adapter
Lgt2x Sep 22, 2024
0d848ec
Make button for direction control analog
Lgt2x Sep 22, 2024
09dc2ac
Read properly trigger analog value
Lgt2x Sep 22, 2024
e71e0d4
Unset default axis mappings that are analog triggers
Lgt2x Oct 15, 2024
8879f62
POV: return analog value the same as digital
Lgt2x Oct 15, 2024
f8a06f7
Remove extra debug
Lgt2x Oct 15, 2024
deb9749
Replace C 'fabs' by 'std::abs'
Lgt2x Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions Descent3/Controls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Descent 3
* Descent 3
* Copyright (C) 2024 Parallax Software
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -879,25 +879,25 @@ void DoControllerMovement(game_controls *controls) {
ct_packet ctl_pub, ctl_pdb, ctl_hlb, ctl_hrb, ctl_blb, ctl_brb;

// read controls
Controller->get_packet(ctfFORWARD_THRUSTAXIS, &ctl_z);
Controller->get_packet(ctfUP_THRUSTAXIS, &ctl_y);
Controller->get_packet(ctfRIGHT_THRUSTAXIS, &ctl_x);
Controller->get_packet(ctfPITCH_DOWNAXIS, &ctl_p);
Controller->get_packet(ctfBANK_RIGHTAXIS, &ctl_b);
Controller->get_packet(ctfHEADING_RIGHTAXIS, &ctl_h);
Controller->get_packet(ctfUP_BUTTON, &ctl_povu);
Controller->get_packet(ctfDOWN_BUTTON, &ctl_povd);
Controller->get_packet(ctfRIGHT_BUTTON, &ctl_povr);
Controller->get_packet(ctfLEFT_BUTTON, &ctl_povl);
Controller->get_packet(ctfFORWARD_BUTTON, &ctl_fb);
Controller->get_packet(ctfREVERSE_BUTTON, &ctl_rb);
Controller->get_packet(ctfAFTERBURN_BUTTON, &ctl_afterburn);
Controller->get_packet(ctfHEADING_LEFTBUTTON, &ctl_hlb);
Controller->get_packet(ctfHEADING_RIGHTBUTTON, &ctl_hrb);
Controller->get_packet(ctfPITCH_UPBUTTON, &ctl_pub);
Controller->get_packet(ctfPITCH_DOWNBUTTON, &ctl_pdb);
Controller->get_packet(ctfBANK_LEFTBUTTON, &ctl_blb);
Controller->get_packet(ctfBANK_RIGHTBUTTON, &ctl_brb);
Controller->get_packet(ctfFORWARD_THRUSTAXIS, &ctl_z, ctAnalog);
Controller->get_packet(ctfUP_THRUSTAXIS, &ctl_y, ctAnalog);
Controller->get_packet(ctfRIGHT_THRUSTAXIS, &ctl_x, ctAnalog);
Controller->get_packet(ctfPITCH_DOWNAXIS, &ctl_p, ctAnalog);
Controller->get_packet(ctfBANK_RIGHTAXIS, &ctl_b, ctAnalog);
Controller->get_packet(ctfHEADING_RIGHTAXIS, &ctl_h, ctAnalog);
Controller->get_packet(ctfUP_BUTTON, &ctl_povu, ctAnalog);
Controller->get_packet(ctfDOWN_BUTTON, &ctl_povd, ctAnalog);
Controller->get_packet(ctfRIGHT_BUTTON, &ctl_povr, ctAnalog);
Controller->get_packet(ctfLEFT_BUTTON, &ctl_povl, ctAnalog);
Controller->get_packet(ctfFORWARD_BUTTON, &ctl_fb, ctAnalog);
Controller->get_packet(ctfREVERSE_BUTTON, &ctl_rb, ctAnalog);
Controller->get_packet(ctfAFTERBURN_BUTTON, &ctl_afterburn, ctAnalog);
Controller->get_packet(ctfHEADING_LEFTBUTTON, &ctl_hlb, ctAnalog);
Controller->get_packet(ctfHEADING_RIGHTBUTTON, &ctl_hrb, ctAnalog);
Controller->get_packet(ctfPITCH_UPBUTTON, &ctl_pub, ctAnalog);
Controller->get_packet(ctfPITCH_DOWNBUTTON, &ctl_pdb, ctAnalog);
Controller->get_packet(ctfBANK_LEFTBUTTON, &ctl_blb, ctAnalog);
Controller->get_packet(ctfBANK_RIGHTBUTTON, &ctl_brb, ctAnalog);

// do x and y thrust
controls->sideways_thrust += ctl_x.value;
Expand Down Expand Up @@ -935,40 +935,40 @@ void DoControllerMovement(game_controls *controls) {
}

// do button heading
if (ctl_hlb.value)
controls->heading_thrust += (-1.0f);
if (ctl_hrb.value)
controls->heading_thrust += (1.0f);
if (ctl_hlb.value > 0.0f)
controls->heading_thrust += ctl_hlb.value;
if (ctl_hrb.value > 0.0f)
controls->heading_thrust -= ctl_hlb.value;
Copy link
Contributor

@pzychotic pzychotic Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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


// do button pitch
if (ctl_pub.value)
controls->pitch_thrust += (-1.0f);
if (ctl_pdb.value)
controls->pitch_thrust += (1.0f);
if (ctl_pub.value > 0.0f)
controls->pitch_thrust -= ctl_pub.value;
if (ctl_pdb.value > 0.0f)
controls->pitch_thrust += ctl_pdb.value;

// do forward thrust based off of button values.
controls->forward_thrust += ((ctl_fb.value - ctl_rb.value) / Frametime);

// do button banking
if (ctl_blb.value)
controls->bank_thrust += (1.0f);
if (ctl_brb.value)
controls->bank_thrust += (-1.0f);
if (ctl_blb.value > 0.0f)
controls->bank_thrust += ctl_blb.value;
if (ctl_brb.value > 0.0f)
controls->bank_thrust -= ctl_blb.value;
Copy link
Contributor

@pzychotic pzychotic Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for -= ctl_brb.value?


// do button sliding. use control frametime to set sliding times per frame.
// note that vertical and sideways thrusts are dependent on what the keyboard controller
// set these values to. so we save our own slidetimes.
if (ctl_povu.value) {
controls->vertical_thrust += (1.0f);
if (ctl_povu.value > 0.0f) {
controls->vertical_thrust += ctl_povu.value;
}
if (ctl_povd.value) {
controls->vertical_thrust -= (1.0f);
if (ctl_povd.value > 0.0f) {
controls->vertical_thrust -= ctl_povd.value;
}
if (ctl_povr.value) {
controls->sideways_thrust += (1.0f);
if (ctl_povr.value > 0.0f) {
controls->sideways_thrust += ctl_povr.value;
}
if (ctl_povl.value) {
controls->sideways_thrust -= (1.0f);
if (ctl_povl.value > 0.0f) {
controls->sideways_thrust -= ctl_povl.value;
}
}

Expand Down