Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1081 from Armored-Dragon/fix/mouselook-ignoring-setting

Browse source 
Fix mouselook ignoring setting.
This commit is contained in:
ksuprynowicz 2024-07-16 23:55:15 +02:00 committed by GitHub
commit d7eb29b665
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/system/controllers/mouseLook.js
View file

@ -31,6 +31,7 @@
// Program ---- // Program ----
function onMouseLookChanged(newMouseLook) { function onMouseLookChanged(newMouseLook) {
disableMouseLook();
mouseLookEnabled = newMouseLook; mouseLookEnabled = newMouseLook;
} }
@ -38,8 +39,6 @@
// Toggle using the m key // Toggle using the m key
if (event.text.toLowerCase() === "m") { if (event.text.toLowerCase() === "m") {
if (Camera.captureMouse) { if (Camera.captureMouse) {
mouseLookActive = false;
Settings.setValue("mouselook-active", false);
disableMouseLook(); disableMouseLook();
} else { } else {
mouseLookActive = true; mouseLookActive = true;
@ -82,12 +81,16 @@
if (hmdActive) return; if (hmdActive) return;
if (tablet.tabletShown) return; if (tablet.tabletShown) return;
if (overlayActive) return; if (overlayActive) return;
if (!mouseLookEnabled) return; // Mouse look disabled via setting
if (!mouseLookActive) return; // Mouse look disabled via the hotkey if (!mouseLookActive) return; // Mouse look disabled via the hotkey
Camera.captureMouse = true; Camera.captureMouse = true;
} }
function disableMouseLook() { function disableMouseLook() {
mouseLookActive = false;
Settings.setValue("mouselook-active", false);
Camera.captureMouse = false; Camera.captureMouse = false;
} }