From 0255036e6da8fbe2aacac6ed3e4b1a03b16825a7 Mon Sep 17 00:00:00 2001
From: r3tk0n <r3tk0n@gmail.com>
Date: Tue, 19 Feb 2019 15:23:05 -0800
Subject: [PATCH] Fix default mappings' deadzones.
---
.../resources/controllers/oculus_touch.json | 8 ++++----
interface/resources/controllers/vive.json | 18 ++++++++++++++----
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/interface/resources/controllers/oculus_touch.json b/interface/resources/controllers/oculus_touch.json
index b818d371e3..86f559d964 100644
--- a/interface/resources/controllers/oculus_touch.json
+++ b/interface/resources/controllers/oculus_touch.json
@@ -13,11 +13,11 @@
{ "from": "OculusTouch.LY", "to": "Standard.LY",
"filters": [
- { "type": "deadZone", "min": 0.7 },
+ { "type": "deadZone", "min": 0.15 },
"invert"
]
},
- { "from": "OculusTouch.LX", "filters": { "type": "deadZone", "min": 0.7 }, "to": "Standard.LX" },
+ { "from": "OculusTouch.LX", "filters": { "type": "deadZone", "min": 0.15 }, "to": "Standard.LX" },
{ "from": "OculusTouch.LT", "to": "Standard.LTClick",
"peek": true,
"filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
@@ -29,11 +29,11 @@
{ "from": "OculusTouch.RY", "to": "Standard.RY",
"filters": [
- { "type": "deadZone", "min": 0.7 },
+ { "type": "deadZone", "min": 0.15 },
"invert"
]
},
- { "from": "OculusTouch.RX", "filters": { "type": "deadZone", "min": 0.7 }, "to": "Standard.RX" },
+ { "from": "OculusTouch.RX", "filters": { "type": "deadZone", "min": 0.15 }, "to": "Standard.RX" },
{ "from": "OculusTouch.RT", "to": "Standard.RTClick",
"peek": true,
"filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json
index b937cee511..d6d8f9f929 100644
--- a/interface/resources/controllers/vive.json
+++ b/interface/resources/controllers/vive.json
@@ -10,8 +10,13 @@
"filters": [ { "type": "hysteresis", "min": 0.7, "max": 0.75 } ]
},
- { "from": "Vive.LY", "when": "Vive.LS", "filters": ["invert"], "to": "Standard.LY" },
- { "from": "Vive.LX", "when": "Vive.LS", "to": "Standard.LX" },
+ { "from": "Vive.LY", "when": "Vive.LS",
+ "filters": [
+ { "type": "deadZone", "min": 0.15 },
+ "invert"
+ ]
+ , "to": "Standard.LY" },
+ { "from": "Vive.LX", "when": "Vive.LS", "filters": { "type": "deadZone", "min": 0.15 }, "to": "Standard.LX" },
{
"from": "Vive.LT", "to": "Standard.LT",
"filters": [
@@ -28,8 +33,13 @@
},
{ "from": "Vive.LSTouch", "to": "Standard.LSTouch" },
- { "from": "Vive.RY", "when": "Vive.RS", "filters": ["invert"], "to": "Standard.RY" },
- { "from": "Vive.RX", "when": "Vive.RS", "to": "Standard.RX" },
+ { "from": "Vive.RY", "when": "Vive.RS",
+ "filters": [
+ { "type": "deadZone", "min": 0.15 },
+ "invert"
+ ]
+ , "to": "Standard.RY" },
+ { "from": "Vive.RX", "when": "Vive.RS", "filters": { "type": "deadZone", "min": 0.15 }, "to": "Standard.RX" },
{
"from": "Vive.RT", "to": "Standard.RT",
"filters": [