From 89cf88732ba911d6d6beafba3916e6744f6f8853 Mon Sep 17 00:00:00 2001
From: Brian Peiris <brianpeiris@gmail.com>
Date: Tue, 8 May 2018 15:49:01 -0700
Subject: [PATCH] cleanup
---
src/components/avatar-replay.js | 1 -
src/hub.html | 1 -
src/hub.js | 16 +++++++++-------
src/utils/ios-audio-context-fix.js | 25 -------------------------
4 files changed, 9 insertions(+), 34 deletions(-)
delete mode 100644 src/utils/ios-audio-context-fix.js
diff --git a/src/components/avatar-replay.js b/src/components/avatar-replay.js
index 1ecaf6c88..d29d86087 100644
--- a/src/components/avatar-replay.js
+++ b/src/components/avatar-replay.js
@@ -11,7 +11,6 @@ AFRAME.registerComponent("avatar-replay", {
this._setupController(rightController);
this.el.addEventListener("model-loaded", () => {
- console.log("BPDEBUG avatar replay model loaded", );
const cameraReplayer = camera.components["motion-capture-replayer"];
cameraReplayer.startReplaying(botRecording.camera);
const leftControllerReplayer = leftController.components["motion-capture-replayer"];
diff --git a/src/hub.html b/src/hub.html
index da8107323..a83b156c7 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -17,7 +17,6 @@
<% } else { %>
<script src="https://cdn.rawgit.com/aframevr/aframe/3e7a4b3/dist/aframe-master.js" integrity="sha384-EaMOuyBOi9ERV/lVDwQgz/yFWBDWPsIju5Co6oCZZHXuvbLBO81yPWn80q0BbBn3" crossorigin="anonymous"></script>
<% } %>
- <script>window.logs.enable("naf-janus-adapter:*")</script>
</head>
<body data-html-prefix="<%= HTML_PREFIX %>">
diff --git a/src/hub.js b/src/hub.js
index 116a58d8e..77194dbd5 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -19,7 +19,7 @@ import "webrtc-adapter";
import "aframe-slice9-component";
import "aframe-motion-capture-components";
-import "./utils/ios-audio-context-fix";
+import "./utils/autoplay-audio-context-fix";
import trackpad_dpad4 from "./behaviours/trackpad-dpad4";
import joystick_dpad4 from "./behaviours/joystick-dpad4";
@@ -218,7 +218,10 @@ const onReady = async () => {
document.querySelector("#player-camera").setAttribute("look-controls", "");
- scene.setAttribute("networked-scene", { room: janusRoomId, serverURL: process.env.JANUS_SERVER });
+ scene.setAttribute("networked-scene", {
+ room: janusRoomId,
+ serverURL: process.env.JANUS_SERVER
+ });
scene.setAttribute("stats-plus", false);
@@ -302,10 +305,8 @@ const onReady = async () => {
const interacted = new Promise(resolve => {
window.interacted = resolve;
});
- console.log("BPDEBUG waiting for interaction");
await interacted;
- console.log("BPDEBUG playing audio");
- audio.play().catch(e => console.log(e.toString()));
+ audio.play();
}
if (mediaStream) {
@@ -360,9 +361,10 @@ const onReady = async () => {
const initialEnvironmentEl = document.createElement("a-entity");
initialEnvironmentEl.addEventListener("bundleloaded", () => {
remountUI({ initialEnvironmentLoaded: true });
- // Stop rendering while the UI is up. We restart the render loop in enterScene.
- // Wait a tick plus some margin so that the environments actually render.
+ // We never want to stop the render loop when were running in "bot" mode.
if (!qsTruthy("bot")) {
+ // Stop rendering while the UI is up. We restart the render loop in enterScene.
+ // Wait a tick plus some margin so that the environments actually render.
setTimeout(() => scene.renderer.animate(null), 100);
}
});
diff --git a/src/utils/ios-audio-context-fix.js b/src/utils/ios-audio-context-fix.js
deleted file mode 100644
index 4707a9877..000000000
--- a/src/utils/ios-audio-context-fix.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Mobile Safari will start Audio contexts in a "suspended" state.
- * A user interaction (touch event) is needed in order to resume the AudioContext.
- */
-const iDevices = /\biPhone.*Mobile|\biPod|\biPad|AppleCoreMedia/;
-
-if (iDevices.test(navigator.userAgent) || /Chrome/.test(navigator.userAgent)) {
- document.addEventListener("DOMContentLoaded", () => {
- const ctx = THREE.AudioContext.getContext();
-
- function resume() {
- ctx.resume();
-
- setTimeout(function() {
- if (ctx.state === "running") {
- document.body.removeEventListener("touchend", resume, false);
- document.body.removeEventListener("mouseup", resume, false);
- }
- }, 0);
- }
-
- document.body.addEventListener("touchend", resume, false);
- document.body.addEventListener("mouseup", resume, false);
- });
-}
--
GitLab