Merge branch 'master' of github.com:mozilla/mr-social-client into bug/allow-denial-of-mic

README.md

-# Mozilla Social Mixed Reality Client
+# Mozilla Social Mixed Reality Client [![Build Status](https://travis-ci.org/mozilla/mr-social-client.svg?branch=master)](https://travis-ci.org/mozilla/mr-social-client)
 
 A prototype client demonstrating a multi-user experience in WebVR. Built with
 [A-Frame](https://github.com/aframevr/aframe/)

package.json

@@ -33,7 +33,7 @@
     "mobile-detect": "^1.4.1",
     "moving-average": "^1.0.0",
     "naf-janus-adapter": "https://github.com/mozilla/naf-janus-adapter#feature/disconnect",
-    "networked-aframe": "https://github.com/mozillareality/networked-aframe#mr-social-client/master",
+    "networked-aframe": "https://github.com/networked-aframe/networked-aframe",
     "nipplejs": "^0.6.7",
     "query-string": "^5.0.1",
     "raven-js": "^3.20.1",

src/components/gltf-model-plus.js

@@ -270,7 +270,7 @@ AFRAME.registerComponent("gltf-model-plus", {
       this.el.emit("model-loaded", { format: "gltf", model: this.model });
     } catch (e) {
       console.error("Failed to load glTF model", e.message, this);
-      this.emit("model-error", { format: "gltf", src });
+      this.el.emit("model-error", { format: "gltf", src });
     }
   },
 

src/hub.html

@@ -18,6 +18,7 @@
     <audio id="test-tone" src="./assets/sfx/tone.ogg"></audio>
 
     <a-scene
+        networked-scene="adapter: janus; audio: true; debug: true; connectOnLoad: false;"
         physics
         mute-mic="eventSrc: a-scene; toggleEvents: action_mute"
 

src/hub.js

@@ -127,7 +127,6 @@ async function enterScene(mediaStream, enterInVR, janusRoomId) {
   const scene = document.querySelector("a-scene");
   const playerRig = document.querySelector("#player-rig");
   document.querySelector("a-scene canvas").classList.remove("blurred");
-  registerNetworkSchemas();
 
   if (enterInVR) {
     scene.enterVR();
@@ -138,10 +137,6 @@ async function enterScene(mediaStream, enterInVR, janusRoomId) {
   document.querySelector("#player-camera").setAttribute("look-controls");
 
   scene.setAttribute("networked-scene", {
-    adapter: "janus",
-    audio: true,
-    debug: true,
-    connectOnLoad: false,
     room: janusRoomId,
     serverURL: process.env.JANUS_SERVER
   });
@@ -249,6 +244,8 @@ const onReady = async () => {
   document.querySelector("a-scene canvas").classList.add("blurred");
   window.APP.scene = scene;
 
+  registerNetworkSchemas();
+
   const uiRoot = mountUI(scene);
 
   getAvailableVREntryTypes().then(availableVREntryTypes => {

yarn.lock

@@ -5249,9 +5249,9 @@ neo-async@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
 
-"networked-aframe@https://github.com/mozillareality/networked-aframe#mr-social-client/master":
-  version "0.5.1"
-  resolved "https://github.com/mozillareality/networked-aframe#5d2f50ddf65140f0ae671b2b53c1c667de18dca5"
+"networked-aframe@https://github.com/networked-aframe/networked-aframe":
+  version "0.6.0"
+  resolved "https://github.com/networked-aframe/networked-aframe#be5b2e949ec63fc44a1c6ab40b627cee5fda057e"
   dependencies:
     aframe-lerp-component "^1.1.0"
     easyrtc "1.1.0"