From 9decb80236e2d75121a3e5a7ef7b553fa2b3e393 Mon Sep 17 00:00:00 2001
From: joni <johnfshaughnessy@gmail.com>
Date: Fri, 13 Apr 2018 10:17:49 -0700
Subject: [PATCH] Use my smooth parabola branch of teleport controls.
---
package.json | 2 +-
src/hub.html | 24 ++++++++++++++++--------
yarn.lock | 6 +++---
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/package.json b/package.json
index ad584f83b..cdce408fd 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/johnshaughnessy/aframe-teleport-controls#feature/incremental-parabolic-cursor",
"aframe-xr": "github:brianpeiris/aframe-xr#3162aed",
"classnames": "^2.2.5",
"detect-browser": "^2.1.0",
diff --git a/src/hub.html b/src/hub.html
index 0575e5b01..0683a2fd5 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -195,10 +195,14 @@
hand-controls2="left"
tracked-controls
teleport-controls="
- cameraRig: #player-rig;
- teleportOrigin: #player-camera;
- button: action_teleport_;
- collisionEntities: [nav-mesh]"
+ drawIncrementally: true;
+ incrementalDrawMs: 700;
+ hitOpacity: 0.3;
+ missOpacity: 0.2;
+ cameraRig: #player-rig;
+ teleportOrigin: #player-camera;
+ button: action_teleport_;
+ collisionEntities: [nav-mesh];"
app-mode-toggle-playing__teleport-controls="mode: hud; invert: true;"
haptic-feedback
></a-entity>
@@ -209,10 +213,14 @@
hand-controls2="right"
tracked-controls
teleport-controls="
- cameraRig: #player-rig;
- teleportOrigin: #player-camera;
- button: action_teleport_;
- collisionEntities: [nav-mesh]"
+ drawIncrementally: true;
+ incrementalDrawMs: 700;
+ hitOpacity: 0.3;
+ missOpacity: 0.2;
+ cameraRig: #player-rig;
+ teleportOrigin: #player-camera;
+ button: action_teleport_;
+ collisionEntities: [nav-mesh];"
haptic-feedback
raycaster="objects:.hud; showLine: true; far: 2;"
cursor="fuse: false; downEvents: action_ui_select_down; upEvents: action_ui_select_up;"
diff --git a/yarn.lock b/yarn.lock
index 9e4e6fbae..425d20b06 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/johnshaughnessy/aframe-teleport-controls#feature/incremental-parabolic-cursor":
+ version "0.3.2"
+ resolved "https://github.com/johnshaughnessy/aframe-teleport-controls#ee5f07467a9492bdc0c6d912e489c0aec1f6886b"
"aframe-xr@github:brianpeiris/aframe-xr#3162aed":
version "0.0.9"
--
GitLab