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

290 commits

Author SHA1 Message Date
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
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
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
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
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
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07: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
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 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
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -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
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
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -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
Brad Hefta-Gaub
3a68f48cd7 disable threaded reprojection when running oculus in OpenVR 2016-11-14 16:30:18 -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
f8fb5b9709 avoid some more static/global QStrings in plugins 2016-11-13 11:29:19 -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
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
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
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
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