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
Brad Davis
91bfa7677c
Updating stats display for threaded rendering
2016-09-02 14:41:49 -07:00
Stephen Birarda
3f1545008d
don't target any plugins for android
2016-08-31 11:19:01 -07:00
Stephen Birarda
f1ed7a2e78
initial changes needed for android interface cmake
2016-08-31 10:53:29 -07:00
