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
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
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
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
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
Brad Davis
d3d3aa587c
Remove oglplus usage from OpenVR
2016-10-02 11:44:33 -07:00
Brad Hefta-Gaub
73e3e993fb
fix Vive's HMD.mounted
2016-09-26 17:29:11 -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
Brad Davis
91bfa7677c
Updating stats display for threaded rendering
2016-09-02 14:41:49 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
Brad Davis
02c79d9714
Fix the OpenVR issues on AMD
2016-08-26 19:05:29 -07:00
James B. Pollack
f7697c88ae
Merge pull request #8476 from zzmp/fix/vive-ati
...
fix vive crash in AMD driver
2016-08-24 18:06:18 -07:00
howard-stearns
6daf91166f
pr comments
2016-08-22 15:03:51 -07:00
Zach Pomerantz
dbb916e2d9
fix redundant openvr fence condition
2016-08-22 13:59:18 -07:00
Zach Pomerantz
a67c5221e3
flush openvr fence before looking for it
2016-08-22 13:46:00 -07:00
howard-stearns
b8b345fb43
Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2
2016-08-19 13:04:39 -07:00
Brad Davis
a32ab77b7d
Address issues with random camera locations caused by bad HMD sensor poses
2016-08-17 15:22:30 -07:00
howard-stearns
2b75240771
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-16 11:14:36 -07:00
Brad Davis
99009d8a2d
Enable reprojection on OpenVR
2016-08-12 22:29:04 -07:00
Brad Davis
ff24bc982c
Re-disable reprojection in OpenVR
2016-08-12 22:28:58 -07:00
Brad Davis
82081d7d57
Address vsync weirdness
2016-08-12 22:28:58 -07:00
Brad Davis
719e555381
Restoring reprojection to OpenVR
2016-08-12 22:28:55 -07:00
Brad Davis
a4c5c7bc16
Hopefully better handling of the OpenVR api
2016-08-12 22:28:40 -07:00
Brad Davis
b662ae4cfa
More profiling ranges
2016-08-12 22:28:36 -07:00
Brad Davis
d8b0fee934
Fixing color balance, enabling vive controllers
2016-08-12 22:28:30 -07:00
Brad Davis
adcfd55cc0
Batch replay reprojection
2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf
Working on reprojection
2016-08-12 22:28:22 -07:00
Bradley Austin Davis
274321de8a
First pass at threaded rendering
2016-08-12 22:18:36 -07:00
Atlante45
45921a5c8d
Restore split behavior for inputs/displays on quit
2016-08-08 15:39:25 -07:00
howard-stearns
6e7b828203
keep qml text fields up to date with vive virtual keyboard
2016-08-02 10:13:35 -07:00
Anthony J. Thibault
90beb30e8a
Filter out bad openvr HMD poses that are below the floor
...
When interface is launched and steam vr is NOT running, openvr can return bad HMD poses for a few frames.
To workaround this, filter out any hmd poses that are obviously bad, i.e. beneath the floor.
2016-07-19 18:12:20 -07:00
Brad Davis
90299a98fe
PR feedback
2016-07-15 12:19:02 -07:00
Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
Brad Davis
88d28120b6
Adding missed file
2016-07-01 15:48:58 -07:00
Brad Hefta-Gaub
39ff03cfb5
reduce log spam in Vive plugins
2016-06-24 10:53:46 -07:00
howard-stearns
581d87d653
feedback re magic numbers and variable name.
2016-06-22 16:40:10 -07:00
howard-stearns
67f76db7e4
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-22 15:58:53 -07:00
Howard Stearns
a1844d8c19
Fix plugin include. (How did this build for me locally?)
2016-06-21 17:36:41 -07:00
howard-stearns
baa9139881
Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 17:02:23 -07:00
Ryan Huffman
70be7b3273
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions
2016-06-21 16:39:25 -07:00
Ryan Huffman
da71fcb57f
Update connected device detection implementation
2016-06-21 16:37:58 -07:00
Brad Davis
f3bad3a63b
Don't trigger keyboard on revealing the overlay layer
2016-06-21 16:04:06 -07:00
howard-stearns
8421931c56
Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui
2016-06-21 14:47:45 -07:00
Ryan Huffman
251e2137d3
Remove old use of connectedDevice
2016-06-21 13:31:10 -07:00
Brad Hefta-Gaub
160a5de271
CR feedback
2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
howard-stearns
2ac6dc8798
do not tilt virtual keyboard
2016-06-21 09:48:01 -07:00
Bradley Austin Davis
5bc8b53d1b
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-17 10:56:53 -07:00
Bradley Austin Davis
6ad1008a56
Allow explicit overlay alpha from scripts
2016-06-15 17:24:32 -07:00
Bradley Austin Davis
87dc6649ce
Better track keyboard open state, fix text replacement
2016-06-15 15:16:29 -07:00
Bradley Austin Davis
0b0977f362
Support keyboard suppresion, control suppresion while in keyboard mode
2016-06-15 10:48:48 -07:00
Bradley Austin Davis
71bf9384ce
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-15 10:45:51 -07:00
Atlante45
5560ba9a4c
Quit application when SteamVR requests it
2016-06-14 16:29:50 -07:00
Bradley Austin Davis
f3c47acbb2
Fix offset when UI transform is not identity
2016-06-14 09:49:25 -07:00
SamGondelman
df9fd6c7fc
reset vive grip buttons to 0 if not pressed
2016-06-13 18:35:39 -07:00
Bradley Austin Davis
6707f889b8
Fixing laser offset, support laser in Oculus
2016-06-13 17:33:18 -07:00
Brad Davis
9640727f51
Hand laser rendering support in HMD plugins.
2016-06-13 13:04:11 -07:00
Brad Davis
472a3540d7
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
scripts/system/controllers/handControllerGrab.js
2016-06-10 10:43:09 -07:00
Brad Hefta-Gaub
8434aa9416
Merge pull request #8027 from SamGondelman/exposeHaptics
...
Expose haptics to JS
2016-06-08 16:17:04 -07:00
Brad Hefta-Gaub
69ae33ad9a
Merge pull request #7997 from SamGondelman/touchFixes
...
Corrected Oculus Touch coordinate system so that hands track properly
2016-06-08 15:39:17 -07:00
Brad Davis
40778d7f29
Allow env disabling of the keyboard. Show keyboard after short delay to avoid flickers
2016-06-08 10:41:19 -07:00
Brad Davis
79c68b2ecb
Working on positioning of the keyboard
2016-06-07 21:52:22 -07:00
Brad Davis
c2aa9e7f61
Update SteamVR keyboard behavior
2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0
Enable Steam VR text input
2016-06-07 21:52:20 -07:00
Brad Davis
ca6e86e767
Merge remote-tracking branch 'upstream/master' into vive-ui
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-06-07 21:51:47 -07:00
SamGondelman
ff2405437b
can set strength to 0
2016-06-07 12:19:38 -07:00
SamGondelman
b59d597780
if overlapping calls, haptics take on strength and duration of call that will finish last
2016-06-06 15:35:12 -07:00
SamGondelman
cea0d74c35
fix spaces and touch duration
2016-06-06 15:20:10 -07:00
SamGondelman
e7743cd8e2
added options for both hands (default), all devices, short pulse, and fixed touch timing mechanism
2016-06-06 15:03:08 -07:00
Atlante45
3dadb515f3
Add plugins name to their metadata file
2016-06-06 13:28:36 -07:00
SamGondelman
afca0ec2c9
moved vive pulses to correct thread, works with duration
2016-06-06 13:25:05 -07:00
SamGondelman
f51cb7ce0c
trying to add duration support for vive
2016-06-06 10:34:32 -07:00
Brad Davis
b7d1659852
Merge remote-tracking branch 'upstream/master' into vive-ui
2016-06-06 09:32:33 -07:00
howard-stearns
849bee977a
Do not send stale vive data as valid after deactivating.
...
(cherry picked from commit e6cc1fabe0
2016-06-04 09:07:51 -07:00
Brad Hefta-Gaub
c2a34f24cb
Merge pull request #7999 from howard-stearns/do-not-send-stale-vive-data-as-valid
...
Do not send stale vive data as valid after deactivating.
2016-06-04 08:41:26 -07:00
SamGondelman
2367cb1995
fixing input mapping for vive/touch grip button/trigger, script needs fixing
2016-06-03 15:07:21 -07:00
SamGondelman
912b35693b
added vive single pulse haptics
2016-06-02 18:13:33 -07:00
howard-stearns
e6cc1fabe0
Do not send stale vive data as valid after deactivating.
2016-06-02 12:38:54 -07:00
Howard Stearns
f0133013c2
typo
2016-06-01 07:30:26 -07:00
Howard Stearns
922468ce1c
fix cut and paste error with extraneous namespace qualifiers.
2016-05-31 20:47:58 -07:00
howard-stearns
c2858f847b
Partition vive trackpad by center, x, and y (not just center v outer).
2016-05-31 16:57:23 -07:00
Brad Davis
ac5912df01
Fix crash on shutdown of SteamVR
2016-05-27 13:40:47 -07:00
howard-stearns
a3f1ece978
Do button mapping in C++ and simplify vive.json accordingly. Vive and
...
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
2016-05-24 16:10:12 -07:00
Brad Davis
73342b2758
PR feedback
2016-05-20 14:50:24 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Brad Hefta-Gaub
d656f61c64
Merge pull request #7759 from jherico/app_plugin_type
...
Don't expose raw pointer to the display plugin
2016-05-11 14:49:22 -07:00
Anthony J. Thibault
09a4e0eaa8
Fix for vive controllers sometimes not working
...
* Fixed bug with input devices that where added, removed then re-added.
The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
2016-05-10 19:32:08 -07:00
Brad Davis
c54d0bc993
Don't expose raw pointer to the display plugin
2016-05-08 10:35:31 -07:00
Brad Davis
3421c10c1b
Fixing vive hand controllers
2016-04-13 10:35:39 -07:00
Brad Davis
1a02220886
Fixing wobble
2016-04-12 17:50:59 -07:00
Brad Davis
73ec40dae6
Making a debug mechanism for force OpenVR
2016-04-12 16:44:16 -07:00
Brad Davis
3325c58ceb
Vive timewarp implementation
2016-04-12 16:44:15 -07:00
Brad Davis
df8ad57185
Fix FPS counter
2016-04-11 00:25:16 -07:00
Brad Davis
f569cbf70e
Add debugging output, fix timewarp
2016-03-30 10:40:32 -07:00
Zach Pomerantz
931cad34d1
Check plugin activation success
2016-03-28 12:05:58 -07:00
Anthony Thibault
88c4e54cff
openvr: predict 3 frames into the future
...
Becasue I revered the latency fix in the GLEscrow queue.
*sigh*
2016-03-23 17:38:40 -07:00
Anthony J. Thibault
0d37515784
Merge branch 'master' into tony/vive-rendering-work
2016-03-23 15:59:59 -07:00
Anthony Thibault
209524a5c0
openvr: Non-threaded present work
...
In the unlikely event you hit 90htz in non-threaded present mode, you will have perfect tracking and latency.
This verifies that there are no other sources of tracking or rendering latency, other then the ones we already know about.
2016-03-22 15:38:10 -07:00
Zach Pomerantz
64ced6ee04
Add comment explaining bare glGetError
2016-03-22 12:04:24 -07:00
Anthony Thibault
b1286517c6
Removed frame latency in GLEscrow
...
This could occur if the GLEscrow queue has extra frames in it.
When new textures were fetched, before this fix, they were simply popped from the queue.
This commit introduces a loop, that will fetch from the queue until it is empty.
2016-03-21 21:51:16 -07:00
Anthony Thibault
225c462685
Improved NSIGHT instrumentation
...
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
2016-03-21 21:47:59 -07:00
Anthony Thibault
0d046b12de
OpenVR: Moved WaitGetPoses after main window preview.
2016-03-21 17:39:10 -07:00
Anthony Thibault
63d6f888e6
Update openvr sdk to 0.9.19
2016-03-21 17:31:13 -07:00
Anthony Thibault
5b2a050df7
display-plugins: Pulled getHeadPose into common base class.
...
* Moved getHeadPose and _headPoseCache out of each derived class and into HmdDisplayPlugin.
* updated comment in application.
2016-03-20 14:08:35 -07:00
Anthony J. Thibault
960ffd9c9e
DisplayPlugins: updateHeadPose() no longer returns a value.
...
Also, moved updateHeadPose so that the overlay and the main rendering use the same headPose.
Which should also be the same place the latencyMarker for the ovr_GetTrackingState is set.
2016-03-18 15:16:58 -07:00
Anthony J. Thibault
2faaf243a1
Revert change to OpenVrDisplayPlugin::isSupported()
2016-03-18 13:42:31 -07:00
Anthony J. Thibault
d218ca4960
openvr: fix for crash on exit
...
Before this fix, a script could call into HMD.getHUDLookAtPosition2D() while the app was shutting down, which in turn would call
getHeadPose() on the currently active display plugin. This call could cause a crash within the openvr plugin, because the SDK was either shutdown, or in the process of shutting down on the main thread.
This fixes this by spliting the previous DisplayPlugin::getHeadPose(int) into two parts:
* updateHeadPose(int) which is only called once a frame and only by the main thread.
* getHeadPose() which is thread-safe and will return a cached copy of the hmd pose sampled by the last updateHeadPose.
2016-03-18 12:26:11 -07:00
Bradley Austin Davis
cde56d6fa2
Disable OpenVR plugin when Oculus HMD is connected
2016-03-17 10:13:52 -07:00
Bradley Austin Davis
b279ff9f7d
Fix for crash on disabling and re-enabling openvr
2016-03-17 10:13:52 -07:00
Bradley Austin Davis
7045680bc7
Reduce crashes on switching display plugins
2016-03-17 10:13:52 -07:00
Brad Davis
27033e5bb5
Fix vive crash on deactivate
2016-03-12 21:48:36 -08:00
Chris Collins
ae596d79f1
Merge pull request #7317 from jherico/hmd_worn
...
Expose a property in display plugins to determine if the device is visible to the user
2016-03-11 11:46:06 -08:00
Philip Rosedale
e87ef52a4c
Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay
...
More reliable and usable UI sphere overlay location
2016-03-10 17:43:50 -08:00
Brad Davis
87c9961aa8
Expose a property in display plugins to determine if the device is visble to the user
2016-03-10 17:19:32 -08:00
Anthony Thibault
153f7fc3aa
OpenVR: adjusted translation of UI sphere overlay
2016-03-10 09:45:47 -08:00
Anthony Thibault
42d27557a1
OpenVR: remove 180 y rotation for UI bounds.
...
Turns out the room I was using was misconfigured.
2016-03-09 18:42:58 -08:00
Anthony Thibault
5df616be37
OpenVR: More usable UI Sphere overlay location
...
Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.
2016-03-09 16:24:08 -08:00
Brad Davis
d428f3b96f
Working on crash bugs
2016-03-09 14:00:05 -08:00
Brad Davis
17852e86d2
Fixing enum names
2016-03-08 16:16:44 -08:00
Brad Davis
f651adbd24
Correcting vive button naming
2016-03-08 15:12:54 -08:00
Brad Davis
1312901f06
Removing thumb mappings, using start/back for camera and menu
2016-03-08 15:09:45 -08:00
Brad Davis
28103cf5ef
Migrate composition of the overlay and pointer to the present thread
2016-03-07 17:14:41 -08:00
Anthony Thibault
89885805d2
OpenVR: Added hysteresis to the touch pad dead spot
...
This should make using the Vive touch pad for movement more reliable.
2016-02-26 18:34:33 -08:00
Anthony J. Thibault
01ef5aabcb
OpenVR: More reliable detection of left and right hands
2016-02-26 14:38:35 -08:00
Anthony Thibault
3b87cd0ea8
Improve hold action by using controller velocity
...
The AvatarHoldAction now derives the body velocity by using data from the controller::Pose. Rather then trying to derive it based on previous positions. This results in more acurate motion of the held object when the hold is released.
OpenVR input plugin: pass the velocity and angularVelocity directly from the controller pose to the controller::Pose.
2016-02-22 19:15:22 -08:00
Anthony Thibault
942f2c13ab
Vive: smoother updates for IK driven by vive controllers
...
Before this PR the simulation rate was clamped to never exceed 60htz.
This had problems when waving the vive hand controllers in the world,
they would jitter. The simulation rate is now clamped to never exceed
120 htz. This has the effect of synchronizing the display and the
update rates to 90htz.
Also there are improvements to vive support if threaded present is
disabled.
2016-02-19 15:58:13 -08:00
Anthony Thibault
93f61fce7a
OpenVRDisplayPlugin: predict poses for better tracking
...
Extrapolate the next set of poses for HMD and hand controllers.
Currently we predict 44ms into the future, this seems too high, however
it was discovered by inspection to be the best value.
Obviously there is a source of latency that we need to track down,
however even with this latency, it is a much improved experience.
2016-02-18 18:00:04 -08:00
Brad Davis
8289c39a2a
Removing flicker from OpenVR mirror
2016-02-17 14:48:24 -08:00
