From 85f10e8583fdd1e610780f2f67881d1e6ec1973b Mon Sep 17 00:00:00 2001
From: Kevin Lee <kevin@infinite-lee.com>
Date: Wed, 21 Feb 2018 18:15:37 -0800
Subject: [PATCH] upgrade to aframe master
---
package.json | 4 ++--
src/components/cursor-hand.js | 4 ++--
templates/room.hbs | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index e2d2ddfb5..f237ac272 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,10 @@
"prettier": "prettier --write src/**/*.js"
},
"dependencies": {
- "aframe": "https://github.com/aframevr/aframe#ba2a2875ef7662a3bf4aec86f82d4f972684216a",
+ "aframe": "https://github.com/aframevr/aframe",
"aframe-extras": "^3.12.4",
"aframe-input-mapping-component": "https://github.com/johnshaughnessy/aframe-input-mapping-component#23e2855",
- "aframe-physics-extras": "^0.1.2",
+ "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-teleport-controls": "https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin",
"extract-text-webpack-plugin": "^3.0.2",
diff --git a/src/components/cursor-hand.js b/src/components/cursor-hand.js
index 84a6a5fc4..89e4eb48d 100644
--- a/src/components/cursor-hand.js
+++ b/src/components/cursor-hand.js
@@ -14,11 +14,11 @@ AFRAME.registerComponent("cursor-hand", {
this.enabled = true;
document.addEventListener("mousedown", (e) => {
- this.data.cursor.emit("action_grab");
+ this.data.cursor.emit("action_grab", {});
});
document.addEventListener("mouseup", (e) => {
- this.data.cursor.emit("action_release");
+ this.data.cursor.emit("action_release", {});
});
document.addEventListener("wheel", (e) => {
diff --git a/templates/room.hbs b/templates/room.hbs
index 538303652..094a9e879 100644
--- a/templates/room.hbs
+++ b/templates/room.hbs
@@ -168,8 +168,9 @@
<a-entity
id="head"
camera
+ position="0 1.6 0"
personal-space-bubble
- look-controls
+ look-controls="pointerLockEnabled: true;"
networked="template: #head-template; showLocalTemplate: false;"
>
<a-entity
--
GitLab