SamGondelman
1b85a453ab
working on text3d overlays and entities
2017-09-12 16:49:51 -07:00
David Kelly
f9e1f02888
protect _text member of Text3DOverlay with mutex
2017-06-02 14:59:27 -07:00
Brad Davis
2705ee7030
Remove the use of implicit ids in geometry cache
2016-10-19 11:18:25 -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
8feace62b7
Conform text3d initializers to coding standard
2016-02-15 13:05:19 -08:00
Zach Pomerantz
f2b716f90a
Alias text3d's backgroundAlpha to alpha
...
getAlpha(), across 3d overlays, refers to the behavior
of the overlay as a whole. This conforms text3d, and
adds a new property, textAlpha, to replace the old
alpha semantic.
2016-02-15 13:02:29 -08:00
Zach Pomerantz
53bd595b77
Update all appropriate overlays to use plumber
2016-02-03 19:18:56 -08:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Zander Otavka
055133b82e
Refactor inheritance for billboard overlays.
...
BillboardOverlays is now Image3DOverlay. Billboard3DOverlay is the base
class for both Image3DOverlay and Text3DOverlay, and it is
PanelAttachable.
2015-08-04 14:22:21 -07:00
Zander Otavka
be558eb62e
Make Text3DOverlay a PanelAttachable.
2015-08-04 14:22:20 -07:00
Zander Otavka
da2afca391
Expose overlay type checking to JavaScript.
2015-07-31 11:26:04 -07:00
Brad Davis
35f7307f30
More header cleanup
2015-07-18 22:15:50 -07:00
Atlante45
55c490043f
Restore InterfaceConfig.h includes
2015-06-24 16:13:42 -07:00
Atlante45
e3d22ef94b
Fix overlays getBounds + code cleanup
2015-06-24 16:13:42 -07:00
Ryan Huffman
8a1f446f05
Fix textoverlay3d text position
2015-06-23 14:43:41 -07:00
Ryan Huffman
690e2e38f2
Move circle3d and text overlays to batches
2015-06-19 09:45:13 -07:00
Atlante45
9b49936d29
TextRenderer memory leak
2015-05-20 16:41:47 +02:00
David Rowe
136c3a2cce
Replace 2D and 3D text overlay textWidth() method with textSize()
2014-12-09 18:32:53 -08:00
David Rowe
f5a1c26492
Add backgroundAlpha property to 2D and 3D text overlays
2014-12-05 11:08:00 -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
8076bfea72
Merge branch 'master' into 20157
...
Conflicts:
interface/src/ui/overlays/Text3DOverlay.cpp
2014-11-13 14:53:57 -08:00
David Rowe
6f4952c7d5
More consts
2014-11-13 12:25:15 -08:00
David Rowe
9e19641a1d
Add property getting for all 3D overlays
2014-11-12 21:05:44 -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
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
David Rowe
38d50a76eb
Add IsFacingAvatar getter and setter to Text3DOverlay
2014-10-22 16:47:40 -07:00
ZappoMan
228de963ab
CR feedback
2014-10-21 12:28:44 -07:00
ZappoMan
99adb413e3
add 3D text overlay support
2014-10-21 08:20:15 -07:00