mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-04 08:48:45 -04:00
Add mouse as a gyro input source (#720)
* Add mouse as a gyro input source * Revisions * Grammar
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
#include "m_Do/m_Do_main.h"
|
||||
#include "menu_bar.hpp"
|
||||
#include "number_button.hpp"
|
||||
#include "menu_bar.hpp"
|
||||
#include "pane.hpp"
|
||||
#include "prelaunch.hpp"
|
||||
#include "ui.hpp"
|
||||
@@ -42,6 +43,11 @@ constexpr std::array kFpsOverlayCornerNames = {
|
||||
"Bottom Right",
|
||||
};
|
||||
|
||||
constexpr std::array kGyroInputModeLabels = {
|
||||
"Sensor",
|
||||
"Mouse",
|
||||
};
|
||||
|
||||
bool try_parse_backend(std::string_view backend, AuroraBackend& outBackend) {
|
||||
if (backend == "auto") {
|
||||
outBackend = BACKEND_AUTO;
|
||||
@@ -200,7 +206,9 @@ int float_setting_percent(ConfigVar<float>& var) {
|
||||
}
|
||||
|
||||
bool gyro_enabled() {
|
||||
return getSettings().game.enableGyroAim || getSettings().game.enableGyroRollgoal;
|
||||
return getSettings().game.enableGyroAim ||
|
||||
(getSettings().game.enableGyroRollgoal &&
|
||||
getSettings().game.gyroMode.getValue() != GyroMode::Mouse);
|
||||
}
|
||||
|
||||
struct ConfigBoolProps {
|
||||
@@ -634,12 +642,50 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) {
|
||||
[] { return !getSettings().game.freeCamera; });
|
||||
|
||||
leftPane.add_section("Gyro");
|
||||
leftPane.register_control(
|
||||
leftPane.add_select_button({
|
||||
.key = "Gyro Input Method",
|
||||
.getValue =
|
||||
[] {
|
||||
const auto mode = getSettings().game.gyroMode.getValue();
|
||||
const auto idx = static_cast<size_t>(mode);
|
||||
return Rml::String{kGyroInputModeLabels[idx]};
|
||||
},
|
||||
.isModified =
|
||||
[] {
|
||||
return getSettings().game.gyroMode.getValue() !=
|
||||
getSettings().game.gyroMode.getDefaultValue();
|
||||
},
|
||||
}),
|
||||
rightPane, [](Pane& pane) {
|
||||
for (size_t i = 0; i < kGyroInputModeLabels.size(); i++) {
|
||||
pane
|
||||
.add_button({
|
||||
.text = Rml::String{kGyroInputModeLabels[i]},
|
||||
.isSelected =
|
||||
[i] {
|
||||
return getSettings().game.gyroMode.getValue() == static_cast<GyroMode>(i);
|
||||
},
|
||||
})
|
||||
.on_pressed([i] {
|
||||
mDoAud_seStartMenu(kSoundItemChange);
|
||||
const GyroMode mode = static_cast<GyroMode>(i);
|
||||
getSettings().game.gyroMode.setValue(mode);
|
||||
config::Save();
|
||||
});
|
||||
}
|
||||
pane.add_rml(
|
||||
"<br/><b>Sensor</b> reads motion directly from a supported controller's gyro via SDL.<br/>"
|
||||
"<br/><b>Mouse</b> treats mouse input as gyro, intended for use with the Steam Deck.<br/>"
|
||||
"<br/>Mouse input cannot currently be used with Gyro Rollgoal.");
|
||||
});
|
||||
addOption("Gyro Aim", getSettings().game.enableGyroAim,
|
||||
"Enables gyro controls while in look mode, aiming a hawk, and aiming "
|
||||
"supported items.<br/><br/>Supported items include the Slingshot, Gale Boomerang, "
|
||||
"Hero's Bow, Clawshot(s), Ball and Chain, and Dominion Rod.");
|
||||
addOption("Gyro Rollgoal", getSettings().game.enableGyroRollgoal,
|
||||
"Enables gyro controls for Rollgoal in Hena's Cabin.");
|
||||
"Enables gyro controls for Rollgoal in Hena's Cabin.",
|
||||
[] { return getSettings().game.gyroMode.getValue() == GyroMode::Mouse; });
|
||||
config_percent_select(leftPane, rightPane, getSettings().game.gyroSensitivityY,
|
||||
"Gyro Pitch Sensitivity", "Controls vertical gyro aiming sensitivity.", 25, 400, 5,
|
||||
[] { return !gyro_enabled(); });
|
||||
@@ -648,7 +694,11 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) {
|
||||
[] { return !gyro_enabled(); });
|
||||
config_percent_select(leftPane, rightPane, getSettings().game.gyroSensitivityRollgoal,
|
||||
"Rollgoal Sensitivity", "Controls how strongly gyro input tilts the Rollgoal table.",
|
||||
25, 400, 5, [] { return !getSettings().game.enableGyroRollgoal; });
|
||||
25, 400, 5,
|
||||
[] {
|
||||
return !getSettings().game.enableGyroRollgoal ||
|
||||
getSettings().game.gyroMode.getValue() == GyroMode::Mouse;
|
||||
});
|
||||
config_percent_select(leftPane, rightPane, getSettings().game.gyroDeadband, "Gyro Deadband",
|
||||
"Ignores small gyro movement to reduce drift and jitter.", 0, 50, 1,
|
||||
[] { return !gyro_enabled(); });
|
||||
|
||||
Reference in New Issue
Block a user