Commit graph

143 commits

Author SHA1 Message Date
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
Atlante45
cb758ca6b4 Fix override warnings on XCode 7 2015-12-04 08:55:43 -08:00
Atlante45
e630f3072e Bit of cleanup 2015-11-06 11:14:10 -08:00
Brad Davis
20d1035821 Fixing step yaw to move by consistent amounts, be 'tappable' 2015-11-04 15:54:50 -08:00
Brad Davis
18d2b184dc Fix ability to enable mappings parsed from JSON in JS 2015-11-04 11:39:34 -08:00
James B. Pollack
192e4c8185 Merge pull request #6274 from ZappoMan/rightClickMenu
add example of overriding default rightClick behavior
2015-11-02 18:58:12 -08:00
Brad Davis
699a13b2a7 Merge pull request #6275 from ZappoMan/mappingTweaks
Mapping tweaks to match Controllers spec
2015-11-02 16:06:08 -08:00
Brad Hefta-Gaub
02288e84e8 CR feedback 2015-11-02 15:35:30 -08:00
Brad Hefta-Gaub
f532607cca add touch and other gestures to standard 2015-11-02 15:06:38 -08:00
samcake
0211e00c86 Cleaning the feature not conditional do the true design 2015-11-02 15:01:59 -08:00
samcake
c2687b4998 Cleaning the feature not conditional do the true design 2015-11-02 14:17:07 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
samcake
543f322ffe Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-02 09:48:32 -08:00
Brad Hefta-Gaub
43df5b55fe fix linker warnings 2015-11-01 11:55:55 -08:00
Brad Davis
7fdb8e28e7 Merge pull request #6262 from ZappoMan/fixControllers
Tweaks to standard hand controller mappings
2015-10-31 23:42:13 -07:00
Brad Hefta-Gaub
05dea847be add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu 2015-10-31 15:47:40 -07:00
Brad Davis
0e13348b5a PR feedback 2015-10-31 14:26:14 -07:00
Brad Davis
abbfe15395 Adding peek support for endpoints 2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
b877f832a9 fix SDL joysticks 2015-10-31 13:02:17 -07:00
Seth Alves
5916875345 one more 2015-10-31 08:20:24 -07:00
Seth Alves
224aeea044 quiet compiler 2015-10-31 08:11:43 -07:00
samcake
00be6b3e3a Add support for NOT conditional in the route json 2015-10-30 17:32:26 -07:00
Brad Hefta-Gaub
70f3156328 make sure CompositeEndpoints properly report readability more axis based keyboard inputs 2015-10-29 22:37:12 -07:00
Brad Hefta-Gaub
8a03383adc use makeAxis for some keyboard support 2015-10-29 22:19:33 -07:00
Brad Hefta-Gaub
b56c49a182 add makeAxis support to JSON parsing 2015-10-29 17:33:30 -07:00
samcake
c1e00ca08c FIxing the mac build again ? 2015-10-29 14:30:51 -07:00
samcake
d73eafddd1 COmfort mode working with the COntroller system observing the menu state 2015-10-29 13:48:16 -07:00
samcake
b09a159090 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-29 13:06:52 -07:00
samcake
e902e5e97a Introduce the concept of loading the default Mapping 2015-10-29 13:05:29 -07:00
Brad Hefta-Gaub
3d37a1d249 fix Controller.Hardware when input plugins are deactived 2015-10-29 11:06:20 -07:00
Brad Davis
c4e82a85d9 Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00
samcake
b90af1a1ce Fixing typo and review comments 2015-10-28 13:21:45 -07:00
samcake
07c13f4d66 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 12:54:46 -07:00
samcake
b37a6f689a Fixing typo and review comments 2015-10-28 12:51:22 -07:00
samcake
fc15c7cd98 Adding the ApplicationStateDevice to the APplication class and add one entry ythere 2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
457ec76d3d CR feedback 2015-10-28 11:21:53 -07:00
Brad Hefta-Gaub
30f7c44f61 emit hardwareChanged signal to scripts 2015-10-28 09:34:18 -07:00
samcake
37f967bc33 And adding the StateCOntroller class 2015-10-28 09:23:57 -07:00