mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-29 15:23:01 -04:00
Add mouse input option for the third-person camera (#1011)
* Untie existing mouse logic from gyro * A bit more mouse cleanup before I start building off it * Rebase and last bit of cleanup * Fix rebase mistake, don't apply invertFirstPerson to gyro or mouse input * Remove the deprecated ImGui toast system * Add Mouse Camera option in preparation for its use * WIP, add mouse controls for the third-person camera * Various helpText revisions * Enable free camera on horseback * Untie mouse camera and free camera options Either being enabled now allows the underlying freecam logic to run * Allow simultaneous C-stick and mouse input * Combine mouse sensitivities for both aim and camera * Add option for inverting mouse Y * Refactor cursor visibility handling * Tighten aim capture condition and constrain cursor to window region * Tidying my trash * Last bit of housekeeping so I'm satisfied * Don't write code while sleep deprived * Fix my sloppy merge and a few helpText updates * Disable control stick aim when mouse aim is active * Use same conditions for cursor grabbing as for capture
This commit is contained in:
+10
-2
@@ -75,7 +75,6 @@ UserSettings g_userSettings = {
|
||||
.midnasLamentNonStop {"game.midnasLamentNonStop", false},
|
||||
|
||||
// Input
|
||||
.gyroMode {"game.gyroMode", GyroMode::Sensor},
|
||||
.enableGyroAim {"game.enableGyroAim", false},
|
||||
.enableGyroRollgoal {"game.enableGyroRollgoal", false},
|
||||
.gyroSensitivityX {"game.gyroSensitivityX", 1.0f},
|
||||
@@ -85,6 +84,11 @@ UserSettings g_userSettings = {
|
||||
.gyroDeadband {"game.gyroDeadband", 0.04f},
|
||||
.gyroInvertPitch {"game.gyroInvertPitch", false},
|
||||
.gyroInvertYaw {"game.gyroInvertYaw", false},
|
||||
.enableMouseCamera {"game.enableMouseCamera", false},
|
||||
.enableMouseAim {"game.enableMouseAim", false},
|
||||
.mouseAimSensitivity {"game.mouseAimSensitivity", 1.0f},
|
||||
.mouseCameraSensitivity {"game.mouseCameraSensitivity", 1.0f},
|
||||
.invertMouseY {"game.invertMouseY", false},
|
||||
.freeCamera {"game.freeCamera", false},
|
||||
.invertCameraXAxis {"game.invertCameraXAxis", false},
|
||||
.invertCameraYAxis {"game.invertCameraYAxis", false},
|
||||
@@ -281,7 +285,6 @@ void registerSettings() {
|
||||
Register(g_userSettings.game.alwaysGreatspin);
|
||||
Register(g_userSettings.game.invincibleEnemies);
|
||||
Register(g_userSettings.game.enableFrameInterpolation);
|
||||
Register(g_userSettings.game.gyroMode);
|
||||
Register(g_userSettings.game.enableGyroAim);
|
||||
Register(g_userSettings.game.enableGyroRollgoal);
|
||||
Register(g_userSettings.game.gyroSensitivityX);
|
||||
@@ -291,6 +294,11 @@ void registerSettings() {
|
||||
Register(g_userSettings.game.gyroSmoothing);
|
||||
Register(g_userSettings.game.gyroInvertPitch);
|
||||
Register(g_userSettings.game.gyroInvertYaw);
|
||||
Register(g_userSettings.game.enableMouseCamera);
|
||||
Register(g_userSettings.game.enableMouseAim);
|
||||
Register(g_userSettings.game.mouseAimSensitivity);
|
||||
Register(g_userSettings.game.mouseCameraSensitivity);
|
||||
Register(g_userSettings.game.invertMouseY);
|
||||
Register(g_userSettings.game.freeCamera);
|
||||
Register(g_userSettings.game.debugFlyCam);
|
||||
Register(g_userSettings.game.debugFlyCamLockEvents);
|
||||
|
||||
Reference in New Issue
Block a user