Seth Alves
48ee546545
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-01 16:15:03 -07:00
Seth Alves
f45db99149
for the moment, vive input plugin isn't a head-controller unless the HMD is being worn
2017-06-01 14:35:53 -07:00
Dante Ruiz
7fcdc61244
add head puck offset preference
2017-05-31 18:20:35 +01:00
Dante Ruiz
f4328af66f
made final requested changes
2017-05-31 17:12:27 +01:00
Dante Ruiz
41869430f7
made some changes that were requested
2017-05-31 01:29:32 +01:00
Dante Ruiz
b3401d9762
making some final changes
2017-05-30 23:55:45 +01:00
Dante Ruiz
4c4811dca8
finished the head puck
2017-05-30 22:52:39 +01:00
Dante Ruiz
a45bea2c90
fixed merge conflicts
2017-05-27 00:57:09 +01:00
Dante Ruiz
d317d9236f
made requested changes
2017-05-26 16:40:21 +01:00
Dante Ruiz
cce19f7027
removed unnessary code
2017-05-25 22:07:51 +01:00
Dante Ruiz
108c444cc7
clean up code
2017-05-25 21:59:06 +01:00
Dante Ruiz
8538c700b5
saving head work
2017-05-25 21:41:41 +01:00
Dante Ruiz
8cb9bfcc81
fixed merge conflict
2017-05-24 19:35:41 +01:00
Dante Ruiz
0fdf136251
got the shoulders working
2017-05-24 19:31:48 +01:00
Dante Ruiz
ac3c9655ec
added arms
2017-05-24 01:28:08 +01:00
David Kelly
1c71d2e6b1
don't create prefs for pucks if vive not supported
2017-05-23 09:05:14 -07:00
Dante Ruiz
d98e7d5bc6
adding left and right arm
2017-05-23 00:26:12 +01:00
David Kelly
ae54f9c80a
Should fix crash in general setting dialog
2017-05-22 16:25:21 -07:00
Anshuman Dewangan
e3cd85bd22
Changed calibration time from 2 to 1 sec
2017-05-16 13:55:04 -07:00
Dante Ruiz
e6020e0137
added lookup table for tracking result and configs
2017-05-13 00:40:07 +01:00
Dante Ruiz
3f5a13d5a9
Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking
2017-05-12 18:18:10 +01:00
Dante Ruiz
5042d4d312
add print when device changes tracking result
2017-05-12 00:28:31 +01:00
Dante Ruiz
66020cf446
Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking
2017-05-11 23:19:03 +01:00
Dante Ruiz
539aaf8c59
add debug statment and fixed sorting order
2017-05-11 23:00:41 +01:00
Dante Ruiz
5d457eaa39
better handling of when lost tracking of pucks
2017-05-11 20:44:08 +01:00
Dante Ruiz
7687617e91
made requested changes
2017-05-11 00:32:42 +01:00
Dante Ruiz
4365907462
drop down puck configuration for gernal settings
2017-05-10 22:12:11 +01:00
Dante Ruiz
0e1ef75d5b
fix comment wording
2017-05-10 16:18:26 +01:00
Dante Ruiz
571f0d5951
made requested changes
2017-05-10 16:14:29 +01:00
Dante Ruiz
bb4c0d972d
head routed through the vive input plugin
2017-05-10 00:10:26 +01:00
Dante Ruiz
53e254152d
fixed puck location
2017-05-09 22:30:29 +01:00
Dante Ruiz
c362ba9164
better calibration event
2017-05-09 19:13:47 +01:00
Dante Ruiz
d688b60282
no magic numbers
2017-05-09 18:02:12 +01:00
Dante Ruiz
bce9e9ea82
made requested chnages
2017-05-09 17:51:30 +01:00
Dante Ruiz
c3d57459d5
minimize diff 3.0
2017-05-09 00:32:47 +01:00
Dante Ruiz
00546c55bb
minimize diff
2017-05-09 00:30:06 +01:00
Dante Ruiz
23c3a75116
finally fixed rotation issue
2017-05-09 00:27:30 +01:00
Dante Ruiz
a744db56aa
removed dead code
2017-05-06 00:21:52 +01:00
Dante Ruiz
8813306857
fixed the wierd rotation issue
2017-05-05 23:59:38 +01:00
Dante Ruiz
20c8356bb2
debugging rotation fix
2017-05-05 22:55:53 +01:00
Dante Ruiz
31f6038e45
limbs tracking pucks
2017-05-03 20:08:42 +01:00
Dante Ruiz
fb502a7fed
add offset function
2017-05-03 00:37:35 +01:00
Dante Ruiz
8e2b25eacc
working on computing offsets
2017-05-03 00:25:41 +01:00
Dante Ruiz
15cad1fee9
saving work
2017-05-02 21:33:58 +01:00
Anthony J. Thibault
4e49774d0e
Moved device class check into handleTrackedObject
2017-04-06 13:20:00 -07:00
Anthony J. Thibault
42262aac78
OpenVR: upgrade to version 1.0.6, for better generic tracker support
2017-04-05 18:41:43 -07:00
Anthony J. Thibault
d47c040768
Vive: Expose all 16 tracked poses to the controller system.
...
This is in preparation for the Vive hockey puck trackers...
2017-03-29 18:15:29 -07:00
Seth Alves
946dc256f0
try, try again
2016-11-13 12:15:35 -08:00
Seth Alves
f8fb5b9709
avoid some more static/global QStrings in plugins
2016-11-13 11:29:19 -08:00
Anthony J. Thibault
1ea018db1d
Fix for crash in openvr on startup
...
pluginActivate can fail and return false, when steamvr is in a "Not Ready" state.
In practice this can occur on a botched steamvr install, or when the vr compositor process is unable to start.
When pluginActivate returns false, there's some sort of race condition where pluginUpdate will still be called.
But it's only reproducible in release builds, without the debugger attached.
This commit prevents pluginUpdate from crashing by making sure that the openvr _system ptr is valid first.
2016-10-26 17:40:34 -07:00