toggle virtual gamepad for host

n-at · Sep 6, 2023 · cd7a4b6 · cd7a4b6
1 parent b0abb4e
commit cd7a4b6
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 14 deletions.
diff --git a/assets/netplay-ui-client.js b/assets/netplay-ui-client.js
@@ -793,17 +793,17 @@
     }
 
     function virtualGamepadLoad() {
-        if (window.localStorage && window.localStorage.playtimeNetplayVirtualGamepad) {
-            virtualGamepadVisible = (window.localStorage.playtimeNetplayVirtualGamepad === 'true');
+        if (window.localStorage && window.localStorage.playtimeVirtualGamepad) {
+            virtualGamepadVisible = (window.localStorage.playtimeVirtualGamepad === 'true');
         } else {
-            virtualGamepadVisible = _isMobile();
+            virtualGamepadVisible = window.isMobile();
         }
     }
 
     function virtualGamepadToggle() {
         virtualGamepadVisible = !virtualGamepadVisible;
         if (window.localStorage) {
-            window.localStorage.playtimeNetplayVirtualGamepad = (virtualGamepadVisible ? 'true' : 'false');
+            window.localStorage.playtimeVirtualGamepad = (virtualGamepadVisible ? 'true' : 'false');
         }
         virtualGamepadShow(netplay.getPlayer());
     }
@@ -968,11 +968,4 @@
         game.height = window.innerHeight - headerOffset;
     }
 
-    //https://stackoverflow.com/questions/11381673/detecting-a-mobile-browser
-    function _isMobile() {
-        let check = false;
-        (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
-        return check;
-    }
-
 })();
diff --git a/assets/play-virtual-gamepad.js b/assets/play-virtual-gamepad.js
@@ -0,0 +1,31 @@
+(() => {
+
+    window.addEventListener('load', () => {
+        if (!window.isMobile()) {
+            document.getElementById('play-virtual-gamepad-control').classList.add('d-none');
+        } else {
+            document.getElementById('play-virtual-gamepad-toggle').addEventListener('click', virtualGamepadToggle);
+            virtualGamepadLoad();
+        }
+    });
+
+    let virtualGamepadVisible = false;
+
+    function virtualGamepadLoad() {
+        virtualGamepadVisible = window.isMobile();
+        virtualGamepadShow();
+    }
+
+    function virtualGamepadToggle() {
+        virtualGamepadVisible = !virtualGamepadVisible;
+        if (window.localStorage) {
+            window.localStorage.playtimeVirtualGamepad = (virtualGamepadVisible ? 'true' : 'false');
+        }
+        virtualGamepadShow();
+    }
+
+    function virtualGamepadShow() {
+        EJS_emulator.toggleVirtualGamepad(virtualGamepadVisible);
+    }
+
+})();
diff --git a/assets/ui-utils.js b/assets/ui-utils.js
@@ -144,4 +144,11 @@
         window.localStorage.playtimeNetplayPlayer = JSON.stringify(players);
     };
 
+    //https://stackoverflow.com/questions/11381673/detecting-a-mobile-browser
+    window.isMobile = () => {
+        let check = false;
+        (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
+        return check;
+    }
+
 })();
diff --git a/templates/includes/play_control_scheme.twig b/templates/includes/play_control_scheme.twig
@@ -7,6 +7,11 @@
             </div>
             <div class="modal-body">
 
+                <div id="play-virtual-gamepad-control" class="text-center">
+                    <button type="button" id="play-virtual-gamepad-toggle" class="btn btn-outline-primary">Toggle virtual gamepad</button>
+                    <hr>
+                </div>
+
                 <ul class="nav nav-underline mb-3" id="control-scheme-tabs" role="tablist">
                     <li class="nav-item" role="presentation">
                         <button class="nav-link active"

diff --git a/templates/includes/play_default_options.twig b/templates/includes/play_default_options.twig
@@ -22,7 +22,7 @@
         const netplayName = window.localStorage.playtimeNetplayName;
         const netplayPlayer = window.localStorage.playtimeNetplayPlayer;
         const netplayControls = window.localStorage.playtimeNetplayControls;
-        const netplayVirtualGamepad = window.localStorage.playtimeNetplayVirtualGamepad;
+        const virtualGamepad = window.localStorage.playtimeVirtualGamepad;
         window.localStorage.clear();
         if (darkTheme) {
             window.localStorage.__dark_theme = darkTheme;
@@ -36,8 +36,8 @@
         if (netplayControls) {
             window.localStorage.playtimeNetplayControls = netplayControls;
         }
-        if (netplayVirtualGamepad) {
-            window.localStorage.playtimeNetplayVirtualGamepad = netplayVirtualGamepad;
+        if (virtualGamepad) {
+            window.localStorage.playtimeVirtualGamepad = virtualGamepad;
         }
 
         const coreSettings = {

diff --git a/templates/play.twig b/templates/play.twig
@@ -93,6 +93,7 @@
     <script src="/assets/emulatorjs/loader.js"></script>
     <script src="/assets/ui-utils.js"></script>
     <script src="/assets/state.js"></script>
+    <script src="/assets/play-virtual-gamepad.js"></script>
 
     {% include "includes/play_control_scheme.twig" %}
     {% include "includes/play_load_state.twig" %}