Anthony J. Thibault
ffaf7a10e8
tablet-ui: Added 6 pixel deadspot for bringing up the tablet in desktop mode.
2017-02-01 14:44:14 -08:00
Seth Alves
9868ddd602
global/static QStrings in plugins appear to cause crashes during shutdown
2016-11-13 10:22:14 -08:00
Ryan Huffman
216cf2b4bc
Update tutorial to work with HMD + Hand Controllers only
2016-10-07 10:30:18 -07:00
Brad Hefta-Gaub
b8d79ec263
Merge pull request #8179 from SamGondelman/snapshotFix3
...
Various snapshot improvements
2016-07-12 15:28:51 -07:00
SamGondelman
218b26b521
removed snapshot share dialog, ctrl s shouldn't leave you moving
2016-07-01 10:58:55 -07:00
Triplelexx
9b993b2665
store pointer to event->window()->screen()
...
save the planet!
2016-06-29 03:58:17 +01:00
Triplelexx
2c56d29a68
git add seemed to miss a change
...
use event window, not primaryScreen
2016-06-29 03:47:20 +01:00
Triplelexx
97e90ed798
TouchscreenDevice DPI scaling now handled via JSON mapping
...
do the arbitrary scaling in the mapping file
2016-06-29 03:45:54 +01:00
Triplelexx
efdee523fb
coding standard fix and renaming
2016-06-28 17:57:38 +01:00
Triplelexx
cc6dca853c
change TouchScreenDevice based on CR feedback
...
* device support is based on detection of QTouchDevice::TouchScreen
* DPI scale is calculated using the screen that generates the touch
event
2016-06-28 16:47:13 +01:00
Triplelexx
480b1a1263
extra line in KeyboardMouse Device
...
there's 2 blank lines at the end of the file
2016-06-27 21:06:06 +01:00
Triplelexx
aae3555b63
update TouchscreenDevice
...
* fix threading issue with zoom gesture
* KeyboardMouseDevice touchpad disabled to prevent interference
* device supported based on QTouchDevice::devices().count()
2016-06-27 21:01:06 +01:00
Triplelexx
8928854820
lost change
2016-06-24 05:20:47 +01:00
Triplelexx
6542604d13
resolve conflicts with TouchscreenDevice
...
updated to master
2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce
merge master and resolve conflicts
...
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
c322317878
rework plugins to not depend on PluginContainer unless they want to
2016-06-21 12:07:05 -07:00
Atlante45
24bbb8db3f
Remove input plugin menu dependency
2016-06-06 13:28:36 -07:00
Brad Davis
07562f72af
Doing a pass over the input plugins and controller code
2016-05-20 14:50:23 -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
Triplelexx
3501749896
attempt at resolving build warning
...
make both values operated on double before casting
2016-04-05 00:37:14 +01:00
Triplelexx
b5d50e8b3f
attempt at resolving build warnings
...
make both values operated on double before casting
2016-04-05 00:35:12 +01:00
Brad Davis
28103cf5ef
Migrate composition of the overlay and pointer to the present thread
2016-03-07 17:14:41 -08:00
Triplelexx
949eab62ec
Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 20769
...
# Conflicts:
# libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
removed deviceID
2016-02-21 22:04:14 +00:00
Triplelexx
742f741095
update TouchscreenDevice again
...
added passing of inputCalibrationData missed from last commit
2016-02-21 21:27:21 +00:00
Triplelexx
b291e32b7c
update TouchscreenDevice
...
pass inputCalibrationData to update
2016-02-19 13:54:13 +00:00
Triplelexx
9db45c01cc
indentation fixes
...
caught some inconsistencies
2016-02-19 13:47:41 +00:00
Triplelexx
087e2e7f66
revise touchscreen camera control manipulation
...
Touchscreen camera control is now via a touchscreen device. Input must
be enabled with the menu option. Currently supports dragging and
gesturing to control avatar camera. Gesturing is handled by integration
of the Qt implementation.
2016-02-19 13:47:28 +00:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -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 Hefta-Gaub
dfba05ae5f
CR feedback
2016-01-11 11:07:07 -08:00
Brad Hefta-Gaub
e2a3903def
add support for advanced/developer plugins and change diplay modes to match spec
2016-01-08 16:58:25 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
Brad Davis
98263f0c0d
Moving sdl2 to external plugin
2015-12-10 14:56:41 -08:00
Brad Davis
645695d5d5
Moving sixense to external plugin
2015-12-10 10:44:23 -08:00
Bradley Austin Davis
5053fcd113
Fix unix builds
2015-12-10 10:19:13 -08:00
Brad Hefta-Gaub
3499b452f8
add back SDL and Sixense
2015-12-10 09:02:13 -08:00
Brad Hefta-Gaub
1da8f6e618
Merge pull request #6605 from hyperlogic/tony/sixense-manager-debug-draw
...
SixenseManager: Added debug draw options
2015-12-10 07:48:35 -08:00
Brad Davis
978d39b7f4
Moving OpenVR to external plugin and updating to latest version
2015-12-09 16:20:24 -08:00
Anthony J. Thibault
a57a2792a4
SixenseManager: Added debug draw options
...
These debug draw options were added to help debug rare intermittent issues with
configuration the hydra and the Avatar arm IK.
2015-12-09 15:17:06 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Brad Davis
60aa93c38c
Fixing menu items in display plugins
2015-12-04 10:28:19 -08:00
Stephen Birarda
666c76073a
Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball
2015-11-13 14:48:15 -08:00
Stephen Birarda
ef778c554c
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-12 10:40:51 -08:00
Brad Hefta-Gaub
4fddc86851
tweaks to click
2015-11-11 15:26:16 -08:00
Atlante45
ce57488b9f
cleanup dead code
2015-11-10 17:14:38 -08:00
Brad Hefta-Gaub
fc3602d780
change context menu to RightPrimaryThumb, add filter to mouse click to not count slow clicks
2015-11-10 16:46:58 -08:00
Atlante45
7050139a56
Bit of code cleanup
2015-11-10 13:41:19 -08:00
Atlante45
6a53021818
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:23:31 -08:00
Brad Davis
07be03dc7e
Bad merge fix, PR feedback
2015-11-09 09:30:18 -08:00
Brad Davis
2ecc4f8a5c
Prevent sixense manager from triggering continuous reset
2015-11-09 09:16:32 -08:00
Atlante45
68a72b0f41
Bit of cleanup
2015-11-06 17:28:51 -08:00
Atlante45
137a2c1c48
Fix file headers
2015-11-06 17:15:34 -08:00
Atlante45
6323728d7a
Added perfect forwarding of arguments
2015-11-06 16:56:48 -08:00
Atlante45
d95709ee73
Added input plugins logging category
2015-11-06 16:45:23 -08:00
Atlante45
0a65bb145b
Some more code cleanup
2015-11-06 16:44:28 -08:00
Atlante45
6ad20e417b
Typo
2015-11-06 16:33:36 -08:00
Atlante45
e3b54f0272
Cleanup
2015-11-06 16:33:29 -08:00
Atlante45
503e03d4a8
Remove unused using
2015-11-06 16:33:22 -08:00
Atlante45
96aa5be457
Implement all Sixense methods for OS X
2015-11-06 16:33:16 -08:00
Atlante45
298ac650d8
Isolate sixense dynamic linking for OSX
2015-11-06 16:33:07 -08:00
Brad Davis
bf70ae4724
PR feedback
2015-11-06 15:59:13 -08:00
Brad Davis
7c433f47c0
Breaking up input devices and input plugins classes.
2015-11-06 15:20:00 -08:00
Atlante45
55c6706f76
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-06 13:31:39 -08:00
Atlante45
e630f3072e
Bit of cleanup
2015-11-06 11:14:10 -08:00
Atlante45
c1029450d9
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-05 15:14:15 -08:00
Anthony J. Thibault
50e8f49f52
SpacemouseManager Moved stub init into cpp file.
...
This should fix the windows build. For some reason
the linker was having a problem resolving this.
2015-11-05 10:56:24 -08:00
Anthony J. Thibault
8d16f60b15
Removed hardcoded define HAVE_3DCONNEXIONCLIENT
...
This should be set from cmake, right?
2015-11-05 09:02:39 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
EdgarPironti
ade0862948
Spacemouse fixes
2015-11-04 00:49:40 -08:00
EdgarPironti
7adf38f781
Spacemouse migration
2015-11-03 18:22:55 -08:00
Atlante45
eb990c9c1c
More basebal test code
2015-11-03 17:45:01 -08:00
Atlante45
9be8d1edf9
Remove now unecessary vive hack
2015-11-03 11:44:33 -08:00
Atlante45
0508091130
Rebase fixes
2015-11-03 11:37:57 -08:00
Clément Brisset
c63fc8557c
More baseball test code
2015-11-03 11:14:59 -08:00
Ryan Huffman
ccb25f4b63
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:10:45 -08:00
Atlante45
f2ff0b40f7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 11:06:19 -08:00
Clément Brisset
31d92fd90a
Baseball test code
2015-11-03 11:00:35 -08:00
EdgarPironti
5d695da630
Do not merge - Spacemouse
2015-11-02 23:31:10 -08:00
Brad Hefta-Gaub
d9dd045886
better parameter name
2015-11-02 09:29:09 -08:00
Brad Hefta-Gaub
c3a78ed151
cleanup
2015-11-02 09:27:35 -08:00
Brad Hefta-Gaub
b00f572e1a
add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag
2015-11-02 09:21:15 -08:00
Brad Hefta-Gaub
fe4a6fa2bf
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings
2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub
4a08329d22
fix unix warnings for comparing enums to enums
2015-11-01 12:10:42 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08: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 Hefta-Gaub
b877f832a9
fix SDL joysticks
2015-10-31 13:02:17 -07:00
Bradley Austin Davis
0355a37fb1
Fixing SDL2 active/inactive value
2015-10-30 22:19:44 -07:00
Bradley Austin Davis
9b9e35d396
Limit sixense to mavericks and below
2015-10-30 22:02:20 -07:00
AlessandroSigna
b8a2fcbb2c
Vive controller - fix inverted inputs
2015-10-30 15:21:48 -07:00
Brad Hefta-Gaub
b2f27054f4
Merge pull request #6239 from AlessandroSigna/controllers
...
ViveController - input mapping
2015-10-30 10:39:26 -07:00
Brad Davis
9607812116
Fixing input plugin dependencies
2015-10-30 10:18:51 -07:00
Brad Davis
49e7d42c2c
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-30 10:07:40 -07:00
Brad Davis
fcfab0fc51
Moving SDL2, Sixense and Faceshift to external projects
2015-10-30 00:57:51 -07:00
AlessandroSigna
01d3805148
ViveController - mapping of buttons
2015-10-29 18:44:43 -07:00
AlessandroSigna
ffd2b39874
Fix vive controller - update to new input plugin register
2015-10-29 13:18:37 -07:00
Brad Hefta-Gaub
851460b2bd
fix build buster for SDL2 missing builds
2015-10-29 11:26:11 -07:00
Brad Hefta-Gaub
ed87ae3d5a
remove some debugging
2015-10-29 10:57:30 -07:00
Brad Hefta-Gaub
bab2a7d80f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into hardwareChanged
...
Conflicts:
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
2015-10-29 10:56:01 -07:00
Brad Hefta-Gaub
a3cd032a41
register/remove devices when the input plugins are activated/deactivated
2015-10-29 10:06:21 -07:00
Brad Davis
c4e82a85d9
Remove DeviceProxy in favor of InputDevice
2015-10-29 09:32:56 -07:00
