Commit graph

191 commits

Author SHA1 Message Date
Anthony J. Thibault
de5f0ad987 WebTablet.js: calcSpawnInfo works more consistently. 2017-09-13 12:01:41 -07:00
Anthony J. Thibault
bb5e808051 Fix for some of tablet size issues, on switching domains. 2017-09-11 18:59:52 -07:00
Anthony J. Thibault
a0eb8152a6 fix for tablet spawn position 2017-08-31 13:15:46 -07:00
Anthony J. Thibault
1a01209020 Fixes for scaling tablet at high frame rates 2017-08-31 13:02:31 -07:00
Anthony J. Thibault
9c6b8a6826 Fixes for scaling tablet 2017-08-31 11:28:05 -07:00
Anthony J. Thibault
6e6687c3a6 Change tablet dimensions as sensorToWorldScale changes 2017-08-30 18:21:25 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
beholder
06c9378b03 fix for 6760: Create Mode turns to Portrait when Reopening tablet 2017-08-05 04:07:04 +03:00
Dante Ruiz
f5abb4a090 trying new tablet position spwan 2017-07-17 23:18:16 +01:00
Seth Alves
55b7c2d767 avoid doing a lot of work during mouse-move event-handlers 2017-07-05 15:50:05 -07:00
Clément Brisset
8e62bdea40 Merge pull request #10538 from ctrlaltdavid/21345
Position tablet relative to hand
2017-06-09 17:01:37 -07:00
David Rowe
fff8876b21 Code review 2017-06-10 09:33:45 +12:00
Vladyslav Stelmakhovskyi
8068e7201d Fix position after rotation. May be fix rotation in HMD mode 2017-06-02 18:58:18 +02:00
Vladyslav Stelmakhovskyi
b0e4b752d5 Implements landscape mode for tablet as rotation instead of stretching 2017-06-01 19:07:17 +02:00
David Rowe
367b3ec603 Handle nonvertical avatar orientation 2017-05-28 09:59:32 +12:00
David Rowe
f1dca5019a Fix making the tablet horizontal 2017-05-25 11:48:28 +12:00
David Rowe
6452e92ac9 Hand controller data may not be valid 2017-05-25 11:28:26 +12:00
David Rowe
925cca97db Make the tablet horizontal 2017-05-25 09:16:17 +12:00
David Rowe
39654779fb Position tablet relative to hand 2017-05-24 13:35:00 +12:00
Ryan Huffman
51db0cef98 Fix tablet showing up for a short time on launch 2017-05-09 15:12:12 -07:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
Seth Alves
ed09dcbdc9 don't call editEntity on overlays 2017-05-03 21:32:06 -07:00
Seth Alves
15661987be load tablet overlay models with higher priority 2017-04-27 10:16:08 -07:00
Dante Ruiz
daf25c1fe8 fix crashes when clicking in the homebutton 2017-04-11 00:25:08 +01:00
Seth Alves
715493922e code review 2017-03-30 17:33:01 -07:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
Seth Alves
ce9eb1a377 more tablet landscape changes 2017-03-29 14:21:38 -07:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -07:00
Anthony J. Thibault
29a159b90d WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
2017-03-28 09:27:13 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Anthony J. Thibault
2c38d7ff89 Tablet spawn orientation now takes hand orientation into account.
Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.
2017-03-22 11:03:03 -07:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Anthony J. Thibault
f5c3d41f2c Tablet scale settings now take effect soon after they are changed. 2017-03-20 14:51:47 -07:00
Anthony J. Thibault
07e10ae862 Merge branch 'tablet-ui' into feature/can-touch-this 2017-03-10 17:05:26 -08:00
Anthony J. Thibault
1acc5ea760 Finger now points when near tablet + deadspot added when touching the tablet 2017-03-08 19:03:56 -08:00
Seth Alves
de2dd7383d didn't need invis flag, after all 2017-03-08 15:30:49 -08:00
Seth Alves
371c20ee25 hide tablet by making it not visible rather than destroying it 2017-03-08 10:33:59 -08:00
Anthony J. Thibault
836c701cb3 More accurate and responsive stylus and finger touching.
The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved.

* hovering the finger/stylus over the surface of the tablet should cause buttons to highlight.
* flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet.
* stabbing the tablet quickly, should also more accurately trigger button presses.
* moving the hand/stylus from behind the tablet should be less likely to cause press events.
2017-03-07 18:19:32 -08:00
Dante Ruiz
d5714bfa6e Merge branch 'master' into menuFix 2017-02-28 16:55:44 +00:00
Seth Alves
117be16c31 pull from upstream 2017-02-27 16:48:23 -08:00
Dante Ruiz
21c15927cf Homebutton dimension and position scales with tablet 2017-02-27 19:33:52 +00:00
Dante Ruiz
73c337efd0 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-25 00:42:22 +00:00
Dante Ruiz
835b23832f some modal clean up 2017-02-25 00:40:38 +00:00
Seth Alves
b2a35f45db when tablet is an overlay, use the model-fbx from the distribution (local disk copy) rather than the one on s3 2017-02-24 13:04:43 -08:00
Seth Alves
9c0104a060 don't use Entities.getEntityProperties on tablet when it's an overlay 2017-02-23 14:55:52 -08:00
Seth Alves
37004e4347 steps toward making mouse work on tablet 2017-02-23 08:11:31 -08:00
Seth Alves
84f95e6776 oops 2017-02-22 19:18:42 -08:00
Seth Alves
b4be942348 trying to get tablet overlay to show up in the right place 2017-02-22 19:18:03 -08:00
Seth Alves
bcf1f9ab4c Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-22 16:50:29 -08:00
Seth Alves
bfc4853947 make overlays near-grabbable. make tablet be an overlay 2017-02-22 16:50:02 -08:00
Chris Collins
94517057d6 Merge pull request #9721 from hyperlogic/bug-fix/tablet-ui-tablet-placement
More consistent tablet angle when first creating the tablet.
2017-02-22 15:00:17 -08:00
Anthony J. Thibault
4866be1f52 More consistent tablet angle when first creating the tablet.
The tablet should more constantly be placed above your hand, while facing your head.
It fixes the issue where the tablet would appear almost horizontal when your hand was close to your HMD and at eye level.
2017-02-21 16:01:46 -08:00
Seth Alves
47cdade1e9 fix home-button on tablet 2017-02-17 11:47:37 -08:00
Anthony J. Thibault
cb58c567b8 In desktop mode create tablet near mouse click location.
But prevent the tablet from being displayed off screen.
2017-02-07 18:18:34 -08:00
Seth Alves
f635cd8a07 use tablet models from s3 until relative model urls work 2017-02-03 15:17:33 -08:00
Chris Collins
bac5bd5c0e Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony J. Thibault
6bef9e888b Merge branch 'master' into bug-fix/tablet-ui-no-domain 2017-02-02 17:21:20 -08:00
Anthony Thibault
59b33bbc53 Merge pull request #9585 from sethalves/use-local-tablet-model
use tablet model from distribution rather than from s3
2017-02-02 16:01:15 -08:00
Anthony J. Thibault
b44e5b5a1f tablet-ui: preferences for tablet ui scaling
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00
Anthony J. Thibault
5890503ec0 Can now grab tablet in 2d mode even when it embedded in geometry 2017-02-02 10:56:56 -08:00
Dante Ruiz
2af72f1a50 fixed tablet buliding up when flying fast 2017-02-02 17:03:53 +00:00
Seth Alves
d9bdbb92ef use tablet model from distribution rather than from s3 2017-02-01 16:55:29 -08:00
Anthony J. Thibault
3c04f54e75 more fixes to third person tablet usage. 2017-01-31 18:22:38 -08:00
Anthony J. Thibault
008a58f9d7 Only reposition the tablet when camera mode changes, in HMD mode. 2017-01-31 18:03:48 -08:00
Anthony J. Thibault
c147b9bec0 Fix for tablets in third-person HMD mode. 2017-01-31 18:00:18 -08:00
Anthony J. Thibault
e2e19884bb Tablet should work even when not connected to any domain.
handControllerGrab.js and WebTablet.js now parents objects to the
AVATAR_SELF_ID parentID, instead of using MyAvatar.sessionUUID, which
is unavailable when not connected to any domain.

I removed several early returns handControllerGrab.js that prevented
grabbing from working if MyAvatar.sessionUUID was invalid.

There were places in the EntityItem.cpp and EntityScriptingInterface.cpp
C++ that would log an error if parentID was set to AVATAR_SELF_ID.
This was to prevent AVATAR_SELF_ID from ever going over the network.
Instead, we now prevent this by replacing all outgoing references of
AVATAR_SELF_ID with the sessionID of the current node.
2017-01-31 13:52:12 -08:00
Anthony J. Thibault
98b53d1d29 Don't allow mouse dragging the tablet in HMD mode. 2017-01-30 12:07:18 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode.
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Dante Ruiz
2c7cbb1bd9 close tablet with mouse in HMD 2017-01-27 20:58:36 +00:00
Seth Alves
e2b1f4b2ab include tablet fbx with interface distribution rather than get it from s3 2017-01-26 10:20:46 -08:00
Anthony J. Thibault
2af59630fb Better legibility of tablet in 2D with small window sizes. 2017-01-25 16:43:36 -08:00
Anthony J. Thibault
3db8c5b4a7 Fix tilt on tablet for HMD users without hand controllers 2017-01-23 16:36:04 -08:00
Dante Ruiz
41bf65ed5e home button improvments 2017-01-20 16:35:41 -08:00
Seth Alves
2f08972578 Merge pull request #9460 from druiz17/touchUp
Tablet button clickable in desktop mode && correct icons for switch
2017-01-20 12:58:41 -08:00
Anthony J. Thibault
3ebf2ebc9b Updated tablet dimensions to better reflect mockup and 3d model 2017-01-20 12:27:44 -08:00
Dante Ruiz
58e04f8e35 home button works in desktop mode 2017-01-20 19:43:13 +00:00
Seth Alves
6641f9bafd Merge pull request #9444 from druiz17/homeButtonFix
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Seth Alves
2d220a557f unmangle merge 2017-01-20 10:29:18 -08:00
Anthony J. Thibault
4e4545ac00 Updated orientation of tablet when no hand controllers are present. 2017-01-19 20:27:06 -08:00
Anthony J. Thibault
8304aa7b19 Added ability to mouse move the tablet in 2d desktop mode. 2017-01-19 18:04:08 -08:00
Dante Ruiz
e1c2c73e5f clean up 2017-01-20 01:04:14 +00:00
Dante Ruiz
1e7e4576cc comparing with ID instead of strings 2017-01-19 16:38:55 -08:00
Seth Alves
47b59ffae3 don't save tablet to Settings when logging out or switching domains 2017-01-19 14:10:48 -08:00
Seth Alves
41ddfbfd27 clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit 2017-01-19 11:34:38 -08:00
Anthony J. Thibault
c6f3eb138a Adjusted tablet spawn position and orientation to be more natural 2017-01-17 18:16:40 -08:00
Seth Alves
c2d6bf10d2 hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size 2017-01-16 06:47:50 -08:00
Seth Alves
e46b40e729 adjust overlay position so that it shows up on new tablet fbx 2017-01-13 16:14:12 -08:00
Dante Ruiz
71083645e9 branch update 2017-01-12 20:51:25 +00:00
Dante Ruiz
a16b229c65 begining to remove hud items 2017-01-12 10:49:45 -08:00
Dante Ruiz
2d8d5401dc updated tablet position 2017-01-11 08:41:07 -08:00
Anthony J. Thibault
3f0860f9c3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-10 13:35:29 -08:00
Anthony J. Thibault
9db6806026 In desktop mode, tablet is in front of camera.
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
  this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
  to move the tablet appropriately.

There's a known bug with the tablet entity position lagging the camera by one frame.
2017-01-10 11:31:45 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow
Ability to disable yellow highlight around Web Overlays
2017-01-10 09:11:51 -08:00
Faye Li Si Fi
32eda3a49c redo 2017-01-09 14:02:14 -08:00
Faye Li Si Fi
c39eb6294e undo 2017-01-09 14:01:59 -08:00
Faye Li Si Fi
5323e7f34d set showKeyboardHighlight to false when initialising tablet 2017-01-09 13:36:58 -08:00
Dante Ruiz
7205215baa coding standard fix 2017-01-07 00:38:39 +00:00
Dante Ruiz
07079ad78d fixed bug 2017-01-07 00:22:55 +00:00
Dante Ruiz
4ef5c76a65 fixed issues 3.0 2017-01-07 00:08:53 +00:00