From 5e80bbf8bc26e59a48e0c832c6196a981f2c611c Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Mon, 2 Apr 2018 14:20:17 -0700
Subject: [PATCH] Point at netwworked-aframe master
---
package.json | 2 +-
src/hub.html | 1 +
src/hub.js | 7 ++-----
yarn.lock | 6 +++---
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
index 71e501b59..f0dab93e1 100644
--- a/package.json
+++ b/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",
diff --git a/src/hub.html b/src/hub.html
index ad2b769bb..bed3a730c 100644
--- a/src/hub.html
+++ b/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"
diff --git a/src/hub.js b/src/hub.js
index a99ba8b0d..f9b327c97 100644
--- a/src/hub.js
+++ b/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
});
@@ -247,6 +242,8 @@ const onReady = async () => {
document.querySelector("a-scene canvas").classList.add("blurred");
window.APP.scene = scene;
+ registerNetworkSchemas();
+
const uiRoot = mountUI(scene);
getAvailableVREntryTypes().then(availableVREntryTypes => {
diff --git a/yarn.lock b/yarn.lock
index 6d7eff665..615503871 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5239,9 +5239,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"
--
GitLab