Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:16:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65344 commits 71 branches 56 tags 1.2 GiB
Commit graph

256 commits

Author SHA1 Message Date
Cristian Luis Duarte
bde2ba9272 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:02:23 -03:00
Cristian Luis Duarte
0bb56d837d Android - Use a different variable to save the reported dpi by qt in TouchscreenVirtualPadDevice 2018-03-05 18:08:06 -03:00
Cristian Luis Duarte
c091bc0bb3 Fix warnings regarding float to double conversion 2018-03-05 17:08:38 -03:00
Brad Davis
8bfc610cfb Merge remote-tracking branch 'upstream/master' into android 2018-03-05 11:48:58 -08:00
Cristian Luis Duarte
b5c3b78d57 Android - Virtual Pad - Limit joystick inside base circle. 2018-03-01 17:58:23 -03:00
Cristian Luis Duarte
9acb83632c Android - Make joystick move up when showing the bottom bar 2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows) 2018-02-28 15:55:50 -03:00
Cristian Luis Duarte
428f4b7b9d Android - Make the virtual pad (joystick) position fixed. Change assets. 2018-02-27 21:24:21 -03:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Gabriel Calero
5e3ad3fe9a Disable VPAD on bottom bar tapping and modes bar tapping 2018-02-20 17:20:48 -03:00
Dante Ruiz
ddcee05b14 added control button for controller API 2018-02-13 09:41:00 -08:00
Gabriel Calero
970ca5e08f Add virtual pad for android 2018-01-17 15:00:43 -03:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Zach Fox
a800f6c05a No magic numbers; Move (i) based on laser hand; Tablet to Tab key 2017-07-21 11:48:19 -07:00
Seth Alves
9654e007a6 most input plugins are not head or hand controllers 2017-06-02 16:31:08 -07:00
Seth Alves
af5ba3a90a ask display-plugins if they are head-controllers 2017-05-25 15:14:10 -07:00
Anthony J. Thibault
a0c42bacdb Fix problem with ContextMenu triggering on button up and button down. 
This is fixed by clearing the ButtonPressedMap in the KeyboardMouseDevice every update.
Previously, this button would never be cleared, causing other controller actions mapped to the same button to have the incorrect state.
In this case, ContextMenu action would become 2 when pressed and 1 when released, anytime after the right mouse button was pressed.
 2017-03-27 14:26:17 -07:00
Anthony J. Thibault
2952be5fc8 Added MouseX and MouseY axes to Keyboard device. 2017-02-07 12:02:41 -08:00
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