Skip to content

Improve Controller LED Control - #2864

Merged
leggettc18 merged 26 commits into
HarbourMasters:developfrom
Malkierian:ps-lightbar-updates
May 28, 2023
Merged

Improve Controller LED Control#2864
leggettc18 merged 26 commits into
HarbourMasters:developfrom
Malkierian:ps-lightbar-updates

Conversation

@Malkierian

@Malkierian Malkierian commented May 9, 2023

Copy link
Copy Markdown
Contributor

Adding extra controls for controller LED functionality. Currently applies to port 1 controller only.

Adds brightness slider. 0% turns off
Adds four options for color source: original tunic colors, current cosmetics tunic colors, health-based, and custom, with color picker.
Prevents options from showing and calculations for LED change function from occurring if port 1 doesn't support setting the LED color.

Build Artifacts

Malkierian and others added 13 commits May 9, 2023 11:18
…he switch statements to lessen potential computational load.
…" button under Settings -> Controller. Renamed "Controller Configuration" to "Configure Controller" and "Customize Game Controls" to "Customize In-game Controls"
Moved controller LED brightness to new LED Colors group in "Customize In-game Controls" menu.

Added combobox to choose between vanilla tunics, cosmetics tunics, health, and custom as color sources.

Added critical health override checkbox to allow display of red when health is low even when other sources are selected.

Port color pickers have not been implemented yet, default color is white.
… application of colors in `OTRControllerCallback` to port 1.
Added custom color picker to port 1 color settings.
@Malkierian
Malkierian marked this pull request as ready for review May 10, 2023 19:32

@briaguya0 briaguya0 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

overall this is looking great. left a couple suggestions in there but nothing huge. i'm also not able to test this so it'd be ideal for someone who can to review/approve

Comment thread soh/soh/Enhancements/controls/GameControlEditor.cpp Outdated
Comment thread soh/soh/Enhancements/controls/GameControlEditor.h Outdated
Comment thread soh/soh/GameMenuBar.cpp Outdated
Comment thread soh/soh/GameMenuBar.cpp Outdated
Comment thread soh/soh/OTRGlobals.cpp Outdated
Comment thread soh/soh/OTRGlobals.cpp Outdated
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
@Malkierian

Copy link
Copy Markdown
Contributor Author

Archez has tested this before and confirmed it all works as expected.

@briaguya0 briaguya0 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

@leggettc18 leggettc18 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Don't have the controllers to test this with but I remember others testing this and saying it worked.

@leggettc18
leggettc18 merged commit 0c7e80a into HarbourMasters:develop May 28, 2023
@Malkierian
Malkierian deleted the ps-lightbar-updates branch May 28, 2023 23:26
@garrettjoecox garrettjoecox added this to the Sulu (7.1.x) milestone Jun 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants