SamGondelman
ff2405437b
can set strength to 0
2016-06-07 12:19:38 -07:00
SamGondelman
7a3cba8580
warning be gone
2016-06-06 17:06:59 -07:00
SamGondelman
8fa52fa159
trying to fix warning in joystick.cpp
2016-06-06 16:48:21 -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
SamGondelman
afca0ec2c9
moved vive pulses to correct thread, works with duration
2016-06-06 13:25:05 -07:00
SamGondelman
b01a00584a
Merge branch 'exposeHaptics' of https://github.com/SamGondelman/hifi into exposeHaptics
2016-06-06 10:35:29 -07:00
SamGondelman
f51cb7ce0c
trying to add duration support for vive
2016-06-06 10:34:32 -07:00
SamGondelman
c1eab61241
sdl haptics aren't working, but might be a bug in sdl: http://stackoverflow.com/questions/23974908/why-is-sdl-hapticopenfromjoystick-not-working-in-sdl-2
2016-06-03 11:22:06 -07:00
SamGondelman
e2c4b4d306
added haptic support to sdl and touch (needs testing)
2016-06-03 10:17:08 -07:00
SamGondelman
912b35693b
added vive single pulse haptics
2016-06-02 18:13:33 -07:00
howard-stearns
9ff1a695f0
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-26 13:52:23 -07:00
howard-stearns
2accccef9e
Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving
2016-05-25 11:32:01 -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
Anthony J. Thibault
f82c3ba4f2
Revert "OpenVRDispalyPlugin: fix one-frame lag in resetSensors."
...
This reverts commit 8381e74fb3
2016-05-23 16:30:05 -07:00
Anthony J. Thibault
097b16aadc
Fix for sensor reset on oculus.
2016-05-23 15:40:29 -07:00
howard-stearns
fa78eea434
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-20 16:50:54 -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
Howard Stearns
3088a84035
Just bringing the code up to date and forcing a build to see how Jenkins/osx is doing.
...
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-20 08:04:38 -07:00
Anthony J. Thibault
8381e74fb3
OpenVRDispalyPlugin: fix one-frame lag in resetSensors.
...
resetSensors() should take place immediately, so that the getHeadPose() after the reset should be identity. (or close to it)
2016-05-19 13:56:40 -07:00
Brad Davis
5ba8372c21
Moving GL backend out of GPU
2016-05-16 12:54:17 -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
Bradley Austin Davis
0f768b13b9
Working on OSX Rift functionality
2016-05-07 20:17:31 -07:00
Brad Davis
888758fc21
Fix test for specific Oculus version
2016-04-19 18:13:12 -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
9d29d6c0e9
Fixing OSX build
2016-04-12 16:44:17 -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
2f28c64edb
Fixing menu navigation in oculus remote
2016-04-07 13:21:00 -07:00
Brad Davis
a58a627fdf
Support oculus remote input
2016-04-07 13:20:59 -07:00
Brad Davis
fd4a374e08
Add comment
2016-04-05 13:04:17 -07:00
Brad Davis
71e6f9bdd6
Display a blank frame before switching away from oculus
2016-04-05 13:03:14 -07:00
Brad Davis
ffc2c75534
Don't release the Oculus plugin when disabling the plugin
2016-04-05 09:59:12 -07:00
Brad Davis
97e96f7b67
PR comments
2016-03-31 13:19:26 -07:00
Brad Davis
b53968fd64
Add automatic switching the Oculus headphones and mic when activating the plugin
2016-03-31 10:33:11 -07:00
Brad Davis
f569cbf70e
Add debugging output, fix timewarp
2016-03-30 10:40:32 -07:00
Brad Davis
8123617fe1
Improve failure detection logging
2016-03-30 10:40:31 -07:00
Brad Davis
80d397555d
Fixing input API, DLL path for Oculus
2016-03-30 10:40:30 -07:00
Brad Davis
78626f7938
Add warning logging if we can't find a 1.x Oculus dll
2016-03-30 10:40:29 -07:00
Brad Davis
bd9813bbf5
Only enable the Oculus plugin in the presence of the 1.x runtime
2016-03-30 10:40:29 -07:00
Brad Davis
d056c41e25
Update to latest Oculus SDK, add input device support
2016-03-30 10:40:28 -07:00
Zach Pomerantz
34a77b47a3
Restore SDL2 comments
2016-03-28 12:25:56 -07:00
Zach Pomerantz
b94e244844
Update oculus legacy plugin
2016-03-28 12:24:31 -07:00
Zach Pomerantz
931cad34d1
Check plugin activation success
2016-03-28 12:05:58 -07:00
