Brad Davis
091e798267
Make hand pointer lasers 'click' on fully pressing and clicking the vive controller
2016-07-14 10:30:35 -07:00
Bradley Austin Davis
62051ad297
Working on touch
2016-06-13 14:40:15 -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
fc5214c938
Merge pull request #8033 from SamGondelman/xboxFix
...
Game pads work after falling asleep and being reactivated
2016-06-08 16:27:26 -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
SamGondelman
2c1d20bd1a
removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks
2016-06-07 17:12:24 -07:00
SamGondelman
545dda0a98
whoops
2016-06-07 15:15:42 -07:00
SamGondelman
5daccba235
xbox controller works on restart
2016-06-07 15:14:08 -07:00
SamGondelman
dd97f16728
investigating xbox failure on restart (WIP)
2016-06-07 11:42:58 -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
2367cb1995
fixing input mapping for vive/touch grip button/trigger, script needs fixing
2016-06-03 15:07:21 -07:00
SamGondelman
69971a3439
fix one more tab
2016-06-02 12:20:05 -07:00
SamGondelman
642438a259
fix tabs
2016-06-02 12:18:56 -07:00
SamGondelman
6ca02dcad2
expose Controller.triggerHapticPulse to javascript (currently does nothing)
2016-06-02 12:11:13 -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
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
Seth Alves
40e862cf9e
quiet gcc 5 warnings
2016-05-21 16:53:01 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -07:00
Brad Davis
ba357721bf
Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements
...
Fix for vive controllers sometimes not working
2016-05-11 14:32:33 -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
Howard Stearns
773770a7fc
All but origin-correction.
2016-05-03 07:01:23 -07:00
Brad Davis
4c78c0b330
Fix broken xbox controllers
2016-04-07 13:17:49 -07:00
Brad Davis
d8310cc6b1
Reduce controller log spam
2016-04-07 10:41:55 -07:00
Brad Davis
85019b2b5e
Fixing logging errors on initial load of controller routes
2016-04-07 10:41:54 -07:00
Zach Pomerantz
062760ff3b
Log failed routes
2016-04-05 14:59:48 -07:00
Brad Davis
d056c41e25
Update to latest Oculus SDK, add input device support
2016-03-30 10:40:28 -07:00
Brad Davis
f97e61e305
Make scripting interface members thread safe
2016-03-10 08:46:09 -08:00
Brad Hefta-Gaub
5828c32041
add toggleOverlays menu item and action
2016-02-25 08:31:11 -08:00
Brad Hefta-Gaub
a25581c656
clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor)
2016-02-16 12:11:58 -08:00
Brad Davis
b5cba79f0c
Merge pull request #7095 from ZappoMan/hmdHacking
...
Various bug fixes in related to HMD overlay support
2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
1c2096bc30
remove some unrelated whitespace changes
2016-02-12 16:09:51 -08:00
Brad Hefta-Gaub
1160ecb335
improvements in HMD UI behavior
2016-02-12 10:51:33 -08:00
Anthony J. Thibault
111ed65bf8
Controller Pose values are relative to Avatar.
...
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.
This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
2016-02-11 17:18:01 -08:00
Brad Davis
000130617e
Allow input devices to break up their mappings into multiple files
2015-12-30 22:28:10 -08:00
Brad Davis
c77b66f88c
Make navigation directions into axes
2015-12-30 22:28:08 -08:00
Brad Davis
3eddf8d4a4
Allow and conditionals to be initialized from simple pairs
2015-12-30 22:24:34 -08:00
Brad Davis
4c26627622
Add navigation actions and wire them up in the standard controller
2015-12-30 17:14:40 -08:00
Anthony Thibault
878fe80040
Merge branch 'master' into tony/neuron-plugin
2015-12-25 10:24:55 -08:00
Anthony Thibault
84260192fb
Set up controller poses to match hifi standard skeleton
...
Neuron plugin in fills in the gap (thumb1) with identity.
Updated neuronAvatar script to work with new controller pose names.
2015-12-25 09:57:50 -08:00
Anthony J. Thibault
c44f69b370
WIP checkpoint
...
Changed euler angle compisition based on experiments in maya.
Also, the neuronAvatar.js attempts to transform the neuron input quaternions into
a pose relative to the avatar's default pose, but doesn't it doesn't work.
2015-12-23 17:13:52 -08:00
Anthony J. Thibault
6afe3bae5e
Copy Neuron joints into controller poses
...
This makes the accessible for controller mapping and to JavaScript.
Added 'neuronAvatar.js' as an example of reading joints from the neuron and setting them
on the avatar. NOTE: the rotations are currently in the wrong coordinate frame.
2015-12-22 17:21:33 -08:00
Brad Hefta-Gaub
4075f355a3
more work on hand movement
2015-12-18 15:44:01 -08:00
Brad Hefta-Gaub
5701ad2e8c
update to new angular velocity
2015-12-18 12:38:50 -08:00
Brad Hefta-Gaub
fff567d854
Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu
2015-12-18 12:31:24 -08:00
Andrew Meadows
d6541e9ee7
angular velocity is a vector, not a quaternion
2015-12-18 11:06:58 -08:00
Brad Hefta-Gaub
d344ef6e2a
fix warning in my PR
2015-12-17 18:10:41 -08:00
Brad Hefta-Gaub
762aefbbca
add hand driven reticle
2015-12-17 17:38:20 -08:00
Brad Hefta-Gaub
0b9bd858a7
implement support for pose ScriptEndpoints
2015-12-16 21:28:27 -08:00
Brad Hefta-Gaub
6420a43858
fix type
2015-12-15 15:35:17 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
