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

Merge remote-tracking branch 'origin/feature/mute-mic-component'

parents e793f546 aa05a2e2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
public/index.html
+ 1
− 1
View file @ 3f0e5c50
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</head> </head>
<body> <body>
<a-scene networked-scene="adapter: easyrtc; audio: false; debug: true;"> <a-scene networked-scene="adapter: easyrtc; audio: true; debug: true;">
<a-assets> <a-assets>
<img id="grid" src="assets/grid.png" crossorigin="anonymous"> <img id="grid" src="assets/grid.png" crossorigin="anonymous">
<img id="sky" src="https://cdn.aframe.io/360-image-gallery-boilerplate/img/sechelt.jpg" crossorigin="anonymous" /> <img id="sky" src="https://cdn.aframe.io/360-image-gallery-boilerplate/img/sechelt.jpg" crossorigin="anonymous" />
......
src/components/mute-mic.js 0 → 100644
+ 53
− 0
View file @ 3f0e5c50
AFRAME.registerComponent("mute-mic", {
schema: {
eventSrc: { type: "selectorAll" },
toggleEvent: { type: "string" },
muteEvent: { type: "string" },
unmuteEvent: { type: "string" }
},
init: function() {
var eventSrcElements = this.data.eventSrc || [this.el];
this.onToggle = this.onToggle.bind(this);
this.onMute = this.onMute.bind(this);
this.onUnmute = this.onUnmute.bind(this);
for (var el of eventSrcElements) {
if (this.data.toggleEvent !== "") {
el.addEventListener(this.data.toggleEvent, this.onToggle, false);
}
if (this.data.muteEvent !== "") {
el.addEventListener(this.data.muteEvent, this.onMute, false);
}
if (this.data.unmuteEvent !== "") {
el.addEventListener(this.data.unmuteEvent, this.onUnmute, false);
}
}
},
onToggle: function () {
if (this.el.is('muted')) {
NAF.connection.adapter.enableMicrophone(true);
this.el.removeState('muted');
} else {
NAF.connection.adapter.enableMicrophone(false);
this.el.addState('muted');
}
},
onMute: function () {
if (!this.el.is('muted')) {
NAF.connection.adapter.enableMicrophone(false);
this.el.addState('muted');
}
},
onUnmute: function () {
if (this.el.is('muted')) {
NAF.connection.adapter.enableMicrophone(true);
this.el.removeState('muted');
}
}
});
src/index.js
+ 1
− 0
View file @ 3f0e5c50
...@@ -4,3 +4,4 @@ require("aframe-teleport-controls"); ...@@ -4,3 +4,4 @@ require("aframe-teleport-controls");
// require("./components/rig-selector"); // require("./components/rig-selector");
require("./components/axis-dpad"); require("./components/axis-dpad");
require("./components/snap-rotation"); require("./components/snap-rotation");
require("./components/mute-mic");
yarn.lock
+ 12
− 12
View file @ 3f0e5c50
...@@ -1008,8 +1008,8 @@ express@^4.10.7: ...@@ -1008,8 +1008,8 @@ express@^4.10.7:
vary "~1.1.1" vary "~1.1.1"
express@^4.15.5: express@^4.15.5:
version "4.16.0" version "4.16.1"
resolved "https://registry.yarnpkg.com/express/-/express-4.16.0.tgz#b519638e4eb58e7178c81b498ef22f798cb2e255" resolved "https://registry.yarnpkg.com/express/-/express-4.16.1.tgz#6b33b560183c9b253b7b62144df33a4654ac9ed0"
dependencies: dependencies:
accepts "~1.3.4" accepts "~1.3.4"
array-flatten "1.1.1" array-flatten "1.1.1"
...@@ -1034,8 +1034,8 @@ express@^4.15.5: ...@@ -1034,8 +1034,8 @@ express@^4.15.5:
qs "6.5.1" qs "6.5.1"
range-parser "~1.2.0" range-parser "~1.2.0"
safe-buffer "5.1.1" safe-buffer "5.1.1"
send "0.16.0" send "0.16.1"
serve-static "1.13.0" serve-static "1.13.1"
setprototypeof "1.1.0" setprototypeof "1.1.0"
statuses "~1.3.1" statuses "~1.3.1"
type-is "~1.6.15" type-is "~1.6.15"
...@@ -1792,7 +1792,7 @@ negotiator@0.6.1: ...@@ -1792,7 +1792,7 @@ negotiator@0.6.1:
"networked-aframe@https://github.com/netpro2k/networked-aframe#dev": "networked-aframe@https://github.com/netpro2k/networked-aframe#dev":
version "0.3.0" version "0.3.0"
resolved "https://github.com/netpro2k/networked-aframe#d442c03ee7bce9fc168c1396a234b91249986b6e" resolved "https://github.com/netpro2k/networked-aframe#0f092c7a21e1c77f1bb1b879febafad76b6fd26b"
dependencies: dependencies:
aframe-lerp-component "^1.1.0" aframe-lerp-component "^1.1.0"
aframe-template-component "3.2.1" aframe-template-component "3.2.1"
...@@ -2383,9 +2383,9 @@ send@0.15.6: ...@@ -2383,9 +2383,9 @@ send@0.15.6:
range-parser "~1.2.0" range-parser "~1.2.0"
statuses "~1.3.1" statuses "~1.3.1"
send@0.16.0: send@0.16.1:
version "0.16.0" version "0.16.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.16.0.tgz#16338dbb9a2ede4ad57b48420ec3b82d8e80a57b" resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
dependencies: dependencies:
debug "2.6.9" debug "2.6.9"
depd "~1.1.1" depd "~1.1.1"
...@@ -2410,14 +2410,14 @@ serve-static@1.12.6, serve-static@^1.8.0: ...@@ -2410,14 +2410,14 @@ serve-static@1.12.6, serve-static@^1.8.0:
parseurl "~1.3.2" parseurl "~1.3.2"
send "0.15.6" send "0.15.6"
serve-static@1.13.0: serve-static@1.13.1:
version "1.13.0" version "1.13.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.0.tgz#810c91db800e94ba287eae6b4e06caab9fdc16f1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
dependencies: dependencies:
encodeurl "~1.0.1" encodeurl "~1.0.1"
escape-html "~1.0.3" escape-html "~1.0.3"
parseurl "~1.3.2" parseurl "~1.3.2"
send "0.16.0" send "0.16.1"
set-blocking@^2.0.0, set-blocking@~2.0.0: set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0" version "2.0.0"
......
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