64 commits

Author	SHA1	Message	Date
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
Brad Davis	5b494c23fd	More header cleanup	2015-07-18 22:38:26 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Atlante45	31a98c5b40	Replace pos/rot by a transform in Base3DOverlay ... Also keep getBounds a pure virtual methods	2015-06-24 15:44:47 -07:00
Ryan Huffman	1089490658	Move overlay rendering to Scene	2015-05-29 08:51:25 -07:00
ZappoMan	912b851eb7	remove crufty references to QGLWidget	2015-02-25 12:54:34 -08:00
Ryan Huffman	cfb996db0c	Add missing paramaters to Base3DOverlay copy ctor	2015-01-15 14:15:59 -08:00
Brad Hefta-Gaub	476887b7ef	Merge pull request #4055 from huffman/fix-overlays ... Update setting drawOnHUD and update to write lock for editOverlay	2015-01-07 10:56:18 -08:00
Ryan Huffman	68a9d80ba3	Update setting drawOnHUD and update to write lock for editOverlay	2015-01-06 18:14:40 -08:00
ZappoMan	0606861b66	dashed lines in GeometryCache	2015-01-05 21:45:17 -08:00
Ryan Huffman	5caec4dea5	Update overlays to handle updates in drawOnHUD after creation	2014-12-31 10:15:15 -08:00
Ryan Huffman	2b835e621c	Rename 2D -> HUD, 3D -> World in Overlays	2014-12-30 14:50:17 -08:00
Ryan Huffman	2e95618bed	Remove 'start' property alias from Base3DOverlay	2014-12-18 16:38:27 -08:00
Ryan Huffman	a0623c930b	Add setting of drawOnApplicaitonOverlay	2014-12-17 16:39:52 -08:00
Ryan Huffman	9bd7912f9f	Add support for drawing 3d overlays on the Application Overlay	2014-12-17 16:25:25 -08:00
ZappoMan	a6b86da47a	basics of triangle picking working for models	2014-12-05 11:31:27 -08:00
Ryan Huffman	649ae4a448	Update 3D overlays to only use one list	2014-11-25 09:49:10 -08:00
Ryan Huffman	4febc45b6a	Add drawInFront to Base3DOverlay::getProperty	2014-11-25 08:44:38 -08:00
Ryan Huffman	0b46e35f31	Add support for separate list of 3d overlays to be drawn in front	2014-11-24 23:19:17 -08:00
Ryan Huffman	1d865ace9d	Add drawInFront property to Base3DOverlay	2014-11-24 21:16:29 -08:00