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 |
|
Thijs Wenker
|
709ad84933
|
added clone functionality to Overlays:
Overlays.cloneOverlay(OverlayID)
|
2014-11-05 23:44:59 +01:00 |
|
ZappoMan
|
17a20ceb16
|
pass the submesh name as extraInfo in the ray pick result
|
2014-10-29 10:49:24 -07: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 |
|
ZappoMan
|
70d718178d
|
make all volume3DOverlays handle proper ray picking against their rotated bounding box, make model overlays property ray pick as well
|
2014-10-17 13:36:37 -07:00 |
|
Atlante45
|
09cf01e097
|
ModelOverlay functionnal + bounding box
|
2014-07-01 12:42:56 -07:00 |
|