Commit graph

200 commits

Author SHA1 Message Date
David Rowe
0f324ee9ae Merge branch 'v2020.2.2-rc' into feature/openvr-linux
# Conflicts:
#	plugins/openvr/CMakeLists.txt
#	plugins/openvr/src/ViveControllerManager.cpp
2020-06-19 16:27:53 +12:00
David Rowe
ce96fc61d6 Remove unused code 2020-05-24 13:16:26 +12:00
David Rowe
1ac184bd22 Fix further type errors 2020-05-24 13:16:15 +12:00
David Rowe
6981937697 Fix path to header file 2020-05-23 20:42:22 +12:00
David Rowe
c0e36b7960 Address code review comments 2020-05-16 14:37:40 +12:00
Seth Alves
cb83e4e6c9 adjust to new eye matrix 2020-04-26 12:25:19 -07:00
Seth Alves
67f4811c2b blink actions were renamed 2020-04-26 12:24:47 -07:00
Seth Alves
a0031c6f10 eye and hand tracking for htc vive pro 2020-04-26 12:24:45 -07:00
David Rowe
5624ba6e14 Fix JSDoc for some Controller.Hardware.Vive property names 2019-09-04 21:05:06 +12:00
David Rowe
59533d0f59 Controller JSDoc update 2019-04-10 08:51:14 +12:00
Anthony Thibault
a7a71e4286 Merge branch 'master' into feature/hmd-avatar-alignment-type 2019-01-23 15:52:20 -08:00
Anthony Thibault
5d606981de Added HMD Avatar Alignment Type
Adds a new API to set this type, and an option to the Avatar App.

* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
  If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head.  The new default behavior.
  This prevents the body from lifting off of the ground while wearing a large headed avatar.  But can cause an offset between the users eyes and the avatars eyes.
2019-01-08 18:35:28 -08:00
David Rowe
84c6bb4797 Introduce optional timestamp into internal Controller axis values
This can be used to determine if consecutive identifical values should
be output.
2018-12-31 12:15:51 +13:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
2018-12-07 12:09:44 -08:00
Anthony Thibault
7f2e427584 Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
2018-12-03 18:56:45 -08:00
Anthony Thibault
c0bf832e39 Head and Hand offsets for Vive Trackers now function as expected
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now.  This gives you the ability to adjust
the offsets of the pucks to the hands/head.  For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
2018-12-02 16:18:36 -08:00
Anthony Thibault
ac8869eb61 Bug fix for head trackers in desktop mode
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
2018-11-05 16:21:19 -08:00
Anthony Thibault
a776f7e55a Changed default for OutOfRange data to Drop. 2018-10-09 10:51:02 -07:00
Anthony Thibault
7777f3edd0 Added OutOfRangeDataStrategy parameter to Controller Settings
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.

* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
  In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results.  This is the default.
2018-10-09 10:51:02 -07:00
Anthony Thibault
b62ca2b75c Better configuration, i.e. which puck is associated with which limb.
Previously we where incorrectly sorting the pucks along the x axis.
This could cause the order to be wrong if you were not standing along the z axis w.r.t the vive tracked volume.
2018-10-01 18:43:19 -07:00
Anthony Thibault
b6d7b9b544 spelling 2018-09-25 10:44:00 -07:00
Anthony Thibault
a41591323b Code review feedback. 2018-09-25 10:42:43 -07:00
Anthony Thibault
fa27bb7e11 Bug fix for Vive puck calibration of hands and feet
Before this PR, there were small errors that can occur if you calibrate while not facing down the z-axis in vive sensor space.
As indicated by the small arrow in the steam vr grid.

The hands could end up flipped 180 degrees and the feet could end up with an incorrect offset resulting in a wider or narrower stance then expected.
This PR is intended to fix these issues.
2018-09-24 16:56:22 -07:00
Alexander Ivash
57f32e64c1 remove the code of the rendering vive controllers and any code that uses that menu option. 2018-07-06 21:00:56 +03:00
Alexander Ivash
eb97f99db1 Revert "commented out code responsible for creating / populating 'Avatar' menu (per request from Mukul)"
This reverts commit d40d1a9985770d2da82f5291ee33a7cfe8a73652.
2018-07-06 21:00:55 +03:00
Alexander Ivash
bc6bfc1003 commented out code responsible for creating / populating 'Avatar' menu (per request from Mukul) 2018-07-06 21:00:55 +03:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data
Get the correct device name connect to OpenVr
2018-04-24 13:29:41 -07:00
David Rowe
f865a13326 Doc review 2018-04-21 14:10:14 +12:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Dante Ruiz
1bae22fed0 get actual name for OpenVrDispayPlugin 2018-02-28 16:32:53 -08:00
Dante Ruiz
1bc8484a4b determine OpenVr headset namme 2018-02-28 11:50:52 -08:00
Dante Ruiz
82fb58ed96 remove debug statement 2017-11-29 10:58:10 -08:00
Dante Ruiz
9a5f0dea95 better solution 2017-11-28 13:16:47 -08:00
Dante Ruiz
7daad29906 Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-28 10:44:04 -08:00
Dante Ruiz
039abff861 fix viveControllerManager not registering the vive input is no hand controllers are present 2017-11-28 10:43:37 -08:00
Menithal
5d52b9936b 21539: Updated Logic to match request 2017-11-27 07:42:18 +02:00
Menithal
e28f80401f 21539: Removed debug, added whitespace for format 2017-11-05 01:07:35 +02:00
Menithal
ac1df7b815 21539: Allow HMD to turned off in Desktop Mode 2017-11-05 01:02:08 +02:00
Anthony J. Thibault
f081c36f25 ViveControllerManager: Code review feedback on PR #11422 2017-09-26 14:19:31 -07:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Anthony J. Thibault
6c2b6674bb load and save shoulderConfig to settings. 2017-07-27 17:33:54 -07:00
Anthony J. Thibault
8dc9714282 Pass armCircumference and shoulderWidth to qml. 2017-07-27 09:08:34 -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
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
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