Commit graph

57 commits

Author SHA1 Message Date
Andrew Meadows
26ea7034d8 prevent zero scale for Line3DOverlay 2017-09-27 14:30:50 -07:00
samcake
219d63784b REmoving the extra variables in Linear3D and just use the _renderTRansform 2017-09-22 10:39:51 -07:00
samcake
7103864b37 Also rendering the line3D overlay with start and end captured in game loop 2017-09-21 12:23:53 -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
524c94cdd4 Adding more comments for future fixmes 2017-09-15 14:35:45 -07:00
SamGondelman
3a80c6cbe2 fix alpha issues, pipeline issue, clamping issue 2017-08-21 18:09:25 -07:00
SamGondelman
8163430282 fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds 2017-08-14 15:03:14 -07:00
Seth Alves
adc3581d63 remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay 2017-03-07 19:32:34 -08:00
Seth Alves
88d6fe6a04 fix offset relative to endParent 2017-03-02 16:26:56 -08:00
Seth Alves
5f570c1ba8 fix up bounds handling in Line3DOverlay 2017-03-02 16:16:48 -08:00
Seth Alves
7f6b803652 3d-line-overlays can now have an endParentID and endParentJointIndex 2017-03-01 17:27:32 -08:00
Seth Alves
7c4869eb73 fix up parenting for 3d line overlays, have handControllerGrab use a child overlay for search/far-grab so the updates are smoother 2017-03-01 16:10:07 -08:00
Seth Alves
bc5f563f57 make _parentID and _parentJointIndex private to avoid accidental direct access 2017-02-12 11:37:29 -08:00
Brad Hefta-Gaub
df954cab10 remove some log spam, recatargorize script logs to allow fine grain filtering 2016-12-19 16:15:10 -08:00
Brad Davis
99ed7ac08c Fix shutdown crash (hopefully) 2016-10-17 17:38:10 -07:00
Brad Davis
dde79ef3c5 Fix GPU buffer leak in geometry cache / overlays 2016-10-17 12:22:20 -07:00
Ryan Huffman
54498a8f3f Add the ability to ignore invisible entities in findRayIntersection 2016-10-07 10:30:18 -07:00
Seth Alves
8487f825a0 don't return reference to local variables 2016-08-18 08:01:42 -07:00
Seth Alves
2ff35768aa make 3d-line overlays work again 2016-08-17 18:45:09 -07:00
Seth Alves
15e2140cb2 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-11 15:06:58 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Seth Alves
e4e86c245e 3d overlays can be children of entities or avatars 2016-07-31 14:11:56 -07:00
Brad Davis
8ca3630cfa Support glow effect in 3D line overlays 2016-07-07 13:36:48 -07:00
Brad Davis
b7926b8582 Don't render wire geometry with lighting effects 2016-06-30 16:11:05 -07:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
Zach Pomerantz
48aaac2971 Render line3d without backface culling 2016-03-01 14:57:02 -08:00
Zach Pomerantz
53bd595b77 Update all appropriate overlays to use plumber 2016-02-03 19:18:56 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Seth Alves
817f0307a0 fix 3d line overlays 2015-12-04 15:51:19 -08:00
Zander Otavka
da2afca391 Expose overlay type checking to JavaScript. 2015-07-31 11:26:04 -07:00
Brad Davis
5b494c23fd More header cleanup 2015-07-18 22:38:26 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
ZappoMan
23b89a6f7d remove naked gl/dead code from line and cube overlays 2015-07-14 17:04:07 -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
Ryan Huffman
8241a2170b Update cube, line, and sphere overlays to use batches 2015-06-16 09:50:42 -07:00
Seth Alves
dd64eeb282 fix uninitialized geometry cache id in Line3DOverlay 2015-02-17 11:47:29 -08:00
ZappoMan
efb044ea5e change renderDashedLine() to take a color paramter 2015-01-28 15:08:59 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
ZappoMan
a03c2b79fa first cut at adding colors to GeometryCache and supporting batch internally 2015-01-08 15:52:33 -08:00
ZappoMan
0606861b66 dashed lines in GeometryCache 2015-01-05 21:45:17 -08:00
ZappoMan
a20fa1242d first cut are removing immediate mode GL_LINES 2015-01-05 15:46:48 -08:00
Ryan Huffman
5b89208068 Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/overlays/Cube3DOverlay.cpp
2014-12-18 16:46:17 -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
ZappoMan
41c135c4e5 move GlowEffect to libraries 2014-12-15 19:19:21 -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
d3d80d3fe2 filled in the rest of the properties 2014-11-06 00:34:59 +01:00