Commit graph

200 commits

Author SHA1 Message Date
ZappoMan
8ff1ca8af6 swap the velocity components 2017-04-12 16:11:06 -07:00
ZappoMan
dce73ea428 some cleanup 2017-04-12 13:43:57 -07:00
ZappoMan
afe7c386c3 added postTransform filter 2017-04-11 17:03:33 -07:00
ZappoMan
6daf68b338 tweak 2017-04-11 14:18:21 -07:00
ZappoMan
82166f4947 add rotate and transform filters for poses 2017-04-11 14:06:36 -07:00
ZappoMan
bab7d1e596 first cut at translate and scale pose filters 2017-04-11 12:17:28 -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
ZappoMan
53c439ffba add foot IK targets as actions 2017-03-30 19:11:16 -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
Brad Hefta-Gaub
87e8b6bfeb only consider standard poses written if the pose was valid 2016-12-12 09:23:01 -08:00
Anthony J. Thibault
0c8105b551 Revert "Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1"
This reverts commit 934148fea5, reversing
changes made to d2b32c3084.
2016-12-05 15:17:53 -08:00
Anthony J. Thibault
35eeaad590 Added jsdocs for MyAvatar
Not complete by any means, but it's a start.
2016-12-01 17:38:43 -08:00
Brad Hefta-Gaub
8da9fccb5d fix 'any endpoints' for axis style inputs 2016-10-08 20:24:52 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Seth Alves
25f6e1d79d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-01 15:06:52 -07:00
Stephen Birarda
85ba0f36cf fix controllers/shared compile for android interface port 2016-08-31 16:34:31 -07:00
Seth Alves
9884426ad8 replace debugging aborts with asserts 2016-08-26 06:13:33 -07:00
Seth Alves
7c5b8cb75d send faux joints to the avatar-mixer 2016-08-25 15:21:29 -07:00
Seth Alves
39f52b3682 start on faux avatar joint that represent hand controllers 2016-08-25 10:58:23 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -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
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