Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 17:10:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8355 from SamGondelman/touchDeadZone

Browse source 
Added dead zones to Hydra and Oculus Touch joysticks
This commit is contained in:
Philip Rosedale 2016-08-03 15:17:15 -07:00 committed by GitHub
commit 98e40d54e1
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/resources/controllers/hydra.json
View file

@ -1,15 +1,26 @@
{ {
"name": "Hydra to Standard", "name": "Hydra to Standard",
"channels": [ "channels": [
{ "from": "Hydra.LY", "filters": "invert", "to": "Standard.LY" }, { "from": "Hydra.LY", "to": "Standard.LY",
{ "from": "Hydra.LX", "to": "Standard.LX" }, "filters": [
{ "type": "deadZone", "min": 0.05 },
"invert"
]
},
{ "from": "Hydra.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LX" },
{ "from": "Hydra.LT", "to": "Standard.LTClick", { "from": "Hydra.LT", "to": "Standard.LTClick",
"peek": true, "peek": true,
"filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
}, },
{ "from": "Hydra.LT", "to": "Standard.LT" }, { "from": "Hydra.LT", "to": "Standard.LT" },
{ "from": "Hydra.RY", "filters": "invert", "to": "Standard.RY" },
{ "from": "Hydra.RX", "to": "Standard.RX" }, { "from": "Hydra.RY", "to": "Standard.RY",
"filters": [
{ "type": "deadZone", "min": 0.05 },
"invert"
]
},
{ "from": "Hydra.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RX" },
{ "from": "Hydra.RT", "to": "Standard.RTClick", { "from": "Hydra.RT", "to": "Standard.RTClick",
"peek": true, "peek": true,
"filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]

18
interface/resources/controllers/oculus_touch.json
View file

@ -6,8 +6,13 @@
{ "from": "OculusTouch.X", "to": "Standard.LeftPrimaryThumb" }, { "from": "OculusTouch.X", "to": "Standard.LeftPrimaryThumb" },
{ "from": "OculusTouch.Y", "to": "Standard.LeftSecondaryThumb" }, { "from": "OculusTouch.Y", "to": "Standard.LeftSecondaryThumb" },
{ "from": "OculusTouch.LY", "filters": "invert", "to": "Standard.LY" }, { "from": "OculusTouch.LY", "to": "Standard.LY",
{ "from": "OculusTouch.LX", "to": "Standard.LX" }, "filters": [
{ "type": "deadZone", "min": 0.05 },
"invert"
]
},
{ "from": "OculusTouch.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LX" },
{ "from": "OculusTouch.LT", "to": "Standard.LTClick", { "from": "OculusTouch.LT", "to": "Standard.LTClick",
"peek": true, "peek": true,
"filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
@ -17,8 +22,13 @@
{ "from": "OculusTouch.LeftGrip", "to": "Standard.LeftGrip" }, { "from": "OculusTouch.LeftGrip", "to": "Standard.LeftGrip" },
{ "from": "OculusTouch.LeftHand", "to": "Standard.LeftHand" }, { "from": "OculusTouch.LeftHand", "to": "Standard.LeftHand" },
{ "from": "OculusTouch.RY", "filters": "invert", "to": "Standard.RY" }, { "from": "OculusTouch.RY", "to": "Standard.RY",
{ "from": "OculusTouch.RX", "to": "Standard.RX" }, "filters": [
{ "type": "deadZone", "min": 0.05 },
"invert"
]
},
{ "from": "OculusTouch.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RX" },
{ "from": "OculusTouch.RT", "to": "Standard.RTClick", { "from": "OculusTouch.RT", "to": "Standard.RTClick",
"peek": true, "peek": true,
"filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]