Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 01:42:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85500 commits 21 branches 28 tags 1.2 GiB
Commit graph

354 commits

Author SHA1 Message Date
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
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
samcake
92ca658aae Trying to get a state controller to work 2015-10-28 09:23:20 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
samcake
a0104884f5 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-27 09:59:48 -07:00
samcake
87cf3b237b Supporting a InHMD action and using it to enable COmfort mode 2015-10-27 09:59:22 -07:00
Brad Davis
691e5f3be0 Remove new/old value division from endpoint::apply 2015-10-26 11:22:25 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
a7547ef11e Adding hysteresis filter, moving filters to individual files 2015-10-25 16:44:43 -07:00
Brad Davis
5bc736952a Function based endpoints should inhibit spamming with repeats of the same value 2015-10-24 16:26:29 -07:00
Brad Davis
4e6f64833f Conditional support from JS 2015-10-23 17:24:04 -07:00
Brad Davis
d5425ac625 Moving conditionals and endpoints out of UserInputMapper 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-23 17:24:03 -07:00
Brad Davis
0fdd32709f Moving conditionals and endpoints out of UserInputMapper 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-23 17:22:46 -07:00
Brad Hefta-Gaub
d5a90e273e fix AnyEndpoint support from JS 2015-10-23 15:56:55 -07:00
Brad Davis
54c20a8dd7 Taking a different tack on proper ordering of routes 2015-10-23 13:40:38 -07:00
Brad Davis
4110324b35 Add another bit to channel types so we can fit rumble 2015-10-23 13:40:37 -07:00
Brad Davis
56deef9d6e Moving omniTool to a route mapped input 2015-10-23 13:40:36 -07:00
Brad Davis
e8be92cab8 Adding input action event 2015-10-23 13:36:06 -07:00
Brad Davis
91804fbc04 Fix ordering of standard vs device routes 2015-10-22 22:02:09 -07:00
Brad Davis
51c8d48c8c Fix broken conditional caused by invalid route ordering 2015-10-22 16:12:31 -07:00
Brad Davis
e40741b5cb Removing overrides / loopback support, adding route debugging 2015-10-22 15:52:10 -07:00
Brad Davis
d1da2f5aab Adding more items to the standard controller abstraction 2015-10-22 15:51:09 -07:00
Brad Davis
471f43899d Moving aliases / bisected versions below main actions 2015-10-22 15:49:27 -07:00
Brad Davis
6cf0bdcffe Testing function destination and fixing bug in rule ordering for multi-soure 2015-10-22 10:00:11 -07:00
Brad Davis
5d4cbfdacb Resolving ambiguity between functions and inputs differently 2015-10-22 09:50:24 -07:00
Brad Davis
4938e5ea84 Fixing function based routes, makeAxis 2015-10-22 09:50:23 -07:00
Brad Davis
637654adea Wiring up step yaw 2015-10-21 18:46:09 -07:00
Brad Hefta-Gaub
8772b5dbf2 Merge pull request #6143 from jherico/controllers 
Controllers Branch - Cleanup of enums and JS names
 2015-10-21 16:24:30 -07:00
Brad Davis
4a1df286fd Cleanup of enums and JS names 2015-10-21 15:57:37 -07:00
Brad Hefta-Gaub
60f9b3da85 Merge pull request #6141 from jherico/controllers 
Working on conditional and filter parsing
 2015-10-21 15:09:00 -07:00
Brad Davis
b9b03bd842 Working on conditional and filter parsing 2015-10-21 14:40:33 -07:00
Brad Hefta-Gaub
6bd1e59305 fix CR feedback 2015-10-21 14:31:44 -07:00
Brad Hefta-Gaub
3eedfd369e expose the Pose structure to JS 2015-10-21 14:01:18 -07:00
Brad Hefta-Gaub
0aab108729 Merge pull request #6139 from samcake/controllers 
Controllers : Fixing the pose transmission
 2015-10-21 13:12:28 -07:00
samcake
feeb4b68a6 merging and fixing the POse transmission bug 2015-10-21 13:07:35 -07:00
Brad Davis
ac2a60befb Adding primary/secondary thumb abstraction 2015-10-21 11:16:51 -07:00
Brad Davis
f0edc302bf Fixing filters creation 2015-10-20 22:06:08 -07:00
Brad Davis
a124d3b433 Moving to InputEndpoint, fixing build problem 2015-10-20 22:00:16 -07:00
Brad Davis
de57c3b4d6 Merge remote-tracking branch 'upstream/controllers' into controllers 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-20 21:59:00 -07:00
samcake
da26d0dee1 Adding the hand poses channels in the controller mapping files 2015-10-20 18:19:44 -07:00
samcake
6f7719e9e9 Finally getting the merge to work 2015-10-20 17:44:24 -07:00
samcake
da55011c2a Trying to merge 2015-10-20 16:38:41 -07:00
Brad Davis
eacd6af032 Get conditional routes working 2015-10-20 16:32:00 -07:00
Brad Davis
22139931f2 Warning fixes 2015-10-20 10:48:23 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
samcake
07aac6b2c7 Merging with upstream 2015-10-20 10:13:47 -07:00
samcake
8701d73ee9 DOing the groundwork to pass along the pose 
still not working
 2015-10-19 19:05:37 -07:00
Brad Hefta-Gaub
9acff9497c fix several warnings 2015-10-19 17:34:59 -07:00
Brad Hefta-Gaub
0068af4cb6 fix several warnings 2015-10-19 17:31:42 -07:00
Brad Hefta-Gaub
7669f9ed2c fix several warnings 2015-10-19 17:26:57 -07:00
samcake
3d8b7f9d10 Avoid to create a route when the source is not defined 2015-10-19 12:56:06 -07:00
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Hefta-Gaub
a75316f27b Merge pull request #6107 from jherico/controllers 
Move controller test to app
 2015-10-18 14:42:32 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Brad Hefta-Gaub
fda8292fa6 remove dead code 2015-10-17 14:53:23 -07:00
Brad Hefta-Gaub
8578b40236 get JS source functions working across threads 2015-10-17 14:14:45 -07:00
Brad Hefta-Gaub
7956d737ab fix thread safety issue on JS based fliters 2015-10-17 14:08:21 -07:00
Brad Hefta-Gaub
7d48fe9187 don't include Standard device in Controllers.Hardware 2015-10-17 13:00:43 -07:00
Brad Hefta-Gaub
251a55b1fb rename hardware controllers to not have device ID in the name 2015-10-17 12:52:37 -07:00
Brad Hefta-Gaub
293b7c12e1 change join to makeAxis, fix some warnings 2015-10-17 12:46:05 -07:00
Brad Hefta-Gaub
f90f0ed1f3 apply Huffman's feedback to Sam's PR 2015-10-17 12:34:32 -07:00
samcake
941f95c7d4 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-16 18:07:25 -07:00
samcake
20416455db Adding the loadMapping feature 2015-10-16 18:06:58 -07:00
Brad Davis
1dcf03d61e Put standard 'makeinput' functions on the base class 2015-10-16 17:20:52 -07:00
samcake
0fc04ab297 Fixing the review comments and setting the StandardDevice of USerINputMapper in the registeredDevices just like any other, only the ID is special 2015-10-16 14:45:38 -07:00
samcake
f0034844e7 Actions working from the Controller layer 2015-10-16 12:24:12 -07:00
samcake
43d7fe491e wiring the actions 2015-10-15 17:53:53 -07:00
samcake
d44beca29f Merge pull request #6092 from jherico/controllers 
Controllers Branch - Fix hardware access from JS...
 2015-10-15 15:41:36 -07:00
samcake
63ad9ae198 Fixing the include file names... 2015-10-15 15:02:55 -07:00
samcake
1b03b6867c Fixing the include file names... 2015-10-15 15:01:34 -07:00
samcake
249efa383e MErging maybe finally ?????? 2015-10-15 14:49:22 -07:00
samcake
2ad6c2067b MErging maybe finally ?????? 2015-10-15 14:43:15 -07:00
samcake
416df1c44c Fixing the mac build 2015-10-15 14:21:08 -07:00
Brad Davis
eff8c28a28 Fixing access to hardware devices 2015-10-15 14:04:55 -07:00
samcake
cdfe9788d1 Merging 2015-10-15 10:49:08 -07:00
Brad Hefta-Gaub
52021f573d Merge branch 'controllers' of https://github.com/highfidelity/hifi into renameInputPlugins 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-14 19:05:41 -07:00
samcake
12e103c90c Get json creating the mappings from js 2015-10-14 17:41:39 -07:00
Brad Davis
e39219c2b5 Fixes and PR comments 2015-10-14 16:51:52 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
samcake
1302b6a238 Improving the Factory registration 2015-10-14 10:47:49 -07:00
samcake
3d5bf9aa1a merging with current upstrem 2015-10-14 09:41:11 -07:00
samcake
cb62527bf9 Refactoring the filter for supporting the factory 2015-10-14 09:22:30 -07:00
Brad Davis
3ca3c635c0 Support functions in QScript contexts 2015-10-12 18:40:47 -07:00
samcake
dc32d5ae8d Current status of my code for json 2015-10-12 18:03:21 -07:00
Brad Davis
58d3578fb1 Making anonymous mappings work 2015-10-12 17:59:01 -07:00
Brad Davis
14f511350d Working on refactoring the xbox hardware access and wiring up test code 2015-10-12 10:47:23 -07:00
Brad Davis
14f33258ae Working on test code, new controller interface 2015-10-10 16:08:44 -07:00
Brad Davis
9e4a7a6226 Working on controller refactoring 2015-10-10 03:05:42 -07:00
Brad Davis
c2da6600f5 Fixing includes 2015-10-09 17:49:24 -07:00
Brad Davis
78624679ed Adding more parsing functions 2015-10-09 17:30:46 -07:00
Brad Davis
c3775623aa Splitting files, adding test skeleton 2015-10-09 17:23:52 -07:00
Brad Davis
184e9a2209 Prototyping controllers 2015-10-09 16:20:55 -07:00
Brad Davis
1dfafec5af Prototyping controller refactoring 2015-10-09 15:51:02 -07:00