From 61baad1ed42ad11e894b5c66d507bd23be20b469 Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Mon, 26 Feb 2018 17:12:48 -0800
Subject: [PATCH] update remote-dynamic-body to use networked-aframe
ownership-transfer events
---
package.json | 4 ++--
src/components/remote-dynamic-body.js | 10 ++--------
templates/room.hbs | 2 +-
yarn.lock | 10 +++++-----
4 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/package.json b/package.json
index 1f68e7055..0a4def780 100644
--- a/package.json
+++ b/package.json
@@ -13,14 +13,14 @@
"aframe-extras": "^3.12.4",
"aframe-input-mapping-component": "https://github.com/johnshaughnessy/aframe-input-mapping-component#23e2855",
"aframe-physics-extras": "https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash",
- "aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#fix/3.0.0_fixes",
+ "aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#bug/3.0.1",
"aframe-teleport-controls": "https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin",
"aframe-xr": "github:brianpeiris/aframe-xr#3162aed",
"extract-text-webpack-plugin": "^3.0.2",
"material-design-lite": "^1.3.0",
"minijanus": "^0.4.0",
"naf-janus-adapter": "^0.3.0",
- "networked-aframe": "https://github.com/brianpeiris/networked-aframe#3d64f88",
+ "networked-aframe": "https://github.com/infinitelee/networked-aframe#feature/ownership-transfer-events",
"nipplejs": "^0.6.7",
"query-string": "^5.0.1",
"raven-js": "^3.20.1",
diff --git a/src/components/remote-dynamic-body.js b/src/components/remote-dynamic-body.js
index 59c06be53..1d1920698 100644
--- a/src/components/remote-dynamic-body.js
+++ b/src/components/remote-dynamic-body.js
@@ -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 {
diff --git a/templates/room.hbs b/templates/room.hbs
index a5102a716..16bb4ca23 100644
--- a/templates/room.hbs
+++ b/templates/room.hbs
@@ -35,7 +35,7 @@
<body>
<div id="loader"></div>
<a-scene
- physics="debug: true;"
+ physics
networked-scene="adapter: janus;
audio: true;
debug: true;
diff --git a/yarn.lock b/yarn.lock
index f749c77f0..e8eef3831 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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"
--
GitLab