From f851a1a8804d3eab20c25efe43570172efbebafd Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Tue, 17 Oct 2017 15:29:26 -0700
Subject: [PATCH] Use teleportOrigin (from my branch until PR lands) for
teleporting
---
package.json | 2 +-
public/index.html | 5 +++--
yarn.lock | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index f3c528aa7..065e989e8 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
},
"dependencies": {
"aframe-input-mapping-component": "https://github.com/fernandojsg/aframe-input-mapping-component",
- "aframe-teleport-controls": "^0.3.0",
+ "aframe-teleport-controls": "https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin",
"easyrtc": "^1.1.0",
"express": "^4.15.5",
"networked-aframe": "https://github.com/netpro2k/networked-aframe#dev",
diff --git a/public/index.html b/public/index.html
index 123f8b1cb..73482ec38 100644
--- a/public/index.html
+++ b/public/index.html
@@ -56,6 +56,7 @@
networked
wasd-controls
snap-rotation="pivotSrc: #head">
+ <a-sphere scale="0.1 0.1 0.1"></a-sphere>
<a-entity
id="head"
camera="userHeight: 1.6"
@@ -75,7 +76,7 @@
gearvr-controls
axis-dpad="centerZone: 1"
- teleport-controls="cameraRig: #player-rig; button: action_teleport_"
+ teleport-controls="cameraRig: #player-rig; teleportOrigin: #head; button: action_teleport_"
networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
<a-entity
@@ -87,7 +88,7 @@
gearvr-controls
axis-dpad
- teleport-controls="cameraRig: #player-rig; button: action_teleport_"
+ teleport-controls="cameraRig: #player-rig; teleportOrigin: #head; hitEntity: #telepor-indicator; button: action_teleport_;"
networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
</a-entity>
diff --git a/yarn.lock b/yarn.lock
index 5abfe97ad..f5197b385 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -48,9 +48,9 @@ aframe-lerp-component@^1.1.0:
dependencies:
almost-equal "^1.1.0"
-aframe-teleport-controls@^0.3.0:
+"aframe-teleport-controls@https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin":
version "0.3.0"
- resolved "https://registry.yarnpkg.com/aframe-teleport-controls/-/aframe-teleport-controls-0.3.0.tgz#7c854941757703f06a5100e47abccfeeb427d7fc"
+ resolved "https://github.com/netpro2k/aframe-teleport-controls#41fe311d3123503ba44761acce69d0f0634139cc"
aframe-template-component@3.2.1:
version "3.2.1"
--
GitLab