32 commits

Author	SHA1	Message	Date
ZappoMan	d1e648b392	remove unused references to QGLWidget* parent in Overlay and Overlays	2015-02-25 12:34:38 -08:00
Ryan Huffman	68a9d80ba3	Update setting drawOnHUD and update to write lock for editOverlay	2015-01-06 18:14:40 -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
David Rowe	136c3a2cce	Replace 2D and 3D text overlay textWidth() method with textSize()	2014-12-09 18:32:53 -08:00
Ryan Huffman	649ae4a448	Update 3D overlays to only use one list	2014-11-25 09:49:10 -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
ZappoMan	05fa3c89a7	Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity	2014-11-15 20:38:07 -08:00
ZappoMan	dd349ebfd1	coding standard cleanup, fix warning	2014-11-14 16:03:43 -08:00
Thijs Wenker	1a9f7c6e21	Merge branch 'master' of https://github.com/worklist/hifi into 20176	2014-11-14 23:01:18 +01:00
Thijs Wenker	fa4555a7a2	Merge branch 'master' of https://github.com/worklist/hifi into 20176 ... Conflicts: interface/src/ui/overlays/Grid3DOverlay.cpp interface/src/ui/overlays/ImageOverlay.cpp interface/src/ui/overlays/Line3DOverlay.cpp interface/src/ui/overlays/LocalVoxelsOverlay.cpp interface/src/ui/overlays/LocalVoxelsOverlay.h interface/src/ui/overlays/Overlay.h interface/src/ui/overlays/Overlay2D.cpp interface/src/ui/overlays/Text3DOverlay.cpp interface/src/ui/overlays/TextOverlay.cpp interface/src/ui/overlays/TextOverlay.h	2014-11-14 20:09:27 +01:00
Sam Gateau	f09b58c255	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2014-11-14 10:05:01 -08:00
Sam Gateau	642f436fba	first draft of factorizing the rendering traversal for both sides in stereo	2014-11-14 09:56:36 -08:00
David Rowe	8076bfea72	Merge branch 'master' into 20157 ... Conflicts: interface/src/ui/overlays/Text3DOverlay.cpp	2014-11-13 14:53:57 -08:00
David Rowe	493455fdac	Fix const	2014-11-13 11:34:40 -08:00
David Rowe	8d4cecda62	Optimization and coding standard	2014-11-13 11:06:40 -08:00
David Rowe	8c3bedae9d	Add position vector and color object script value examples ... OverlayPropertyResult type is needed to successfully move QScriptValue objects from QScriptEngine in Overlays to QScriptEngine in script.	2014-11-12 14:33:52 -08:00
David Rowe	4fa5447c85	Add overlay getProperty() for text overlay "text" property	2014-11-12 12:13:57 -08:00
David Rowe	6cf833cf98	Add text overlay textWidth() method	2014-11-11 17:31:49 -08:00
Brad Hefta-Gaub	3a90e869d4	Revert "CR for Job #20140 - Add Overlays.getTextWidth"	2014-11-07 21:50:19 -08:00
David Rowe	7e6d616f20	Add text overlay textWidth() method ... Is accessible from JavaScript.	2014-11-07 08:58:31 -08:00
Thijs Wenker	709ad84933	added clone functionality to Overlays: ... Overlays.cloneOverlay(OverlayID)	2014-11-05 23:44:59 +01:00
ZappoMan	2570caca40	move 3D overlay rendering into the render portion that supports lighting and shadows	2014-10-29 21:08:37 -07:00
ZappoMan	17a20ceb16	pass the submesh name as extraInfo in the ray pick result	2014-10-29 10:49:24 -07:00
David Rowe	fc24d96947	Make overlays accessible from C++ code	2014-10-04 19:31:52 -07:00
ZappoMan	175e5d5f79	add ray picking to 3D overlays	2014-10-02 20:44:49 -07:00
Atlante45	0bad10b09c	Add isLoaded to Overlays	2014-07-29 13:25:42 -07:00
barnold1953	6817c9682e	Added a new lock specific to deleting, and improved safety	2014-05-23 11:17:55 -07:00
barnold1953	3a45104793	Made overlays thread safe for write operations, which solved a script ... crash.	2014-05-22 17:55:25 -07:00
Stephen Birarda	ae4b8348a2	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Stephen Birarda	6a51df9e38	initial regex replacement of headers	2014-04-08 17:30:36 -07:00
ZappoMan	a56b7e341d	reorganize files in interface directory	2014-03-22 20:22:05 -07:00

Renamed from interface/src/ui/Overlays.h (Browse further)