ZappoMan
|
7fde574a2a
|
make model overlays acutally use sub mesh payload items
|
2015-06-03 16:33:58 -07:00 |
|
samcake
|
84525aabec
|
Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer
TEAM TEACHING BRANCH - Entity Smart Pointers
|
2015-05-26 13:56:47 -07:00 |
|
ZappoMan
|
d1520c5502
|
andrews CR feedback
|
2015-05-26 09:23:27 -07:00 |
|
Ryan Huffman
|
3f22b5f8b3
|
Add RenderArgs to more render methods
|
2015-05-22 15:25:53 -07:00 |
|
Sam Gateau
|
9b63739a72
|
Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations
|
2015-03-31 17:35:34 -07:00 |
|
ZappoMan
|
41c135c4e5
|
move GlowEffect to libraries
|
2014-12-15 19:19:21 -08:00 |
|
ZappoMan
|
e53833b306
|
make GlowEffect support DependencyManager
|
2014-12-15 17:29:48 -08:00 |
|
ZappoMan
|
a6b86da47a
|
basics of triangle picking working for models
|
2014-12-05 11:31:27 -08:00 |
|
ZappoMan
|
42e8d4d377
|
fix warnings in overlays
|
2014-11-15 20:38: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 |
|
Thijs Wenker
|
709ad84933
|
added clone functionality to Overlays:
Overlays.cloneOverlay(OverlayID)
|
2014-11-05 23:44:59 +01:00 |
|
ZappoMan
|
f1326e91b9
|
move the _model.setScaleToFit( largest dimension) to the setProperties not update
|
2014-10-29 11:10:52 -07: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 |
|
Stephen Birarda
|
e97aef581a
|
use InvokeMethod so that texture change happens on the right thread
|
2014-10-22 12:07:00 -07:00 |
|
Stephen Birarda
|
fc39e82734
|
allow a texture change in ModelOverlay properties
|
2014-10-21 16:11:58 -07:00 |
|
ZappoMan
|
61b53701f3
|
fix some comments
|
2014-10-17 16:07:08 -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 |
|
ZappoMan
|
bffd236640
|
add glowLevel, and pulse to all overlays
|
2014-09-29 16:44:40 -07:00 |
|
ZappoMan
|
7db2930d91
|
remove calls to calculateRotatedExtents() use Extents.rotate() instead
|
2014-09-11 12:33:38 -07:00 |
|
Atlante45
|
28d4efbad6
|
Don't display anything if overlays not loaded
|
2014-07-29 13:15:09 -07:00 |
|
Atlante45
|
7ad90ac7bb
|
When visible is false, don't render billboards/models overlays
|
2014-07-11 11:29:58 -07:00 |
|
Atlante45
|
09cf01e097
|
ModelOverlay functionnal + bounding box
|
2014-07-01 12:42:56 -07:00 |
|