From 587fe6cbfafe6e3d5bd678dad1f1460461d131cd Mon Sep 17 00:00:00 2001
From: joni <johnfshaughnessy@gmail.com>
Date: Wed, 29 Nov 2017 10:14:37 -0800
Subject: [PATCH] Enable oculus controls, even though vive controllers set them
off via axismove.
---
templates/room.hbs | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/templates/room.hbs b/templates/room.hbs
index f43061467..8371574e6 100644
--- a/templates/room.hbs
+++ b/templates/room.hbs
@@ -145,13 +145,6 @@
networked="template: #nametag-template; showLocalTemplate: false;"
></a-entity>
- <!-- oculus-touch-controls-extended="
- dpad: true;
- dpad_deadzone: 0.8;
- dpad_livezone: 0.3;
- dpad_directions: 8;
- dpad_turbo: true;
- dpad_haptic_intensity: none" -->
<a-entity
id="left-hand"
hand-controls2="left"
@@ -162,6 +155,13 @@
dpad_haptic_intensity: none;
dpad_deadzone: 0.6;
dpad_pressed_haptic_intensity: low"
+ oculus-touch-controls-extended="
+ dpad: true;
+ dpad_deadzone: 0.8;
+ dpad_livezone: 0.3;
+ dpad_directions: 8;
+ dpad_turbo: true;
+ dpad_haptic_intensity: none"
dpad-as-axes="
inputName:left_dpad;
name:left_dpad_axes;
@@ -179,14 +179,6 @@
</a-entity>
</a-entity>
- <!-- oculus-touch-controls-extended="
- hand:right;
- dpad: true;
- dpad_livezone: 0.3;
- dpad_deadzone: 0.8;
- dpad_directions: 4;
- dpad_turbo: false;
- dpad_haptic_intensity: none" -->
<a-entity
id="right-hand"
hand-controls2="right"
@@ -200,6 +192,14 @@
dpad_turbo: false;
dpad_haptic_intensity: none;
dpad_pressed_haptic_intensity: low;"
+ oculus-touch-controls-extended="
+ hand:right;
+ dpad: true;
+ dpad_livezone: 0.3;
+ dpad_deadzone: 0.8;
+ dpad_directions: 4;
+ dpad_turbo: false;
+ dpad_haptic_intensity: none"
teleport-controls="cameraRig: #player-rig;
teleportOrigin: #head;
hitEntity: #telepor-indicator;
--
GitLab