SamGondelman
6a52b7b8f3
CR improvements
2018-07-26 12:15:12 -07:00
SamGondelman
645f905239
cleanup, model performance improvements
2018-07-24 13:25:49 -07:00
SamGondelman
845ddda695
parabola-overlay and -avatar intersection, handle case where acceleration == 0
2018-07-17 12:41:03 -07:00
Dante Ruiz
6ddc768f57
making overlays use precisionPicking and adjust tablet screen position
2018-06-06 15:40:33 -07:00
David Rowe
578c42b4ea
Merge branch 'master' into 21624
2017-12-13 09:41:09 +13:00
David Rowe
2752dc7cac
Fix dimensions of cloned cube, sphere, shape, and model overlays
2017-12-06 12:28:55 +13:00
David Rowe
cd2922a560
Merge branch '21602' into 21624
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2017-11-28 17:04:59 +13:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
David Rowe
12e005f215
Initial update of Overlays JSDoc
2017-11-17 17:59:11 +13:00
SamGondelman
9188ae9fb5
fix laser end not disappearing
2017-11-09 16:26:37 -08:00
ZappoMan
f63db42c0e
migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation
2017-10-28 10:14:25 -07:00
ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Andrew Meadows
b602c18475
prevent zero dimensions for Volume3DOverlay
2017-09-27 14:30:50 -07:00
samcake
510b446409
mergine with master, resolving conflict
2017-09-26 13:13:46 -07:00
samcake
454e167d93
notifying a render transform / bound change when the dimension property change
2017-09-21 12:58:56 -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
Anthony J. Thibault
a8a5138c18
remove USE_N_SCALE preprocessor check
2017-09-20 09:23:13 -07:00
Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -07:00
Seth Alves
e4e86c245e
3d overlays can be children of entities or avatars
2016-07-31 14:11:56 -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
Brad Davis
2f89253dc1
Make Overlays usable from QML
2016-03-04 11:35:54 -08:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Atlante45
e3d22ef94b
Fix overlays getBounds + code cleanup
2015-06-24 16:13:42 -07:00
ZappoMan
912b851eb7
remove crufty references to QGLWidget
2015-02-25 12:54:34 -08:00
ZappoMan
a6b86da47a
basics of triangle picking working for models
2014-12-05 11:31:27 -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
709ad84933
added clone functionality to Overlays:
...
Overlays.cloneOverlay(OverlayID)
2014-11-05 23:44:59 +01: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
175e5d5f79
add ray picking to 3D overlays
2014-10-02 20:44:49 -07:00
ZappoMan
c3b0700601
introduce Planar3DOverlay for common features of rectangle and circle, introduced rectanglular 3D plane
2014-09-30 14:52:44 -07:00
ZappoMan
7fc6eecca7
added support for dashed lines for 3D Circle overlays
2014-09-30 11:27:16 -07:00
ZappoMan
bffd236640
add glowLevel, and pulse to all overlays
2014-09-29 16:44:40 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
ZappoMan
a56b7e341d
reorganize files in interface directory
2014-03-22 20:22:05 -07:00
