Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-21 06:59:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72789 commits 25 branches 0 tags 1.1 GiB
Commit graph

366 commits

Author SHA1 Message Date
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Anthony J. Thibault
6c2b6674bb load and save shoulderConfig to settings. 2017-07-27 17:33:54 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Anthony J. Thibault
8dc9714282 Pass armCircumference and shoulderWidth to qml. 2017-07-27 09:08:34 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
Anthony J. Thibault
2a45c6d3dc Removed eigen dependency, fixed Debug Draw IK Chains 
Also, clarified for special case for secondary shoulder joint look-at constraint.
 2017-07-26 16:55:12 -07:00
Anthony J. Thibault
572213daaf Added shoulder config to Controller Settings UI 
All offset values in Controller Settings UI are now in cm.
 2017-07-25 17:05:07 -07:00
Anthony J. Thibault
c81875a280 Improved shoulder calibration using hard-coded measured shoulder width 2017-07-25 15:50:44 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress 
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
 2017-07-24 17:22:48 -07:00
Brad Davis
3a31805dff Fix warnings in Qt 59 / VS 2017 build 2017-07-20 11:57:12 -07:00
Anthony J. Thibault
2e0bc36cfd warning fix + whitespace 2017-07-13 15:17:49 -07:00
Anthony J. Thibault
22d8adcb99 Better shoulder/arm puck calibration. 2017-07-13 10:39:48 -07:00
Anthony J. Thibault
eb486c8f47 comments 2017-07-06 11:03:03 -07:00
Anthony J. Thibault
4e9b8c1ef9 updated comments 2017-07-06 11:01:59 -07:00
Anthony J. Thibault
dee9769be3 Can now use chest, hips, shoulder & feet pucks in desktop mode. 
* Fixed bug where head puck would sometimes not work properly when other vive trackers were enabled.
* Fixed calibration to work in sensor space instead of avatar space, this was necessary because
  the sensor to world matrix is unreliable when in desktop mode.
 2017-07-06 10:54:03 -07:00
Anthony J. Thibault
8c15d1bab9 delete-trailing-whitespace 2017-07-06 10:54:02 -07:00
Dante Ruiz
07d098b95b coding standard fix 2017-07-05 19:45:52 +01:00
Dante Ruiz
275f48b65a another requested change made 2017-07-05 19:22:19 +01:00
Dante Ruiz
e567cf0196 made requested changes 2017-07-05 19:04:34 +01:00
Dante Ruiz
27a9880eff removed double add of head offset 2017-07-05 18:34:33 +01:00
Dante Ruiz
691b59ffff remove debug statments 2017-07-05 18:26:58 +01:00
Dante Ruiz
a417f74bad Merge branch 'calibration-ui-update' into vive-in-desktop 2017-07-03 16:56:58 +01:00
Dante Ruiz
5fbcd494be made final requested changes 2017-07-03 16:46:58 +01:00
Dante Ruiz
51792769b5 finished vive in desktop mode 2017-07-01 00:48:36 +01:00
Dante Ruiz
309a03230c Merge branch 'calibration-ui-update' into vive-in-desktop 2017-06-30 23:43:59 +01:00
Dante Ruiz
577969481d head puck working 2017-06-30 23:43:12 +01:00
Dante Ruiz
a749fa19ad made requested changes 2017-06-30 19:14:22 +01:00
Dante Ruiz
3e1aee4d8a saving work 2017-06-30 19:07:34 +01:00
Dante Ruiz
a7e4dc1473 clean up code 2017-06-28 23:51:00 +01:00
Dante Ruiz
a2df2f8472 added user activity status 2017-06-28 19:52:19 +01:00
Dante Ruiz
b48efc4317 fixed wide stance issue 2017-06-22 22:48:32 +01:00
Dante Ruiz
c4699e00ca added hand offsets 2017-06-21 23:10:08 +01:00
Dante Ruiz
2c3db0fb91 finished calibration-ui 2017-06-21 01:07:12 +01:00
Dante Ruiz
13dff29bd5 adding calibration screen 2017-06-20 01:19:10 +01:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Dante Ruiz
734cde33e7 better calibrate button 2017-06-19 21:40:09 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Dante Ruiz
2015f059c7 fixed hand calibration 2017-06-17 00:37:33 +01:00
Brad Davis
fece438602 Cleanup and refactoring 2017-06-15 18:58:56 -07:00
Dante Ruiz
07102cc98d improving the ui 2017-06-16 00:25:27 +01:00
Dante Ruiz
a1782bf7d2 Merge branch 'controller-ui' into hand-pucks 2017-06-15 16:27:55 +01:00
Dante Ruiz
d65c0dfbac Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-15 16:24:59 +01:00
Dante Ruiz
ff422153b1 got hand working 2017-06-15 00:26:53 +01:00
Dante Ruiz
aa23986618 finxing rotation problem 2017-06-14 00:46:55 +01:00
Zach Pomerantz
607379980e update plugin api 2017-06-13 17:59:46 -04:00
Dante Ruiz
ef9a211f6e adding hand punck 2017-06-13 21:15:16 +01:00
Brad Davis
c3f664502a Add support for querying the desired output audio device for OpenVR 2017-06-13 10:57:10 -07:00
Dante Ruiz
f9f9aeac01 saving work 2017-06-13 00:29:45 +01:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Dante Ruiz
bbe675ab72 making final changes 2017-06-12 22:01:41 +01:00
Dante Ruiz
067fc9bb98 fixed merge conflict 2017-06-12 16:45:34 +01:00
druiz17
f6ef1443c8 some more clean up 2017-06-11 12:08:45 -07:00
Dante Ruiz
ef1be931dc preparing to clean code 2017-06-10 00:50:32 +01:00
Seth Alves
485df396ef Merge pull request #10628 from jherico/qt59 
Fixes for Qt 5.9 compatibility
 2017-06-08 16:51:08 -07:00
Dante Ruiz
73e628461e confiration update status 2017-06-09 00:44:05 +01:00
Dante Ruiz
c97ea84cbf saving work 2017-06-08 17:44:55 +01:00
Dante Ruiz
11409aae9b connect the ui with the input plugins 2017-06-08 00:34:52 +01:00
Dante Ruiz
4ba1fdc323 elimated uncofigurable items from the list 2017-06-07 00:48:12 +01:00
Bradley Austin Davis
a36727732f Fix bad initializer 2017-06-06 15:02:16 -07:00
Dante Ruiz
bb7c424d47 get ui working 2017-06-06 21:09:09 +01:00
Dante Ruiz
038ffe920a fixing merge conflicts 2017-06-06 16:42:08 +01:00
Dante Ruiz
19b134b0ac base ui working 2017-06-06 00:32:20 +01:00
Seth Alves
9088e288e0 don't worry about head controller being enabled, just check to see if head pose is valid 2017-06-02 13:57:53 -07:00
Seth Alves
27664756de with vive head-puck, isHeadController is true, even when HMD isn't mounted 2017-06-01 16:37:04 -07:00
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
Seth Alves
ac6135387c display plugins are never head controllers 2017-06-01 13:37:16 -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
a0ba1a64b5 Merge branch 'master' of github.com:highfidelity/hifi into head-puck 2017-05-30 22:52:57 +01:00
Dante Ruiz
4c4811dca8 finished the head puck 2017-05-30 22:52:39 +01:00
Seth Alves
ffe844a8e7 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-05-30 13:42:20 -07:00
Dante Ruiz
a45bea2c90 fixed merge conflicts 2017-05-27 00:57:09 +01:00
samcake
882df7391b Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-26 16:47:49 -07:00
Dante Ruiz
d317d9236f made requested changes 2017-05-26 16:40:21 +01:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07: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
samcake
044110e4f3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-24 15:40:40 -07: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
Sam Gateau
0f250e693d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-17 09:49:20 -07:00
Anshuman Dewangan
e3cd85bd22 Changed calibration time from 2 to 1 sec 2017-05-16 13:55:04 -07:00
samcake
2df6d0df48 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-15 13:40:56 -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
samcake
3393456d91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-12 10:15:13 -07: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