From 3e3f0150b39159bac7bd14921c61b6d7a05cc091 Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Fri, 2 Mar 2018 16:54:08 -0800
Subject: [PATCH] Add gearvr-controls to hand-controls2 (#58)
* Add gearvr-controls to hand-controls2
* Update AFrame.
* Update input-mappings.
---
src/components/hand-controls2.js | 4 +++-
src/input-mappings.js | 5 ++++-
src/room.html | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/components/hand-controls2.js b/src/components/hand-controls2.js
index e2b5771f2..a466ad7ba 100644
--- a/src/components/hand-controls2.js
+++ b/src/components/hand-controls2.js
@@ -20,7 +20,8 @@ const CONTROLLER_OFFSETS = {
new THREE.Quaternion().setFromEuler(new THREE.Euler(-40 * THREE.Math.DEG2RAD, 0, 0)),
new THREE.Vector3(1, 1, 1)
),
- "daydream-controls": new THREE.Matrix4().makeTranslation(0, 0, -0.04)
+ "daydream-controls": new THREE.Matrix4().makeTranslation(0, 0, -0.04),
+ "gearvr-controls": new THREE.Matrix4()
};
AFRAME.registerComponent("hand-controls2", {
@@ -114,6 +115,7 @@ AFRAME.registerComponent("hand-controls2", {
el.setAttribute("oculus-touch-controls", controlConfiguration);
el.setAttribute("windows-motion-controls", controlConfiguration);
el.setAttribute("daydream-controls", controlConfiguration);
+ el.setAttribute("gearvr-controls", controlConfiguration);
}
},
diff --git a/src/input-mappings.js b/src/input-mappings.js
index 272e3889a..e9a80d53b 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -58,7 +58,10 @@ const config = {
abuttonup: "action_teleport_up"
},
"daydream-controls": {
- menudown: "action_mute",
+ trackpaddown: "action_teleport_down",
+ trackpadup: "action_teleport_up"
+ },
+ "gearvr-controls": {
trackpaddown: "action_teleport_down",
trackpadup: "action_teleport_up"
},
diff --git a/src/room.html b/src/room.html
index 3893f8676..703874897 100644
--- a/src/room.html
+++ b/src/room.html
@@ -7,9 +7,9 @@
<meta http-equiv="origin-trial" data-feature="WebVR (For Chrome M62+)" data-expires="<%= ORIGIN_TRIAL_EXPIRES %>" content="<%= ORIGIN_TRIAL_TOKEN %>">
<% if(NODE_ENV === "production") { %>
- <script src="https://cdn.rawgit.com/brianpeiris/aframe/r90-tracked-controls-fix/dist/aframe-master.min.js"></script>
+ <script src="https://cdn.rawgit.com/brianpeiris/aframe/bba200440e3279753df85a1f52ba4c77a3b16e47/dist/aframe-master.min.js"></script>
<% } else { %>
- <script src="https://rawgit.com/brianpeiris/aframe/r90-tracked-controls-fix/dist/aframe-master.js"></script>
+ <script src="https://cdn.rawgit.com/brianpeiris/aframe/bba200440e3279753df85a1f52ba4c77a3b16e47/dist/aframe-master.js"></script>
<% } %>
</head>
--
GitLab