diff --git a/package.json b/package.json
index b406d749c1d6186e875021204be636304c187427..bbecc28a1de2214af26dbf30b814ab4895c91039 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"aframe-physics-extras": "https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash",
"aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#feature/shape-component",
"aframe-rounded": "^1.0.3",
- "aframe-teleport-controls": "^0.3.1",
+ "aframe-teleport-controls": "https://github.com/mozillareality/aframe-teleport-controls#hubs/master",
"aframe-xr": "github:brianpeiris/aframe-xr#3162aed",
"classnames": "^2.2.5",
"copy-to-clipboard": "^3.0.8",
@@ -41,7 +41,7 @@
"moving-average": "^1.0.0",
"naf-janus-adapter": "^0.6.0",
"networked-aframe": "https://github.com/mozillareality/networked-aframe#mr-social-client/master",
- "nipplejs": "^0.6.7",
+ "nipplejs": "https://github.com/mozillareality/nipplejs#mr-social-client/master",
"phoenix": "^1.3.0",
"query-string": "^5.0.1",
"raven-js": "^3.20.1",
diff --git a/src/components/character-controller.js b/src/components/character-controller.js
index 8da41b1a2e4bf4f3928a8f74b6a521679b11759a..e811dd507bc8f5a0d886b1c912cc7679ebdf55a8 100644
--- a/src/components/character-controller.js
+++ b/src/components/character-controller.js
@@ -5,7 +5,7 @@ const EPS = 10e-6;
// Does not have any type of collisions yet.
AFRAME.registerComponent("character-controller", {
schema: {
- groundAcc: { default: 7 },
+ groundAcc: { default: 5.5 },
easing: { default: 10 },
pivot: { type: "selector" },
snapRotationDegrees: { default: THREE.Math.DEG2RAD * 45 },
@@ -13,6 +13,8 @@ AFRAME.registerComponent("character-controller", {
},
init: function() {
+ this.navGroup;
+ this.navNode;
this.velocity = new THREE.Vector3(0, 0, 0);
this.accelerationInput = new THREE.Vector3(0, 0, 0);
this.pendingSnapRotationMatrix = new THREE.Matrix4();
@@ -21,6 +23,7 @@ AFRAME.registerComponent("character-controller", {
this.snapRotateLeft = this.snapRotateLeft.bind(this);
this.snapRotateRight = this.snapRotateRight.bind(this);
this.setAngularVelocity = this.setAngularVelocity.bind(this);
+ this.handleTeleport = this.handleTeleport.bind(this);
},
update: function() {
@@ -34,6 +37,7 @@ AFRAME.registerComponent("character-controller", {
eventSrc.addEventListener("rotateY", this.setAngularVelocity);
eventSrc.addEventListener("snap_rotate_left", this.snapRotateLeft);
eventSrc.addEventListener("snap_rotate_right", this.snapRotateRight);
+ eventSrc.addEventListener("teleported", this.handleTeleport);
},
pause: function() {
@@ -42,6 +46,7 @@ AFRAME.registerComponent("character-controller", {
eventSrc.removeEventListener("rotateY", this.setAngularVelocity);
eventSrc.removeEventListener("snap_rotate_left", this.snapRotateLeft);
eventSrc.removeEventListener("snap_rotate_right", this.snapRotateRight);
+ eventSrc.removeEventListener("teleported", this.handleTeleport);
this.reset();
},
@@ -69,6 +74,10 @@ AFRAME.registerComponent("character-controller", {
this.pendingSnapRotationMatrix.copy(this.rightRotationMatrix);
},
+ handleTeleport: function(event) {
+ this.setPositionOnNavMesh(event.detail.oldPosition, this.el.object3D);
+ },
+
tick: (function() {
const move = new THREE.Matrix4();
const trans = new THREE.Matrix4();
@@ -81,7 +90,6 @@ AFRAME.registerComponent("character-controller", {
const pivotRotationMatrix = new THREE.Matrix4();
const pivotRotationInvMatrix = new THREE.Matrix4();
const start = new THREE.Vector3();
- let navGroup, navNode;
return function(t, dt) {
const deltaSeconds = dt / 1000;
@@ -135,20 +143,25 @@ AFRAME.registerComponent("character-controller", {
this.pendingSnapRotationMatrix.identity(); // Revert to identity
- //copied from aframe-extras movement-controls
- const nav = this.el.sceneEl.systems.nav;
- if (nav.navMesh && this.velocity.lengthSq() > EPS) {
- if (!navGroup) {
- navGroup = nav.getGroup(start);
- }
- navNode = navNode || nav.getNode(start, navGroup);
- navNode = nav.clampStep(start, root.position, navGroup, navNode, root.position);
+ if (this.velocity.lengthSq() > EPS) {
+ this.setPositionOnNavMesh(start, root);
} else {
this.el.setAttribute("position", root.position);
}
};
})(),
+ setPositionOnNavMesh: function(position, object3D) {
+ const nav = this.el.sceneEl.systems.nav;
+ if (nav.navMesh) {
+ if (!this.navGroup) {
+ this.navGroup = nav.getGroup(position);
+ }
+ this.navNode = this.navNode || nav.getNode(position, this.navGroup);
+ this.navNode = nav.clampStep(position, object3D.position, this.navGroup, this.navNode, object3D.position);
+ }
+ },
+
updateVelocity: function(dt) {
const data = this.data;
const velocity = this.velocity;
diff --git a/src/hub.html b/src/hub.html
index f5b256be1a8a054a334f70108ac95da1ec96e075..6b759eb1ab65fb7bef6b43c2b3c4f261a8a50576 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -207,7 +207,11 @@
cameraRig: #player-rig;
teleportOrigin: #player-camera;
button: cursor-teleport_;
- collisionEntities: [nav-mesh]"
+ collisionEntities: [nav-mesh];
+ drawIncrementally: true;
+ incrementalDrawMs: 600;
+ hitOpacity: 0.3;
+ missOpacity: 0.2;"
></a-entity>
</a-entity>
@@ -220,7 +224,11 @@
cameraRig: #player-rig;
teleportOrigin: #player-camera;
button: cursor-teleport_;
- collisionEntities: [nav-mesh]"
+ collisionEntities: [nav-mesh];
+ drawIncrementally: true;
+ incrementalDrawMs: 600;
+ hitOpacity: 0.3;
+ missOpacity: 0.2;"
haptic-feedback
></a-entity>
@@ -233,7 +241,11 @@
cameraRig: #player-rig;
teleportOrigin: #player-camera;
button: cursor-teleport_;
- collisionEntities: [nav-mesh]"
+ collisionEntities: [nav-mesh];
+ drawIncrementally: true;
+ incrementalDrawMs: 600;
+ hitOpacity: 0.3;
+ missOpacity: 0.2;"
haptic-feedback
></a-entity>
diff --git a/src/input-mappings.js b/src/input-mappings.js
index b198bb12897723666153bca762ec7cffd8aba709..30345c9358003890ce1c0d1ed409bf4321ff0afd 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -46,8 +46,8 @@ const config = {
trackpadup: { right: "action_primary_up" },
menudown: "thumb_down",
menuup: "thumb_up",
- gripdown: ["action_grab", "middle_ring_pinky_down", "index_down"],
- gripup: ["action_release", "middle_ring_pinky_up", "index_up"],
+ gripdown: ["action_grab", "middle_ring_pinky_down"],
+ gripup: ["action_release", "middle_ring_pinky_up"],
trackpadtouchstart: "thumb_down",
trackpadtouchend: "thumb_up",
triggerdown: ["action_primary_down", "action_grab", "index_down"],
diff --git a/yarn.lock b/yarn.lock
index 26bf5089697204c6b505db2ff02d6f3b69c64871..96e3c1b583d7d84ba0eef1f880d865217529938b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -188,9 +188,9 @@ aframe-rounded@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/aframe-rounded/-/aframe-rounded-1.0.3.tgz#72c7d9c0ff02e94ee138bf217c284e187efa3cfb"
-aframe-teleport-controls@^0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/aframe-teleport-controls/-/aframe-teleport-controls-0.3.1.tgz#7d7ef206f483ea92425a6333b0f8fb26c9596d1c"
+"aframe-teleport-controls@https://github.com/mozillareality/aframe-teleport-controls#hubs/master":
+ version "0.3.2"
+ resolved "https://github.com/mozillareality/aframe-teleport-controls#9e2ef7da57144c4a615eba40a945d4cfa105a092"
"aframe-xr@github:brianpeiris/aframe-xr#3162aed":
version "0.0.9"
@@ -5452,9 +5452,9 @@ neo-async@^2.5.0:
socket.io "^1.4.5"
socket.io-client "^1.4.5"
-nipplejs@^0.6.7:
+"nipplejs@https://github.com/mozillareality/nipplejs#mr-social-client/master":
version "0.6.8"
- resolved "https://registry.yarnpkg.com/nipplejs/-/nipplejs-0.6.8.tgz#5400ff464be15a6199be33b5854a19989d03fe99"
+ resolved "https://github.com/mozillareality/nipplejs#2ee0f479b66182aec2f338f2961f1eaeeccaeb1c"
no-case@^2.2.0:
version "2.3.2"