From 20091552704fd8be4c2f48a4e46272eaed2103b8 Mon Sep 17 00:00:00 2001
From: johnshaughnessy <johnfshaughnessy@gmail.com>
Date: Fri, 9 Nov 2018 13:36:13 -0800
Subject: [PATCH] Disallow grabbing via trigger
---
src/systems/userinput/bindings/oculus-touch-user.js | 10 +++++-----
src/systems/userinput/bindings/vive-user.js | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/systems/userinput/bindings/oculus-touch-user.js b/src/systems/userinput/bindings/oculus-touch-user.js
index 275be0dfe..99cf3395b 100644
--- a/src/systems/userinput/bindings/oculus-touch-user.js
+++ b/src/systems/userinput/bindings/oculus-touch-user.js
@@ -520,7 +520,7 @@ export const oculusTouchUserBindings = addSetsToBindings({
priority: 2
},
{
- src: [leftGripRisingGrab, leftTriggerRisingGrab],
+ src: [leftGripRisingGrab ],
dest: { value: paths.actions.leftHand.grab },
xform: xforms.any,
priority: 2
@@ -606,7 +606,7 @@ export const oculusTouchUserBindings = addSetsToBindings({
priority: 2
},
{
- src: [rightGripRisingGrab, rightTriggerRisingGrab],
+ src: [rightGripRisingGrab ],
dest: { value: paths.actions.cursor.grab },
xform: xforms.any,
priority: 2
@@ -634,7 +634,7 @@ export const oculusTouchUserBindings = addSetsToBindings({
priority: 2
},
{
- src: [cursorDrop1, cursorDrop2],
+ src: [cursorDrop1 ],
dest: { value: paths.actions.cursor.drop },
xform: xforms.any,
priority: 2
@@ -678,7 +678,7 @@ export const oculusTouchUserBindings = addSetsToBindings({
priority: 2
},
{
- src: [rightGripRisingGrab, rightTriggerRisingGrab],
+ src: [rightGripRisingGrab, ],
dest: { value: paths.actions.rightHand.grab },
xform: xforms.any,
priority: 2
@@ -701,7 +701,7 @@ export const oculusTouchUserBindings = addSetsToBindings({
priority: 2
},
{
- src: [rightHandDrop1, rightHandDrop2],
+ src: [rightHandDrop2],
dest: { value: paths.actions.rightHand.drop },
xform: xforms.any,
priority: 2
diff --git a/src/systems/userinput/bindings/vive-user.js b/src/systems/userinput/bindings/vive-user.js
index e3a8e5d39..757dee030 100644
--- a/src/systems/userinput/bindings/vive-user.js
+++ b/src/systems/userinput/bindings/vive-user.js
@@ -586,7 +586,7 @@ export const viveUserBindings = addSetsToBindings({
priority: 1
},
{
- src: [lGripRisingGrab, lTriggerRisingGrab],
+ src: [lGripRisingGrab],
dest: { value: paths.actions.leftHand.grab },
xform: xforms.any
}
@@ -712,7 +712,7 @@ export const viveUserBindings = addSetsToBindings({
priority: 1
},
{
- src: [rGripRisingGrab, rTriggerRisingGrab],
+ src: [rGripRisingGrab ],
dest: { value: paths.actions.cursor.grab },
xform: xforms.any
}
@@ -742,7 +742,7 @@ export const viveUserBindings = addSetsToBindings({
priority: 2
},
{
- src: [cursorDrop1, cursorDrop2],
+ src: [cursorDrop1 ],
dest: { value: paths.actions.cursor.drop },
xform: xforms.any
},
@@ -823,7 +823,7 @@ export const viveUserBindings = addSetsToBindings({
priority: 2
},
{
- src: [rGripRisingGrab, rTriggerRisingGrab],
+ src: [rGripRisingGrab ],
dest: { value: paths.actions.rightHand.grab },
xform: xforms.any
}
@@ -845,7 +845,7 @@ export const viveUserBindings = addSetsToBindings({
priority: 2
},
{
- src: [rHandDrop1, rHandDrop2],
+ src: [rHandDrop1],
dest: { value: paths.actions.rightHand.drop },
xform: xforms.any
},
--
GitLab