Skip to content
Snippets Groups Projects
Commit 61baad1e authored by Kevin Lee's avatar Kevin Lee
Browse files

update remote-dynamic-body to use networked-aframe ownership-transfer events

parent a480a82c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/components/remote-dynamic-body.js
+ 2
− 8
View file @ 61baad1e
......@@ -26,23 +26,18 @@ AFRAME.registerComponent("remote-dynamic-body", {
this.timer = Date.now();
}
this.wasMine = this._isMine();
this.networkedEl.addEventListener("grab-start", e => {
this._onGrabStart(e);
});
},
tick: function(t) {
if (this.wasMine && !this._isMine()) {
this.wasMine = false;
this.networkedEl.addEventListener("ownership-lost", e => {
this.networkedEl.setAttribute("body", "mass: 0");
this.networkedEl.emit("grab-end", {hand: this.hand})
this.hand = null;
this.counter.deregister(this.networkedEl);
this.timer = 0;
this.el.setAttribute("color", "white")
}
});
},
_onGrabStart: function(e) {
......@@ -50,7 +45,6 @@ AFRAME.registerComponent("remote-dynamic-body", {
if (!this._isMine()) {
if (this.networked.takeOwnership()) {
this.networkedEl.setAttribute("body", `mass: ${this.data.mass};`);
this.wasMine = true;
this.counter.register(this.networkedEl);
this.el.setAttribute("color", "green")
} else {
......
templates/room.hbs
+ 1
− 1
View file @ 61baad1e
......@@ -35,7 +35,7 @@
<body>
<div id="loader"></div>
<a-scene
physics="debug: true;"
physics
networked-scene="adapter: janus;
audio: true;
debug: true;
......
yarn.lock
+ 5
− 5
View file @ 61baad1e
......@@ -79,9 +79,9 @@ aframe-physics-system@^1.4.3:
cannon "github:donmccurdy/cannon.js#v0.6.2-dev1"
three-to-cannon "^1.1.1"
"aframe-physics-system@https://github.com/infinitelee/aframe-physics-system#fix/3.0.0_fixes":
version "3.0.0"
resolved "https://github.com/infinitelee/aframe-physics-system#2552d24277a18302968738b4f6a85fc1df6f6acc"
"aframe-physics-system@https://github.com/infinitelee/aframe-physics-system#bug/3.0.1":
version "3.0.1"
resolved "https://github.com/infinitelee/aframe-physics-system#c7c33ec4b459689b953742911e337793d7da2994"
dependencies:
browserify "^14.3.0"
budo "^10.0.3"
......@@ -3839,9 +3839,9 @@ negotiator@0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
"networked-aframe@https://github.com/brianpeiris/networked-aframe#3d64f88":
"networked-aframe@https://github.com/infinitelee/networked-aframe#feature/ownership-transfer-events":
version "0.5.1"
resolved "https://github.com/brianpeiris/networked-aframe#3d64f888925a2936a6507f656079157cec1a94e9"
resolved "https://github.com/infinitelee/networked-aframe#3f72baf7eeda597568f2248b331243c82665506f"
dependencies:
aframe-lerp-component "^1.1.0"
aframe-template-component "3.2.1"
......
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