Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 20:07:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61957 commits 25 branches 0 tags 1.1 GiB
Commit graph

83 commits

Author SHA1 Message Date
David Rowe
cd2922a560 Merge branch '21602' into 21624 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2017-11-28 17:04:59 +13:00
David Rowe
4b5aa9bdec Add Overlays API functionality JSDoc 2017-11-25 16:18:14 +13:00
ZappoMan
04ee1adabd Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-19 14:40:31 -08:00
David Rowe
b4bc8da20a Document deprecation of "filed" property 2017-11-19 08:44:00 +13:00
David Rowe
a33162d7ff Fix typo in Base3DOverlay "filled" property 2017-11-17 21:07:43 +13:00
David Rowe
12e005f215 Initial update of Overlays JSDoc 2017-11-17 17:59:11 +13:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587 
7587 Lasers resize with avatar
 2017-11-15 09:31:45 -08:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
SamGondelman
9188ae9fb5 fix laser end not disappearing 2017-11-09 16:26:37 -08:00
SamGondelman
224386317d send overlay visibility through transaction 2017-11-09 12:14:40 -08:00
ZappoMan
f63db42c0e migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation 2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
Seth Alves
54204833df add a getParentTree call for overlays 2017-10-09 12:17:56 -07:00
SamGondelman
e95ecc3f27 fix missing sensorToWorld matrix 2017-10-06 15:37:23 -07:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
Sam Gateau
64f70f1ebb more cleanups 2017-10-02 22:00:41 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
samcake
b1daae0150 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 09:16:02 -07:00
samcake
3bd6e35e30 Fixing the broken on hud overlay's render transform 2017-09-27 15:19:21 -07:00
samcake
16fb64afaa Merging with blue-bis 2017-09-21 18:01:04 -07:00
samcake
eed099502a minimise the changes compared to upstream 2017-09-21 17:20:32 -07:00
samcake
d112ffd8d6 Moving all the 3D overlay transform evaluation out of the render thread to the game loop, need to do something for the line3d 2017-09-20 18:06:49 -07:00
samcake
a49b4dc31f Merge back blue-bis in 2017-09-15 11:40:26 -07:00
samcake
19cd537e65 addressing review comments 2017-09-15 11:10:25 -07:00
Sam Gateau
30bf800963 Cleanup 2017-09-14 20:33:08 -07:00
samcake
ec7536db2c Brining the changes just to fix the tablet issue 2017-09-14 18:36:20 -07:00
samcake
bff578b283 Working version that fixes the web overlay / tablet 2017-09-14 17:07:50 -07:00
samcake
10b1e3f561 Trying to implement differnet solution to the transform updates problem and debug 2017-09-12 14:35:25 -07:00
Sam Gateau
3669e66619 trying to update the transform at the right time in overlays 2017-09-12 00:02:54 -07:00
samcake
01e4bfc53e Trying to avoid calling getTransform on nestables from render thread 2017-09-11 17:36:10 -07:00
samcake
e48c456d24 Trying to sync the render transform for overlay web at the right time... 2017-09-06 17:57:18 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
Seth Alves
69944cc76d add a way to get a SpatiallyNestable's name without knowing what its type is 2017-05-03 21:32:49 -07:00
samcake
6122155880 Renaming the PendingCHanges class to Transaction 2017-04-05 13:10:31 -07:00
Seth Alves
34755dd75d notify children of an overlay when the parent overlay moves 2017-02-24 13:57:49 -08:00
Seth Alves
1b26c3469f fix signed/unsigned joint index problem 2017-02-22 20:39:34 -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
bfc4853947 make overlays near-grabbable. make tablet be an overlay 2017-02-22 16:50:02 -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
Seth Alves
28e0ca2e49 when a parent of a 3d overlay is deleted, delete the overlay 2016-08-01 10:55:34 -07:00
Seth Alves
6f3146f872 oops, position and rotation are local, by this point 2016-08-01 08:00:51 -07:00
Seth Alves
bddff3341a angry De Morgan 2016-08-01 07:49:22 -07:00
Seth Alves
627048db84 pull missing location properties from overlay 2016-07-31 16:36:14 -07:00
Seth Alves
e4e86c245e 3d overlays can be children of entities or avatars 2016-07-31 14:11:56 -07:00
samcake
ad7d567932 Fixing the overlay renderItem access issue 2016-03-10 14:09:34 -08:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
Zach Pomerantz
0d29f59e39 Remove drawOnHUD from 3d overlays 2016-02-15 14:04:02 -08:00
Brad Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -07:00