Merge pull request #627 from Armored-Dragon/inspect.js-compatibility

inspect.js and mouselook.js compatibility
overte-org · Sep 22, 2023 · 7dc4fad · 7dc4fad
2 parents 4969933 + bc37dd0
commit 7dc4fad
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/scripts/system/controllers/mouseLook.js b/scripts/system/controllers/mouseLook.js
@@ -18,6 +18,8 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
 
     var tempOff = false;
 
+    var altMode = false;
+
     Camera.mouseLookChanged.connect(onMouseLookChanged);
 
     function onMouseLookChanged(newMouseLook) {
@@ -41,6 +43,21 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
 
     function onKeyPressEvent(event) {
         if (!hmd){
+            if(event.isAlt){
+                if (keysOnOverlay) return;
+                if (!mouseLookEnabled) return;
+                mouseLookOff();
+                Window.displayAnnouncement("Mouse look: Temporarily OFF");
+                tempOff = true;
+                altMode = true;
+            }
+            if (tempOff && altMode && ['left', 'right', 'up', 'down', 'esc', 'w', 'a', 's', 'd'].includes(event.text.toLowerCase())){
+                if (keysOnOverlay) return;
+                if (!mouseLookEnabled) return;
+                mouseLookOn();
+                tempOff = false;
+                altMode = false
+            }
             if (event.text.toLowerCase() === 'm') {
                 if (!keysOnOverlay) {
                     if (mouseLookEnabled) {
@@ -174,6 +191,12 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
         }
     }
 
+    Messages.messageReceived.connect(onMessageReceived);
+    function onMessageReceived(channel, message, sender, localOnly) {
+        if (channel === "Hifi-Away-Enable")
+            if (message === 'enable') mouseLookOn();
+    }
+
     Script.scriptEnding.connect(onScriptEnding);
 
     function onScriptEnding() {