fix wasm

jan-tennert · Oct 17, 2023 · 2dd7340 · 2dd7340
1 parent 42f3596
commit 2dd7340
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 2 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -75,7 +75,7 @@ fn main() {
                 ..default()
             })
         ) 
-        .add_plugins(WorldInspectorPlugin::new())
+      //  .add_plugins(WorldInspectorPlugin::new())
   //      .add_plugins(DefaultPickingPlugins)
         .add_plugins(LockOnPlugin)
         .add_plugins(SerializationPlugin)

diff --git a/src/ui.rs b/src/ui.rs
@@ -33,7 +33,7 @@ pub struct UIPlugin;
 impl Plugin for UIPlugin {
     fn build(&self, app: &mut App) {
         app
-        //    .add_plugins(EguiPlugin)
+            .add_plugins(EguiPlugin)
             .register_type::<SimTime>()
             .init_resource::<SimTime>()
             .add_plugins(BlockInputPlugin)

diff --git a/wasm/index.html b/wasm/index.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+
+<body style="margin: 0px;">
+  <script type="module">
+    import './restart-audio-context.js'
+    import init from './bevy_game.js'
+
+    init().catch((error) => {
+      if (!error.message.startsWith("Using exceptions for control flow, don't mind me. This isn't actually an error!")) {
+        throw error;
+      }
+    });
+  </script>
+</body>
+
+</html>
diff --git a/wasm/restart-audio-context.js b/wasm/restart-audio-context.js
@@ -0,0 +1,57 @@
+// taken from https://developer.chrome.com/blog/web-audio-autoplay/#moving-forward
+(function () {
+    // An array of all contexts to resume on the page
+    const audioContextList = [];
+
+    // An array of various user interaction events we should listen for
+    const userInputEventNames = [
+        'click',
+        'contextmenu',
+        'auxclick',
+        'dblclick',
+        'mousedown',
+        'mouseup',
+        'pointerup',
+        'touchend',
+        'keydown',
+        'keyup',
+    ];
+
+    // A proxy object to intercept AudioContexts and
+    // add them to the array for tracking and resuming later
+    self.AudioContext = new Proxy(self.AudioContext, {
+        construct(target, args) {
+            const result = new target(...args);
+            audioContextList.push(result);
+            return result;
+        },
+    });
+
+    // To resume all AudioContexts being tracked
+    function resumeAllContexts(event) {
+        let count = 0;
+
+        audioContextList.forEach(context => {
+            if (context.state !== 'running') {
+                context.resume();
+            } else {
+                count++;
+            }
+        });
+
+        // If all the AudioContexts have now resumed then we
+        // unbind all the event listeners from the page to prevent
+        // unnecessary resume attempts
+        if (count == audioContextList.length) {
+            userInputEventNames.forEach(eventName => {
+                document.removeEventListener(eventName, resumeAllContexts);
+            });
+        }
+    }
+
+    // We bind the resume function for each user interaction
+    // event on the page
+    userInputEventNames.forEach(eventName => {
+        document.addEventListener(eventName, resumeAllContexts);
+    });
+})();