Merge pull request #10146 from missionfloyd/gamepad-option

Fix gamepad navigation

javascript/imageviewerGamepad.js

@@ -1,36 +1,57 @@
-    let delay = 350//ms
+window.addEventListener('gamepadconnected', (e) => {
-    window.addEventListener('gamepadconnected', (e) => {
+    const index = e.gamepad.index;
-        console.log("Gamepad connected!")
+    let isWaiting = false;
-        const gamepad = e.gamepad;
+    setInterval(async () => {
-        setInterval(() => {
+        if (!opts.js_modal_lightbox_gamepad || isWaiting) return;
-            const xValue = gamepad.axes[0].toFixed(2);
+        const gamepad = navigator.getGamepads()[index];
-            if (xValue < -0.3) {
+        const xValue = gamepad.axes[0];
-                modalPrevImage(e);
+        if (xValue <= -0.3) {
-            } else if (xValue > 0.3) {
-                modalNextImage(e);
-            }
-
-        }, delay);
-    });
-
-
-    /*
-    Primarily for vr controller type pointer devices.
-    I use the wheel event because there's currently no way to do it properly with web xr.
-     */
-
-    let isScrolling = false;
-    window.addEventListener('wheel', (e) => {
-        if (isScrolling) return;
-        isScrolling = true;
-
-        if (e.deltaX <= -0.6) {
             modalPrevImage(e);
-        } else if (e.deltaX >= 0.6) {
+            isWaiting = true;
+        } else if (xValue >= 0.3) {
             modalNextImage(e);
+            isWaiting = true;
         }
+        if (isWaiting) {
+            await sleepUntil(() => {
+                const xValue = navigator.getGamepads()[index].axes[0]
+                if (xValue < 0.3 && xValue > -0.3) {
+                    return true;
+                }
+            }, opts.js_modal_lightbox_gamepad_repeat);
+            isWaiting = false;
+        }
+    }, 10);
+});
 
-        setTimeout(() => {
+/*
-            isScrolling = false;
+Primarily for vr controller type pointer devices.
-        }, delay);
+I use the wheel event because there's currently no way to do it properly with web xr.
-    });
+ */
+let isScrolling = false;
+window.addEventListener('wheel', (e) => {
+    if (!opts.js_modal_lightbox_gamepad || isScrolling) return;
+    isScrolling = true;
+
+    if (e.deltaX <= -0.6) {
+        modalPrevImage(e);
+    } else if (e.deltaX >= 0.6) {
+        modalNextImage(e);
+    }
+
+    setTimeout(() => {
+        isScrolling = false;
+    }, opts.js_modal_lightbox_gamepad_repeat);
+});
+
+function sleepUntil(f, timeout) {
+    return new Promise((resolve) => {
+        const timeStart = new Date();
+        const wait = setInterval(function() {
+            if (f() || new Date() - timeStart > timeout) {
+                clearInterval(wait);
+                resolve();
+            }
+        }, 20);
+    });
+}

modules/shared.py

@@ -400,6 +400,8 @@ options_templates.update(options_section(('ui', "User interface"), {
     "font": OptionInfo("", "Font for image grids that have text"),
     "js_modal_lightbox": OptionInfo(True, "Enable full page image viewer"),
     "js_modal_lightbox_initially_zoomed": OptionInfo(True, "Show images zoomed in by default in full page image viewer"),
+    "js_modal_lightbox_gamepad": OptionInfo(True, "Navigate image viewer with gamepad"),
+    "js_modal_lightbox_gamepad_repeat": OptionInfo(250, "Gamepad repeat period, in milliseconds"),
     "show_progress_in_title": OptionInfo(True, "Show generation progress in window title."),
     "samplers_in_dropdown": OptionInfo(True, "Use dropdown for sampler selection instead of radio group"),
     "dimensions_and_batch_together": OptionInfo(True, "Show Width/Height and Batch sliders in same row"),