From caa7cb53618460742be7157f8353f617451b6815 Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Fri, 9 Mar 2018 17:55:04 -0800
Subject: [PATCH] use latest fixes for templates
---
package.json | 1 -
src/components/remote-dynamic-body.js | 10 ----------
src/network-schemas.js | 2 +-
src/room.html | 3 +++
src/room.js | 2 +-
yarn.lock | 24 ++++++++++++------------
6 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/package.json b/package.json
index bec01a4eb..48ebe05ee 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,6 @@
"react-dom": "^16.1.1",
"react-router-dom": "^4.2.2",
"super-hands": "https://github.com/infinitelee/aframe-super-hands-component#feature/set-grab-target",
- "react-router-dom": "^4.2.2",
"webrtc-adapter": "^6.0.2"
},
"devDependencies": {
diff --git a/src/components/remote-dynamic-body.js b/src/components/remote-dynamic-body.js
index 49dc0fbe4..3d2a1dc7e 100644
--- a/src/components/remote-dynamic-body.js
+++ b/src/components/remote-dynamic-body.js
@@ -8,7 +8,6 @@ AFRAME.registerComponent("remote-dynamic-body", {
init: function() {
this.counter = this.data.counter.components["networked-counter"];
- this.timer = 0;
this.hand = null;
NAF.utils.getNetworkedEntity(this.el).then(networkedEl => {
@@ -17,16 +16,8 @@ AFRAME.registerComponent("remote-dynamic-body", {
this.el.setAttribute("body", "type: dynamic; mass: 0");
this.el.setAttribute("material", "color: white")
} else {
- this.el.setAttribute("body", `type: dynamic; mass: ${this.data.mass};`);
this.counter.register(networkedEl);
- this.timer = Date.now();
}
-
- if (this.data.grabbable)
- this.el.setAttribute("grabbable", "")
-
- if (this.data.stretchable)
- this.el.setAttribute("stretchable", "")
});
this.el.addEventListener("grab-start", e => {
@@ -38,7 +29,6 @@ AFRAME.registerComponent("remote-dynamic-body", {
this.el.emit("grab-end", {hand: this.hand});
this.hand = null;
this.counter.deregister(this.el);
- this.timer = 0;
this.el.setAttribute("material", "color: white")
});
},
diff --git a/src/network-schemas.js b/src/network-schemas.js
index 652fa6c70..4632a5933 100644
--- a/src/network-schemas.js
+++ b/src/network-schemas.js
@@ -51,7 +51,7 @@ function registerNetworkSchemas() {
});
NAF.schemas.add({
- template: "#physics-cube",
+ template: "#interactable-template",
components: ["position", "rotation", "scale"]
});
}
diff --git a/src/room.html b/src/room.html
index 17d8b32bb..2f45bd2ea 100644
--- a/src/room.html
+++ b/src/room.html
@@ -93,6 +93,9 @@
remote-dynamic-body="counter: #counter; mass: 5;"
scale="0.25 0.25 0.25"
material="color: green"
+ body="type: dynamic; mass: 5;"
+ grabbable
+ stretchable
></a-entity>
</template>
diff --git a/src/room.js b/src/room.js
index 9880056a0..f8dd6580f 100644
--- a/src/room.js
+++ b/src/room.js
@@ -63,7 +63,6 @@ AFRAME.registerInputActivator("reverseY", ReverseY);
AFRAME.registerInputActions(inGameActions, "default");
AFRAME.registerInputMappings(config);
-registerNetworkSchemas();
registerTelemetry();
async function shareMedia(audio, video) {
@@ -170,5 +169,6 @@ function onConnect() {
}
document.addEventListener("DOMContentLoaded", () => {
+ registerNetworkSchemas();
document.querySelector("a-scene").addEventListener("loaded", onSceneLoad);
});
diff --git a/yarn.lock b/yarn.lock
index 2b0a88e87..06ea6f3c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21,10 +21,10 @@ accepts@1.3.3:
negotiator "0.6.1"
accepts@~1.3.4:
- version "1.3.4"
- resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
dependencies:
- mime-types "~2.1.16"
+ mime-types "~2.1.18"
negotiator "0.6.1"
acorn-dynamic-import@^3.0.0:
@@ -4709,7 +4709,7 @@ miller-rabin@^4.0.0:
version "1.33.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
version "2.1.18"
resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
dependencies:
@@ -4934,7 +4934,7 @@ neo-async@^2.5.0:
"networked-aframe@https://github.com/mozillareality/networked-aframe#mr-social-client/master":
version "0.5.1"
- resolved "https://github.com/mozillareality/networked-aframe#71eac3b7fff0c41be5021efa6cc7b5329536b1e4"
+ resolved "https://github.com/mozillareality/networked-aframe#5d2f50ddf65140f0ae671b2b53c1c667de18dca5"
dependencies:
aframe-lerp-component "^1.1.0"
easyrtc "1.1.0"
@@ -6526,7 +6526,7 @@ serve-index@^1.7.2:
mime-types "~2.1.17"
parseurl "~1.3.2"
-serve-static@1.13.1, serve-static@^1.8.0:
+serve-static@1.13.1:
version "1.13.1"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
dependencies:
@@ -6535,7 +6535,7 @@ serve-static@1.13.1, serve-static@^1.8.0:
parseurl "~1.3.2"
send "0.16.1"
-serve-static@^1.10.0:
+serve-static@^1.10.0, serve-static@^1.8.0:
version "1.13.2"
resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
dependencies:
@@ -6881,14 +6881,14 @@ static-extend@^0.1.1:
define-property "^0.2.5"
object-copy "^0.1.0"
-"statuses@>= 1.3.1 < 2", statuses@~1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-
-statuses@~1.4.0:
+"statuses@>= 1.3.1 < 2", statuses@~1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+statuses@~1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+
stdout-stream@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
--
GitLab