Commit graph

19 commits

Author SHA1 Message Date
Brad Davis
8ca3630cfa Support glow effect in 3D line overlays 2016-07-07 13:36:48 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
Zach Pomerantz
3fceaba2fe Remove extra qualifications to getShapeKey from overlay headers 2016-02-04 10:01:34 -08:00
Zach Pomerantz
53bd595b77 Update all appropriate overlays to use plumber 2016-02-03 19:18:56 -08:00
Zander Otavka
da2afca391 Expose overlay type checking to JavaScript. 2015-07-31 11:26:04 -07:00
Atlante45
e3d22ef94b Fix overlays getBounds + code cleanup 2015-06-24 16:13:42 -07:00
Ryan Huffman
ff66eb584d Add correct line3doverlay bounds 2015-06-19 10:48:07 -07:00
ZappoMan
a20fa1242d first cut are removing immediate mode GL_LINES 2015-01-05 15:46:48 -08:00
Ryan Huffman
74f8579922 Update line3d to have a separate 'start' property and use transform/rotation 2014-12-18 16:37:19 -08:00
Thijs Wenker
38ed104397 added const to copy constructors 2014-11-15 00:21:50 +01:00
Thijs Wenker
ba5491bc8b moved writeToClone to copy constructor 2014-11-14 22:55:25 +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
David Rowe
9e19641a1d Add property getting for all 3D overlays 2014-11-12 21:05:44 -08:00
Thijs Wenker
709ad84933 added clone functionality to Overlays:
Overlays.cloneOverlay(OverlayID)
2014-11-05 23:44:59 +01:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -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/Line3DOverlay.h (Browse further)