Chaperone Tab Update (#101)

* added actions for haptics

* Haptic WIP #1 crash on haptic event

* haptics rough implemented

* fixed action names and prox sensor work-around

* added workaround to catch-all in begineer chaperone switch

* added idle work-around to alarm warning

* changed visibility slider values to reflect new API limits

* added disable chaperone

* added display Logic

* fixed visibility slider display and some saving fade distance when chaperone disabled

* fixed warnings not always working (hopefully) centralized action/input keys into ivrinput.h

* default bindings for HMD's

* chaperone input re-factor

* refactored ivrinput class

* fixed naming errors commented out prox testing

* formatting removed commented code

* format

* fixed compiler warnings

* updated documentation

* Reduced reload chaperone calls

* adjusted haptics for chaperone bounds warnings
This commit is contained in:
ykeara
2019-03-15 15:19:23 -05:00
committed by GitHub
parent 55b6d5de66
commit 3c5cab72e5
14 changed files with 425 additions and 77 deletions
+24 -1
View File
@@ -3,6 +3,14 @@
{
"controller_type": "vive_controller",
"binding_url": "default_action_manifests/vive_defaults.json"
},
{
"controller_type" : "generic",
"binding_url" : "default_action_manifests/generic_hmd_defaults.json"
},
{
"controller_type" : "vive",
"binding_url" : "default_action_manifests/vive_hmd_defaults.json"
}
],
"actions": [
@@ -26,6 +34,19 @@
"requirement": "optional",
"type": "boolean"
},
{
"name": "/actions/main/in/ProxSensor",
"requirement": "optional",
"type": "boolean"
},
{
"name": "/actions/main/out/HapticsLeft",
"type": "vibration"
},
{
"name": "/actions/main/out/HapticsRight",
"type": "vibration"
},
{
"name": "/actions/main/in/LeftHandSpaceTurn",
"requirement": "optional",
@@ -46,7 +67,7 @@
"requirement": "optional",
"type": "boolean"
},
{
{
"name": "/actions/main/in/OptionalOverrideLeftHandSpaceTurn",
"requirement": "optional",
"type": "boolean"
@@ -138,6 +159,8 @@
"/actions/main/in/PreviousTrack" : "Play Previous Track",
"/actions/main/in/PausePlayTrack" : "Pause/Play Track",
"/actions/main/in/StopTrack" : "Stop Track",
"/actions/main/out/HapticsLeft" : "Haptics Left",
"/actions/main/out/HapticsRight" : " Haptics Right",
"/actions/main/in/LeftHandSpaceTurn" : "Left Hand Space Turn",
"/actions/main/in/RightHandSpaceTurn" : "Right Hand Space Turn",
"/actions/main/in/LeftHandSpaceDrag" : "Left Hand Space Drag",
@@ -0,0 +1,23 @@
{
"alias_info" : {},
"bindings" : {
"/actions/default" : {
"sources" : [
{
"inputs" : {
"click" : {
"output" : "/actions/main/in/ProxSensor"
}
},
"mode" : "button",
"path" : "/user/head/proximity"
}
]
}
},
"controller_type" : "generic",
"description" : "Default config for HMD for Prox sensor.",
"name" : "Default configuration for HMD's",
"options" : {},
"simulated_actions" : []
}
@@ -0,0 +1,23 @@
{
"alias_info" : {},
"bindings" : {
"/actions/default" : {
"sources" : [
{
"inputs" : {
"click" : {
"output" : "/actions/main/in/ProxSensor"
}
},
"mode" : "button",
"path" : "/user/head/proximity"
}
]
}
},
"controller_type" : "vive",
"description" : "Default config for vive HMD for Prox sensor.",
"name" : "Default configuration for vive HMD's",
"options" : {},
"simulated_actions" : []
}