Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
c04c0c5b13
if model-overlay has no name, use its url
2017-05-04 18:36:51 -07:00
Seth Alves
93f9716557
merge from upstream
2017-04-27 10:17:00 -07:00
Seth Alves
15661987be
load tablet overlay models with higher priority
2017-04-27 10:16:08 -07:00
humbletim
3641ca3816
add support for jointRotations/jointTranslations to ModelOverlay
2017-04-24 19:24:54 -04:00
Andrew Meadows
31bfc98b87
use const reference for ScenePointer when possible
2017-04-18 11:52:22 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
Anthony J. Thibault
0f75668923
Moved Model setting of _spatiallyNestableOverride to constructor
2017-01-31 09:36:21 -08:00
Anthony J. Thibault
0962a15a06
Fix for one-frame lag in the tablet stylus.
2017-01-30 15:39:55 -08:00
samcake
c435afb728
Introducing a fix for the overlayered model drawn in front
2016-12-19 13:17:56 -08:00
Ryan Huffman
847a5cc7a1
Remove old texture setting code in ModelOverlay
2016-10-04 16:25:48 -07:00
Ryan Huffman
93d995a5ae
Fix model overlay visible not working
2016-10-04 16:25:40 -07:00
Ryan Huffman
c683c82817
Fix setting textures in model overlays
2016-10-04 16:24:43 -07:00
Seth Alves
c363ca9887
3d-model overlays can now be children
2016-08-11 15:29:09 -07:00
Anthony J. Thibault
789297d849
Remove redundant isValid check.
2016-07-13 17:39:39 -07:00
Anthony Thibault
1d77cec125
Support for scale property on model overlays
...
If "scale" property is present but "dimensions" are not, the model is NOT scale to fit.
And the scale of the model's natural dimensions will be affected by the scale properties.
If only the "dimensions" property is present, the model will "scale to fit" the dimensions.
If both properties are present, the model still be "scale to fit" but the dimension will be scaled by the scale factor.
For example:
If a model is loaded that is 2cm tall, is loaded with no "dimensions" or "scale" properties.
It will be displayed as 2cm tall.
{"scale": 2}
The above properties will result in a model that is 4cm tall.
{"dimensions": 1}
This will result in a model that is 1cm tall.
{"scale": 2, "dimensions" 2}
Will result in a model that is 2cm tall.
2016-07-13 16:09:56 -07:00
Anthony J. Thibault
9242147394
Merge branch 'master' into feature/grab-script-polish
2016-07-08 13:40:01 -07:00
Anthony J. Thibault
1ec3472230
Model overlay dimensions fixes
...
At the moment model overlays will ALWAYS scale to fit their dimensions
Update handControllerGrab to account for this behavior.
2016-07-08 11:36:43 -07:00
Anthony J. Thibault
a07970f053
Fix for one-frame glitch when changing dimensions of a model entity.
...
This was due to Model::setScaleToFit being called on the script thread instead of the main thread.
2016-07-06 14:09:55 -07:00
Ryan Huffman
7d803b7513
Fix model overlays not correctly scaling
2016-07-06 11:54:39 -07:00
Anthony J. Thibault
a2c520a74a
ModelOverlay: use a shared_ptr<Model> not a model member
...
This is necessary for shared_ptr and weak_ptr to work for Models contained within a ModelOverlay.
2016-03-29 10:47:26 -07:00
Brad Davis
2f89253dc1
Make Overlays usable from QML
2016-03-04 11:35:54 -08:00
Zach Pomerantz
7c9022fb3e
Fix model overlay scaling
2016-02-23 10:40:47 -08:00
Anthony J. Thibault
cb89f09635
Removed EntityRig and AvatarRig. One Rig to rule them all.
2015-11-20 14:27:01 -08:00
Atlante45
cf3b33a96b
Replace Application::getInstance() with qApp
2015-10-06 13:56:19 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Thijs Wenker
4bf6f8ed77
ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model.
2015-08-04 14:47:13 +02:00
Eric Levin
3f5f75d6d2
Merge pull request #5430 from AlexanderOtavka/floating-ui
...
Improvements to overlays.
2015-08-03 14:35:52 -07:00
Zander Otavka
da2afca391
Expose overlay type checking to JavaScript.
2015-07-31 11:26:04 -07:00
Seth Alves
ee334ff826
JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates.
2015-07-22 18:43:10 -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
Atlante45
e3d22ef94b
Fix overlays getBounds + code cleanup
2015-06-24 16:13:42 -07:00
ZappoMan
bb623eaaed
fix build buster
2015-06-03 19:53:21 -07:00
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
