mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-28 16:00:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Combine mouse sensitivities for both aim and camera

Browse Source
This commit is contained in:
Irastris
2026-05-27 14:15:26 -04:00
parent 5b3ed263f4
commit 55165679c9
4 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/dusk/settings.h
+2 -4
View File
@@ -198,10 +198,8 @@ struct UserSettings {
ConfigVar<bool> gyroInvertYaw;
ConfigVar<bool> enableMouseCamera;
ConfigVar<bool> enableMouseAim;
ConfigVar<float> mouseAimSensitivityX;
ConfigVar<float> mouseAimSensitivityY;
ConfigVar<float> mouseCameraSensitivityX;
ConfigVar<float> mouseCameraSensitivityY;
ConfigVar<float> mouseAimSensitivity;
ConfigVar<float> mouseCameraSensitivity;
ConfigVar<bool> freeCamera;
ConfigVar<bool> invertCameraXAxis;
ConfigVar<bool> invertCameraYAxis;
src/dusk/mouse.cpp
+4 -4
View File
@@ -101,16 +101,16 @@ void accumulateDeltas(float mx_rel, float my_rel, bool camera_active, bool aim_a
const auto& game = getSettings().game;
if (camera_active) {
s_camera_yaw_rad = -mx_rel * kMousePixelToRad * game.mouseCameraSensitivityX.getValue();
s_camera_pitch_rad = -my_rel * kMousePixelToRad * game.mouseCameraSensitivityY.getValue();
s_camera_yaw_rad = -mx_rel * kMousePixelToRad * game.mouseCameraSensitivity.getValue();
s_camera_pitch_rad = -my_rel * kMousePixelToRad * game.mouseCameraSensitivity.getValue();
s_camera_yaw_rad = game.enableMirrorMode.getValue() ? -s_camera_yaw_rad : s_camera_yaw_rad;
} else {
s_camera_yaw_rad = s_camera_pitch_rad = 0.0f;
}
if (aim_active) {
s_aim_yaw_rad = -mx_rel * kMousePixelToRad * game.mouseAimSensitivityX.getValue();
s_aim_pitch_rad = my_rel * kMousePixelToRad * game.mouseAimSensitivityY.getValue();
s_aim_yaw_rad = -mx_rel * kMousePixelToRad * game.mouseAimSensitivity.getValue();
s_aim_pitch_rad = my_rel * kMousePixelToRad * game.mouseAimSensitivity.getValue();
s_aim_yaw_rad = game.enableMirrorMode.getValue() ? -s_aim_yaw_rad : s_aim_yaw_rad;
} else {
s_aim_yaw_rad = s_aim_pitch_rad = 0.0f;
src/dusk/settings.cpp
+4 -8
View File
@@ -86,10 +86,8 @@ UserSettings g_userSettings = {
.gyroInvertYaw {"game.gyroInvertYaw", false},
.enableMouseCamera {"game.enableMouseCamera", false},
.enableMouseAim {"game.enableMouseAim", false},
.mouseAimSensitivityX {"game.mouseAimSensitivityX", 1.0f},
.mouseAimSensitivityY {"game.mouseAimSensitivityY", 1.0f},
.mouseCameraSensitivityX {"game.mouseCameraSensitivityX", 1.0f},
.mouseCameraSensitivityY {"game.mouseCameraSensitivityY", 1.0f},
.mouseAimSensitivity {"game.mouseAimSensitivity", 1.0f},
.mouseCameraSensitivity {"game.mouseCameraSensitivity", 1.0f},
.freeCamera {"game.freeCamera", false},
.invertCameraXAxis {"game.invertCameraXAxis", false},
.invertCameraYAxis {"game.invertCameraYAxis", false},
@@ -288,10 +286,8 @@ void registerSettings() {
Register(g_userSettings.game.gyroInvertYaw);
Register(g_userSettings.game.enableMouseCamera);
Register(g_userSettings.game.enableMouseAim);
Register(g_userSettings.game.mouseAimSensitivityX);
Register(g_userSettings.game.mouseAimSensitivityY);
Register(g_userSettings.game.mouseCameraSensitivityX);
Register(g_userSettings.game.mouseCameraSensitivityY);
Register(g_userSettings.game.mouseAimSensitivity);
Register(g_userSettings.game.mouseCameraSensitivity);
Register(g_userSettings.game.freeCamera);
Register(g_userSettings.game.debugFlyCam);
Register(g_userSettings.game.debugFlyCamLockEvents);
src/dusk/ui/settings.cpp
+7 -17
View File
@@ -990,28 +990,18 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) {
"Invert horizontal gyro aiming.", [] { return !gyro_enabled(); });
leftPane.add_section("Mouse");
addOption("Mouse Camera", getSettings().game.enableMouseCamera,
"Enables mouse input for controlling the third-person camera.");
addOption("Mouse Aim", getSettings().game.enableMouseAim,
"Enables mouse input 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.");
config_percent_select(leftPane, rightPane, getSettings().game.mouseCameraSensitivityX,
"Mouse Camera X Sensitivity", "Controls horizontal mouse camera sensitivity.", 25, 400, 5,
[] {
return !getSettings().game.enableMouseCamera;
});
config_percent_select(leftPane, rightPane, getSettings().game.mouseCameraSensitivityY,
"Mouse Camera Y Sensitivity", "Controls vertical mouse camera sensitivity.", 25, 400, 5,
[] {
return !getSettings().game.enableMouseCamera;
});
config_percent_select(leftPane, rightPane, getSettings().game.mouseAimSensitivityX,
"Mouse Aim X Sensitivity", "Controls horizontal mouse aim sensitivity.", 25, 400, 5,
[] { return !getSettings().game.enableMouseAim; });
config_percent_select(leftPane, rightPane, getSettings().game.mouseAimSensitivityY,
"Mouse Aim Y Sensitivity", "Controls vertical mouse aim sensitivity.", 25, 400, 5,
addOption("Mouse Camera", getSettings().game.enableMouseCamera,
"Enables mouse input for controlling the third-person camera.");
config_percent_select(leftPane, rightPane, getSettings().game.mouseAimSensitivity,
"Mouse Aim Sensitivity", "Controls mouse aim sensitivity.", 25, 400, 5,
[] { return !getSettings().game.enableMouseAim; });
config_percent_select(leftPane, rightPane, getSettings().game.mouseCameraSensitivity,
"Mouse Camera Sensitivity", "Controls mouse camera sensitivity.", 25, 400, 5,
[] { return !getSettings().game.enableMouseCamera; });
leftPane.add_section("Tools");
addOption("Turbo Key", getSettings().game.enableTurboKeybind,