Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-20 04:03:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86513 commits 25 branches 28 tags 1.2 GiB
Commit graph

942 commits

Author SHA1 Message Date
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Bradley Austin Davis
cb3456195e Fix OSX Oculus plugin 2018-01-15 10:48:39 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
c924cbf2a7 Remove explicit gpu-gl dependencies 2018-01-13 12:20:41 -08:00
Brad Davis
22d133c71f Allow GLES client on desktop builds 2018-01-11 23:31:34 -08:00
Anthony J. Thibault
dd0e57026e Oculus Touch: More accurate spin on thrown objects 
The internal computation of angular velocity was incorrect.
Apparently, the ovrPoseStatef.AngularRotation is not in sensor frame but local to the controller rotation.
 2018-01-08 15:28:59 -08:00
Dante Ruiz
82fb58ed96 remove debug statement 2017-11-29 10:58:10 -08:00
Dante Ruiz
eba8a6e17b Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-29 10:50:37 -08:00
Dante Ruiz
9a5f0dea95 better solution 2017-11-28 13:16:47 -08:00
Anthony J. Thibault
8364700b7a Head tracking bug fix for vive HMD users 2017-11-28 12:19:16 -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
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539 
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
 2017-11-27 16:02:01 -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
luiscuenca
70b37f2e8a Cleaning some old tabs 2017-10-27 11:32:44 -07:00
luiscuenca
f32282afdd Clean update bug 8027 2017-10-27 11:03:02 -07:00
Anthony J. Thibault
d8e2cbf871 Oculus: Bug fix for head offset on large/small scaled avatars. 2017-09-28 16:20:09 -07:00
Seth Alves
ae42d56cd6 Merge pull request #11465 from hyperlogic/bug-fix/teleporter-near-scale 
Teleport.js: can now teleport small distances with small avatar scale
 2017-09-26 19:05:14 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07: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
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Anthony J. Thibault
f314ba38df Oculus: fix for lighting changes as avatar scale changes 
The code was incorrectly NOT using the near and far clip distances when computing
the culling projection matrix. This projection matrix is used by the lighting system
to for deferred lighting, if it does not match actual projection used for
rendering into the g-buffer, the lighting will be incorrect.
 2017-09-18 14:38:03 -07:00
Anthony J. Thibault
7e2b2960ed Fix for lighting as IPD scale changes. 
(cherry picked from commit a260aaaae8)
 2017-09-18 12:15:32 -07:00
Anthony J. Thibault
b81f85e1ae Merge branch 'master' into feature/ant-man 2017-09-11 15:14:03 -07:00
Bradley Austin Davis
48b6586d01 Modifying SDL initialization due to crash on OSX 2017-09-08 11:36:32 -07:00
Anthony J. Thibault
2f850826f2 Allow override of near/far clip planes in Oculus and OpenVR plugins 2017-09-06 11:02:44 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
ZappoMan
87b2af25ba re-enable sixense and update comment 2017-08-10 12:03:56 -07:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
Brad Davis
5a7a6bab70 Remove PDB files, eliminate sixense 2017-08-02 14:08:46 -07:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
Andrew Meadows
d4e72df928 Merge pull request #10711 from burtsloane/midi 
Midi support for Entities
 2017-07-28 10:51:43 -07:00
Chris Collins
4684b388c7 Merge pull request #10987 from SamGondelman/hmd59Crash2 
Fix crash when putting on HMD for Qt 5.9
 2017-07-28 07:41:07 -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
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Burt Sloane
d2975c79c9 add midi to 3 CMakeLists.txt for linking 2017-07-26 08:41:26 -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
Brad Davis
8d37e54a4e Merge pull request #11051 from highfidelity/qt59 
Changes for Qt 5.9 warnings and build issues
 2017-07-25 15:05:28 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418 
Don't execute body of controllers' plugin update methods if not enabled
 2017-07-25 08:51:17 -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
David Rowe
cfd155c198 Merge branch 'master' into 21418 2017-07-06 16:56:10 +12: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
063984f573 Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update 2017-07-03 16:44:47 +01:00
Dante Ruiz
6f30cb1825 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-01 00:48:49 +01:00
Dante Ruiz
51792769b5 finished vive in desktop mode 2017-07-01 00:48:36 +01:00
David Rowe
07697c5083 Merge branch 'master' into 21418 
# Conflicts:
#	interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
#	interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml

Removed stray "Vive Controller Picks" configuration item which no longer exists.
 2017-07-01 11:19:00 +12: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
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396 
Make Leap Motion a plugin
 2017-06-30 14:37:23 -07: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
David Rowe
be0e1a75a4 User-friendly SDL2 controller name 2017-06-29 10:03:58 +12:00
David Rowe
88ed69a4a1 Code review 2017-06-29 08:58:27 +12:00
Dante Ruiz
a2df2f8472 added user activity status 2017-06-28 19:52:19 +01:00
Seth Alves
59e72470f3 Merge pull request #10793 from druiz17/wide-stance-fix 
MoCap wide stance fix for calibration
 2017-06-26 10:13:26 -07:00
David Rowe
72d712ac76 Add "enabled" setting for Sixense; bail in update if note enabled 2017-06-26 16:43:06 +12:00
David Rowe
361bc1ce03 Add "enabled" setting for SDL2 joystick; bail in update if not enabled 2017-06-26 16:00:18 +12:00
David Rowe
5abd254a58 Bail in Neuron plugin update if plugin not enabled 2017-06-26 15:58:14 +12:00
David Rowe
384e2cefdb Update make file per master changes 2017-06-24 09:53:58 +12:00
David Rowe
6e266dfbac Merge branch 'master' into 21396 2017-06-24 09:19:12 +12:00
Brad Davis
fe7d4b1d23 Remove dependency between codec plugins and UI 2017-06-23 12:25:18 -07:00
David Rowe
9f48a139cc Fix crash when enable Leap Motion 2017-06-23 18:37:48 +12:00
David Rowe
e1dcf01706 Better settings text 2017-06-23 17:33:02 +12:00
Dante Ruiz
b48efc4317 fixed wide stance issue 2017-06-22 22:48:32 +01:00
David Rowe
f633f074b3 Post-merge fix 2017-06-23 00:24:28 +12:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
David Rowe
3bdf267900 Implement fingers control 2017-06-22 23:32:06 +12: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
David Rowe
61bb853cdd Fix hand position 2017-06-19 17:26:55 +12:00
David Rowe
cacc89e8b6 HMD hand positions and orientations 2017-06-19 17:21:44 +12:00
David Rowe
deae33fd1e Add setting for desktop "zero" height offset 2017-06-18 17:43:52 +12:00
David Rowe
2d1cc12bc5 Desktop hand positions and orientations 2017-06-18 16:40:55 +12:00
David Rowe
5b6a5525b6 Initial control of avatar hand positions 2017-06-18 13:03:54 +12:00
David Rowe
0d986b8dc2 Signal when Leap Motion is connected 2017-06-17 14:43:32 +12:00
David Rowe
8d84e86d19 Apply sensor location setting 2017-06-17 13:57:43 +12:00
David Rowe
5de585e320 Leap Motion activation 2017-06-17 13:56:44 +12:00
David Rowe
2ca4283828 Fix Leap Motion SDK access 2017-06-17 12:02:26 +12: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
David Rowe
febd0eaf98 Add Leap Motion settings 2017-06-16 10:58:11 +12:00
David Rowe
170cf8156f Add plugin ID 2017-06-16 10:11:08 +12:00
David Rowe
6b2fbbf5fe Add logging category 2017-06-16 10:05:33 +12: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
David Rowe
9c431a11af Set up Leap Motion plugin container 2017-06-15 17:50:07 +12: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
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -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
e125e1f608 fix issue that caused jenkin to fail buiuling code 2017-06-13 00:37:32 +01: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
Seth Alves
b1c7c251ac Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-07 10:09:46 -07: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
NeetBhagat
c3621d7c32 Resolved two issues: 
1) While in HMD mode -> open Tablet -> Click Desktop.  Desktop mode will be on.
2) Menu sync problem while switching modes.
 2017-06-06 22:31:14 +05:30
Seth Alves
ad1ee97324 remove cruft 2017-06-06 09:50:40 -07: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
9654e007a6 most input plugins are not head or hand controllers 2017-06-02 16:31:08 -07:00
Seth Alves
3359a0a794 work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation 2017-06-02 15:29:20 -07: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
NeetBhagat
e08c3453a4 Merge branch 'master' into 21255 2017-06-02 12:36:07 +05:30
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
7d21ab88b0 add some saftey checks. cleanups 2017-06-01 16:14:59 -07:00
anshuman64
694d1d042d Merge pull request #10573 from druiz17/head-puck 
Added head puck configuration
 2017-06-01 16:06:00 -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
552b69bb1c cleanups 2017-06-01 13:47:19 -07:00
Seth Alves
ac6135387c display plugins are never head controllers 2017-06-01 13:37:16 -07:00
Seth Alves
eb94c48c5b merge from upstream 2017-06-01 10:10:11 -07:00
Sam Cake
07eb1d89e1 fixing the warning on macosx about the non portable file name 2017-05-31 23:59:44 -07:00
NeetBhagat
c7c07b28e9 Resolve the reviewed comments of @ZappoMan 2017-06-01 12:17:13 +05:30
Zach Pomerantz
954e4979f8 expose Audio.devices.input/output 2017-05-31 20:14:58 -04:00
Seth Alves
e37387f45c sync 2017-05-31 14:01:09 -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
Seth Alves
2ad85c158a more work on getting head routed through input system 2017-05-30 17:11:56 -07: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
Seth Alves
e82e80e8e0 OculusDebugDisplayPlugin is head controller 2017-05-30 09:55:33 -07:00
volansystech
212627bd5d Merge branch 'master' into 21255 2017-05-29 17:51:45 +05:30
volansystech
0920dbc1a8 Resolve the comments of @ZappoMan. 2017-05-29 15:53:33 +05:30
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
volansystech
1f24e38585 Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift. 2017-05-25 14:56:06 +05:30
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
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
samcake
39f6e22da3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-10 09:48:26 -07: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
samcake
bc41be7ec1 Introucing the BackgroundStage to manage the background / skybox in one place 2017-05-09 17:10:05 -07: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
03ba3f5944 minimize diff 2.0 2017-05-09 00:31:13 +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
Ryan Huffman
aca7ad27c6 Fix ktx dependencies 2017-04-26 10:47:32 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Mohammed Nafees
3382f9f5eb Remove unnecessary dependencies from hifiCodec 2017-04-25 00:42:45 -04:00
Sam Cake
2b97171061 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 01:06:01 -07:00
Sam Cake
038d01ce04 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 00:45:50 -07:00
Andrew Meadows
e64e2614e3 Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter 
Kinect hand filter
 2017-04-12 14:27:05 -07:00
Al Bernstein
ead4793392 removed whitespace 2017-04-06 17:26:12 -07:00
Al Bernstein
c628b23895 removed whitespace 2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd used thread safe moving average for the quaternions 2017-04-06 16:56:03 -07:00
Al Bernstein
de1fdfacca made requested changes in PR10147 2017-04-06 16:18:40 -07:00
Anthony J. Thibault
4e49774d0e Moved device class check into handleTrackedObject 2017-04-06 13:20:00 -07:00
Al Bernstein
e6e5224647 clean ups - coding standard 2017-04-06 11:27:58 -07:00
Al Bernstein
001c92416b clean ups - coding standard 2017-04-06 11:23:33 -07:00
Al Bernstein
4a17112478 Kinect moving average filter for hands 2017-04-06 11:08:09 -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 Thibault
be2fdd9388 Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects 
Vive: Expose all 16 tracked poses to the controller system
 2017-04-05 16:53:47 -07:00
Dante Ruiz
81ae3e44fd Merge branch 'master' of github.com:highfidelity/hifi into oculus-tracking 2017-04-04 22:11:08 +01:00
Dante Ruiz
a31812821a oculus lost tracking, delay hand to side 2017-04-04 22:10:47 +01:00
Andrew Meadows
66ff551a7c Merge pull request #10080 from ZappoMan/footActions 
add foot IK targets as actions, map Kinect feet to foot targets
 2017-04-03 12:06:14 -07:00
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -07:00
ZappoMan
4da8e5e18f fix left/right legs for kinect 2017-03-30 20:01:59 -07:00
samcake
26000288d7 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-03-30 11:45:12 -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
samcake
b6504bba56 Moving the num mips per texture to the creator so it s immutable and simpler 2017-03-29 17:58:56 -07:00
ZappoMan
6f2f80e334 make sure kinect plugin debugging setting is actually saved and loaded 2017-03-29 14:06:11 -07:00
ZappoMan
9d3e8818f7 fix build 2017-03-28 18:49:36 -07:00
ZappoMan
80fb7bc287 add extra debugging to the kinect plugin 2017-03-28 18:42:15 -07:00
ZappoMan
bdfbc13185 add support for hand rotations to the kinect plugin, add notes on mapping from kinect orientations to our frame orientations 2017-03-28 15:09:03 -07:00
Ryan Huffman
56c5f06365 Fix Oculus Touch + Remote not being detected after initial launch 2017-03-23 16:29:08 -07:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Bradley Austin Davis
ce9d637b3f Expose ASW activation status, provide normalized present rate information 2017-03-03 10:46:05 -08:00
Bradley Austin Davis
fa5b315e09 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-01 15:16:18 -08:00
Seth Alves
7a31a99e3c back out previous experiment 2017-02-25 21:13:20 -08:00
Bradley Austin Davis
7fb7aa87eb Working on new texture management strategy 2017-02-17 07:53:16 -08:00
Brad Hefta-Gaub
edf4cfa377 Merge pull request #9615 from kencooke/audio-packetloss-fix 
Reduce audio clicks/pops caused by packet loss
 2017-02-06 13:12:08 -08:00
Ken Cooke
4acb99cd4f Use interpolated audio (codec packet-loss concealment) or zero samples (if no codec) when audio packets are lost. This audio is still processed by the audio pipeline to avoid clicks/pops. 2017-02-06 09:29:39 -08:00
Brad Hefta-Gaub
2a20ce6062 fix kinect plugin claiming to have hands when not enabled 2017-02-04 10:38:46 -08:00
Stephen Birarda
1993e358d6 Merge pull request #9318 from birarda/ovr-platform-entitlement 
handle OVR Platform entitlement checks
 2017-01-16 11:16:31 -08:00
Brad Davis
15b9e750f9 Adding tracking of Oculus renders, submits, and frames that are over budget 2017-01-06 10:51:26 -08:00
Stephen Birarda
8f279ce1f7 only pop to check entitlements if oculus store build 2017-01-05 14:21:35 -08:00
Stephen Birarda
46086cdcce set the OCULUS_STORE property with oculus store arg 2017-01-05 14:02:35 -08:00
Stephen Birarda
2ec9b81aa6 fix passing of OCULUS_APP_ID to platform SDK initialization 2017-01-05 11:38:57 -08:00
Stephen Birarda
f592d8d894 force entitlement check for all builds with OCULUS_APP_ID 2017-01-05 11:38:47 -08:00
Stephen Birarda
b87a1b2b2b only fire the entitlement check if OCULUS_APP_ID is set 2017-01-05 11:38:32 -08:00
Stephen Birarda
ea3e5f702a add popping of messages for entitlement check 2017-01-05 11:20:45 -08:00
Stephen Birarda
4278d7b20d download and link oculus platform for oculus plugin 2017-01-05 11:20:44 -08:00
Brad Davis
9bf4804d3d Use a higher thread priority for Oculus present 2017-01-05 11:04:50 -08:00
Brad Hefta-Gaub
84eca0159e Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval 
Conflicts:
	tests/networking/src/ResourceTests.cpp
 2016-12-29 16:42:52 -08:00
Atlante45
e5901fa875 Make getHardwareStats thread safe 2016-12-29 11:13:55 -08:00
Atlante45
f46b8f3e6d Track compositor dropped frames as well. 2016-12-29 10:17:40 -08:00
Brad Hefta-Gaub
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00
Atlante45
f79c6e08f5 Track dropped frames as reported by the Oculus SDK 2016-12-28 14:18:23 -08:00
Seth Alves
1bcb5ceaff quiet some warnings 2016-12-26 20:16:05 -08:00
Brad Davis
e58623bcc0 Working on test/trace script interface 2016-12-22 11:46:40 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Ryan Huffman
2e25f18e76 Adjust positioning of avatar hands to match touch controller position 2016-12-16 11:03:20 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Stephen Birarda
4c1f99954b fix confusing MIN_CORES_SPEC comment 2016-12-14 17:49:08 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
Atlante45
07802eb284 Fix Oculus Touch flags check 2016-12-13 17:08:00 -08:00
Brad Hefta-Gaub
a2ba03284e Merge pull request #9186 from ZappoMan/kinectPlugin 
Kinect Plugin
 2016-12-13 15:29:41 -08:00
Brad Hefta-Gaub
1d07711937 CR feedback 2016-12-12 17:36:01 -08:00
Brad Hefta-Gaub
d51b408c12 more work on hand tracking 2016-12-12 08:46:21 -08:00
Brad Hefta-Gaub
fdf9dc432d only build if kinect SDK is available 2016-12-09 08:30:33 -08:00
Brad Hefta-Gaub
053b1bedc4 add orientation 2016-12-09 08:29:21 -08:00
Brad Hefta-Gaub
b6838c6ec4 more debugging 2016-12-08 23:32:03 -08:00
Brad Hefta-Gaub
4959a88581 first cut at kinect input plugin 2016-12-08 22:13:56 -08:00
Atlante45
7b0b777051 Honor reorient and quit request from OVR 2016-12-07 17:29:54 -08:00
Anthony J. Thibault
9b0ce556e7 Added preferences for the Perception Neuron plugin. 
By default this plugin is disabled.
The server address and port number are also configurable.
 2016-11-23 10:10:00 -08:00
Brad Hefta-Gaub
3a68f48cd7 disable threaded reprojection when running oculus in OpenVR 2016-11-14 16:30:18 -08:00
Seth Alves
7a160ce5e8 try, try again 2016-11-13 13:39:31 -08:00
Seth Alves
645134e4b0 try, try again 2016-11-13 13:26:15 -08:00
Seth Alves
da83fd9fa4 try, try again 2016-11-13 12:56:16 -08:00
Seth Alves
946dc256f0 try, try again 2016-11-13 12:15:35 -08:00
Seth Alves
359f05426c try, try again 2016-11-13 12:14:48 -08:00
Seth Alves
45bcf626aa try, try again 2016-11-13 11:48:49 -08:00
Seth Alves
f8fb5b9709 avoid some more static/global QStrings in plugins 2016-11-13 11:29:19 -08:00
Seth Alves
9b4a8427e6 global/static QString 2016-11-13 11:09:27 -08:00
Seth Alves
9868ddd602 global/static QStrings in plugins appear to cause crashes during shutdown 2016-11-13 10:22:14 -08:00
Chris Collins
b9b90cc646 Merge pull request #9047 from jherico/stutter 
Add stutter tracking
 2016-11-11 11:39:00 -08:00
Brad Davis
162f24decd Add stutter tracking for Oculus 2016-11-11 10:12:41 -08:00
Brad Davis
90f55f0cd5 Add stutter tracking 2016-11-10 11:56:38 -08:00
Brad Davis
e2991c3665 Change minimum cores to 3 to enable OpenVR 2016-11-10 10:35:05 -08:00
Ryan Huffman
687605ad38 Add proper adding and removal of subdeviceNames in SDL2Manager after startup 2016-11-03 14:02:58 -07:00
Ryan Huffman
ba7eac5281 Override getSubdeviceNames in OculusControllerManager 2016-11-01 13:53:10 -07:00
Ryan Huffman
ba0dbeac80 Add InputManager::getSubdeviceNames 2016-11-01 13:36:20 -07:00
Brad Davis
23fc865d40 Updates for min spec check 2016-10-27 19:28:46 -07:00
Brad Davis
018d945b85 Display warning overlay instead of scene when below min spec 2016-10-27 15:51:26 -07:00
Brad Hefta-Gaub
6d94df346f add async reprojection stat to oculus too 2016-10-27 14:00:30 -07:00
Brad Hefta-Gaub
bfe6ebb44f some tweaks 2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub
c3f5df8f0b Merge branch 'master' of https://github.com/highfidelity/hifi into report45hzTarget 2016-10-27 11:36:56 -07:00
Brad Hefta-Gaub
03946748bc Merge pull request #8928 from hyperlogic/bug-fix/more-openvr-crash-fixes 
Fix for crash in openvr on startup
 2016-10-26 22:45:33 -07: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
Brad Davis
a53049b186 Consolidate activity tracking code 2016-10-26 17:19:24 -07:00
Brad Davis
f4f1b04cf0 Use OpenVR to determine if async reprojection is enabled 2016-10-26 16:02:06 -07:00
Brad Davis
1c89fa2291 Make threaded submit in OpenVR controllable from menu 2016-10-26 15:28:42 -07:00
Brad Davis
857f5a69d6 Don't reserve additional thread when we're not using one 2016-10-26 15:28:41 -07:00
Brad Davis
e7355e84f3 Disable OpenVR submit thread 2016-10-26 15:28:40 -07:00
Brad Hefta-Gaub
23b74c7aff when vive is on i5 report a target frame rate of 45 so we can see that in stats 2016-10-26 14:20:58 -07:00
Anthony J. Thibault
ca9d497159 Updated viveControllerConfiguration.js with new controller offset 
(cherry picked from commit ec2bc3495082dfb0b472948efa9d6881562ed3f9)
 2016-10-19 15:59:44 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Zach Pomerantz
876f70709e change oculus init errors to critical 2016-10-17 11:57:32 -07:00
Zach Pomerantz
2191903803 avoid uninitialized oculus gl calls 2016-10-17 11:08:38 -07:00
Brad Davis
ff3d1b3d01 Don't use VR compositor if it doesn't exist 2016-10-13 16:53:37 -07:00
Brad Davis
d4e83a7461 Don't crash on OpenVR activation when SteamVR isn't running 2016-10-13 16:37:50 -07:00
Brad Hefta-Gaub
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
Brad Davis
2d6522a76f Merge pull request #8786 from hyperlogic/bug-fix/more-openvr-shutdown-crashes 
Prevent crashes in openvr on shutdown
 2016-10-12 13:54:56 -07:00
Brad Hefta-Gaub
8ac31a041d Merge pull request #8654 from ZappoMan/betterAway 
fix away HMD unmouted logic
 2016-10-11 20:35:08 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
Anthony J. Thibault
973ee544fb Prevent crashes in openvr on shutdown 
By ensuring that there is an opengl context is bound before calling VR_Shutdown()
 2016-10-11 16:36:29 -07:00
Anthony J. Thibault
7ab76984ad Fix crash when switching to desktop mode from oculus HMD mode 
Removed internalPresent in oculus uncustomizeContext.  It had no ill effects.
 2016-10-10 16:54:08 -07:00
Brad Hefta-Gaub
735a6ca994 Merge pull request #8755 from hyperlogic/bug-fix/openvr-fixes 
openvr deadlock and crash on exit fixes
 2016-10-10 08:01:07 -07:00
Brad Hefta-Gaub
3aa1c36f53 Merge branch 'master' of https://github.com/highfidelity/hifi into betterAway 2016-10-08 11:50:10 -07:00
Brad Hefta-Gaub
87d66ffdf8 Merge pull request #8756 from jherico/i5_reprojection 
Turn on forced reprojection on i5 systems
 2016-10-08 10:51:27 -07:00
Anthony J. Thibault
ec801cb9d8 Addressed feedback from code review. 2016-10-07 17:46:46 -07:00
Ryan Huffman
de14fdffb7 Remove commented log line 2016-10-07 13:38:18 -07:00
Brad Davis
8526ac74a5 Turn on forced reprojection on i5 systems 2016-10-07 13:36:49 -07:00
Anthony J. Thibault
17d00ee3f9 Workaround openvr crash by calling Submit before VR_Shutdown 2016-10-07 11:41:58 -07:00
Ryan Huffman
d589812c52 Update hand controller detection 2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00
Ryan Huffman
54498a8f3f Add the ability to ignore invisible entities in findRayIntersection 2016-10-07 10:30:18 -07:00
David Rowe
1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-06 09:29:09 +13:00
Bradley Austin Davis
ce8fcfed36 Fix mac build (again?) 2016-10-02 17:42:10 -07:00
Brad Davis
488d191428 Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00
Brad Davis
d3d3aa587c Remove oglplus usage from OpenVR 2016-10-02 11:44:33 -07:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
Brad Hefta-Gaub
73e3e993fb fix Vive's HMD.mounted 2016-09-26 17:29:11 -07:00
Brad Hefta-Gaub
8f96715521 only activate a touch device if one is connected 2016-09-23 14:30:34 -07:00
Seth Alves
92bda6827b remove vive keyboard 2016-09-13 11:27:10 -07:00
Brad Davis
94210d2e69 Use dynamic count for global thread pool 2016-09-02 15:23:35 -07:00