littlejsengine 1.16.1 → 1.17.1

package/src/engineInput.js

@@ -55,6 +55,10 @@ let inputPreventDefault = true;
  *  @memberof Input */
 let gamepadPrimary = 0;
 
+/** True if a touch device has been detected
+ *  @memberof Input */
+const isTouchDevice = !headlessMode && window.ontouchstart !== undefined;
+
 /** Prevents input continuing to the default browser handling
  *  This is useful to disable for html menus so the browser can handle input normally
  *  @param {boolean} preventDefault
@@ -253,10 +257,6 @@ function gamepadStickCount(gamepad=gamepadPrimary)
     return gamepadStickData[gamepad]?.length ?? 0;
 }
 
-/** True if a touch device has been detected
- *  @memberof Input */
-const isTouchDevice = !headlessMode && window.ontouchstart !== undefined;
-
 ///////////////////////////////////////////////////////////////////////////////
 
 /** Pulse the vibration hardware if it exists
@@ -265,7 +265,7 @@ const isTouchDevice = !headlessMode && window.ontouchstart !== undefined;
 function vibrate(pattern=100)
 {
     ASSERT(isNumber(pattern) || isArray(pattern), 'pattern must be a number or array');
-    vibrateEnable && !headlessMode && navigator && navigator.vibrate && navigator.vibrate(pattern);
+    vibrateEnable && !headlessMode && navigator?.vibrate?.(pattern);
 }
 
 /** Cancel any ongoing vibration
@@ -365,8 +365,7 @@ function inputInit()
     }
     function onMouseDown(e)
     {
-        if (isTouchDevice && touchInputEnable)
-            return;
+        if (isTouchDevice && touchInputEnable) return;
 
         // fix stalled audio requiring user interaction
         if (soundEnable && !headlessMode && audioContext && !audioIsRunning())
@@ -384,8 +383,8 @@ function inputInit()
     }
     function onMouseUp(e)
     {
-        if (isTouchDevice && touchInputEnable)
-            return;
+        if (isTouchDevice && touchInputEnable) return;
+
         inputData[0][e.button] = (inputData[0][e.button]&2) | 4;
     }
     function onMouseMove(e)
@@ -417,8 +416,7 @@ function inputInit()
         let wasTouching;
         function handleTouch(e)
         {
-            if (!touchInputEnable)
-                return;
+            if (!touchInputEnable) return;
 
             // route touch to gamepad
             if (touchGamepadEnable)
@@ -482,8 +480,7 @@ function inputInit()
             }
 
             // don't process touch gamepad if paused
-            if (paused)
-                return;
+            if (paused) return;
 
             // get center of left and right sides
             const stickCenter = vec2(touchGamepadSize, mainCanvasSize.y-touchGamepadSize);
@@ -573,8 +570,7 @@ function inputUpdate()
         // update touch gamepad if enabled
         if (touchGamepadEnable && isTouchDevice)
         {
-            if (!touchGamepadTimer.isSet())
-                return;
+            if (!touchGamepadTimer.isSet()) return;
 
             // read virtual analog stick
             gamepadPrimary = 0; // touch gamepad uses index 0
@@ -612,12 +608,10 @@ function inputUpdate()
         }
 
         // return if gamepads are disabled or not supported
-        if (!gamepadsEnable || !navigator || !navigator.getGamepads)
-            return;
+        if (!gamepadsEnable || !navigator || !navigator.getGamepads) return;
 
         // only poll gamepads when focused or in debug mode
-        if (!debug && !document.hasFocus())
-            return;
+        if (!debug && !document.hasFocus()) return;
 
         // poll gamepads
         const maxGamepads = 8;
@@ -654,8 +648,7 @@ function inputUpdate()
                 data[j] = button.pressed ? wasDown ? 1 : 3 : wasDown ? 4 : 0;
 
                 // check for any input on this gamepad, analog must be full press
-                if (button.pressed)
-                if (!button.value || button.value > .9)
+                if (button.pressed && (!button.value || button.value > .9))
                     hadInput = true;
             }
             
@@ -684,7 +677,7 @@ function inputUpdate()
             }
 
             // copy dpad to left analog stick when pressed
-            if (gamepadDirectionEmulateStick && !dpad.isZero())
+            if (gamepadDirectionEmulateStick && (dpad.x || dpad.y))
                 sticks[0] = dpad.clampLength();
         }
 
@@ -713,13 +706,11 @@ function inputRender()
     function touchGamepadRender()
     {
         if (!touchInputEnable || !isTouchDevice || headlessMode) return;
-        if (!touchGamepadEnable || !touchGamepadTimer.isSet())
-            return;
+        if (!touchGamepadEnable || !touchGamepadTimer.isSet()) return;
 
         // fade off when not touching or paused
         const alpha = percent(touchGamepadTimer.get(), 4, 3);
-        if (!alpha || paused)
-            return;
+        if (!alpha || paused) return;
 
         // setup the canvas
         const context = mainContext;