Skip to content
Snippets Groups Projects
Commit aba6f6c8 authored by netpro2k's avatar netpro2k
Browse files

Allow specifying room id in url

parent 8a6130cc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
package.json
+ 5
− 2
View file @ aba6f6c8
...@@ -8,13 +8,16 @@ ...@@ -8,13 +8,16 @@
"build": "webpack --config webpack.prod.js", "build": "webpack --config webpack.prod.js",
"prettier": "prettier --write src/**/*.js" "prettier": "prettier --write src/**/*.js"
}, },
"pre-commit": ["prettier"], "pre-commit": [
"prettier"
],
"dependencies": { "dependencies": {
"aframe-input-mapping-component": "https://github.com/fernandojsg/aframe-input-mapping-component", "aframe-input-mapping-component": "https://github.com/fernandojsg/aframe-input-mapping-component",
"aframe-teleport-controls": "https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin", "aframe-teleport-controls": "https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin",
"naf-janus-adapter": "^0.1.3", "naf-janus-adapter": "^0.1.3",
"networked-aframe": "https://github.com/netpro2k/networked-aframe#feature/register-adapter", "networked-aframe": "https://github.com/netpro2k/networked-aframe#feature/register-adapter",
"pleasejs": "^0.4.2" "pleasejs": "^0.4.2",
"query-string": "^5.0.1"
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^6.26.0", "babel-core": "^6.26.0",
......
public/index.html
+ 9
− 8
View file @ aba6f6c8
...@@ -7,13 +7,14 @@ ...@@ -7,13 +7,14 @@
</head> </head>
<body> <body>
<a-scene networked-scene=" <a-scene
adapter: janus; networked-scene="adapter: janus;
room: 2; room: 2;
serverURL: wss://quander.me:8989; serverURL: wss://quander.me:8989;
audio: true; audio: true;
debug: true; debug: true;
connectOnLoad: false" mute-mic="eventSrc: a-scene; toggleEvents: action_mute"> connectOnLoad: false;"
mute-mic="eventSrc: a-scene; toggleEvents: action_mute">
<a-assets> <a-assets>
<img id="grid" src="assets/grid.png" crossorigin="anonymous" /> <img id="grid" src="assets/grid.png" crossorigin="anonymous" />
...@@ -80,4 +81,4 @@ ...@@ -80,4 +81,4 @@
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
src/index.js
+ 17
− 4
View file @ aba6f6c8
import queryString from "query-string";
import "networked-aframe"; import "networked-aframe";
import "naf-janus-adapter"; import "naf-janus-adapter";
import "aframe-teleport-controls"; import "aframe-teleport-controls";
...@@ -49,15 +51,26 @@ AFRAME.registerInputMappings({ ...@@ -49,15 +51,26 @@ AFRAME.registerInputMappings({
} }
} }
}); });
window.onSceneLoad = function() {
const promptForName = function() {
var username = generateName(); var username = generateName();
do { do {
username = prompt("Choose a username", username); username = prompt("Choose a username", username);
} while (!(username && username.length)); } while (!(username && username.length));
return username;
};
const qs = queryString.parse(location.search);
window.onSceneLoad = function() {
const scene = document.querySelector("a-scene");
if (qs.room && !isNaN(parseInt(qs.room))) {
scene.setAttribute("networked-scene", "room", parseInt(qs.room));
}
var player = document.getElementById("player-rig"); const username = promptForName(); // promptForName is blocking
var myNametag = player.querySelector(".nametag"); const myNametag = document.querySelector("#player-rig .nametag");
myNametag.setAttribute("text", "value", username); myNametag.setAttribute("text", "value", username);
document.querySelector("a-scene").components["networked-scene"].connect(); scene.components["networked-scene"].connect();
}; };
yarn.lock
+ 16
− 0
View file @ aba6f6c8
...@@ -1376,6 +1376,10 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: ...@@ -1376,6 +1376,10 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
deep-equal@^1.0.1: deep-equal@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
...@@ -3174,6 +3178,14 @@ qs@~6.4.0: ...@@ -3174,6 +3178,14 @@ qs@~6.4.0:
version "6.4.0" version "6.4.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
query-string@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.0.1.tgz#6e2b86fe0e08aef682ecbe86e85834765402bd88"
dependencies:
decode-uri-component "^0.2.0"
object-assign "^4.1.0"
strict-uri-encode "^1.0.0"
querystring-es3@^0.2.0: querystring-es3@^0.2.0:
version "0.2.1" version "0.2.1"
resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
...@@ -3672,6 +3684,10 @@ stream-http@^2.3.1: ...@@ -3672,6 +3684,10 @@ stream-http@^2.3.1:
to-arraybuffer "^1.0.0" to-arraybuffer "^1.0.0"
xtend "^4.0.0" xtend "^4.0.0"
strict-uri-encode@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
string-width@^1.0.1, string-width@^1.0.2: string-width@^1.0.1, string-width@^1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment