From 971f41d4ed334f577ad0781c9e0778dbe496f7d1 Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Tue, 26 Sep 2017 15:37:28 -0700
Subject: [PATCH] Add tracked controllers
---
package.json | 1 +
public/index.html | 5 ++---
src/index.js | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 5dddcad44..d7c6016bd 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
"build": "webpack"
},
"dependencies": {
+ "aframe-teleport-controls": "^0.3.0",
"easyrtc": "^1.1.0",
"express": "^4.15.5",
"networked-aframe": "https://github.com/netpro2k/networked-aframe",
diff --git a/public/index.html b/public/index.html
index dfeb6ba8c..0ca0f1661 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,6 @@
<head>
<title>A-Frame Social VR Demo</title>
<script src="https://aframe.io/releases/0.7.0/aframe.min.js"></script>
- <script src="https://rawgit.com/fernandojsg/aframe-teleport-controls/master/dist/aframe-teleport-controls.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.4.5/socket.io.min.js"></script>
<script src="easyrtc/easyrtc.js"></script>
<script src="./app.bundle.js"></script>
@@ -32,8 +31,8 @@
<a-entity id="player" networked="template:#player-template;showLocalTemplate:false;" wasd-controls>
<a-entity camera="userHeight: 1.6" look-controls networked="template:#head-template;showLocalTemplate:false;"></a-entity>
- <a-entity hand-controls="left" networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
- <a-entity hand-controls="right" networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
+ <a-entity hand-controls="left" teleport-controls="cameraRig: #player" networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
+ <a-entity hand-controls="right" teleport-controls="cameraRig: #player" networked="template:#hand-template;showLocalTemplate:true;"></a-entity>
</a-entity>
<a-entity id="ground" position="0 0 0"
diff --git a/src/index.js b/src/index.js
index 29c73e321..c5ec1b94a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,3 +1,4 @@
require("networked-aframe");
+require('aframe-teleport-controls');
console.log("test2");
--
GitLab