Commit graph

683 commits

Author SHA1 Message Date
ZappoMan
baff900839 cleanup some writeLocks 2017-11-02 17:46:15 -07:00
ZappoMan
53c6eeb58b updatePosition now setPosition 2017-11-02 15:58:50 -07:00
ZappoMan
afaad5fcd7 Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup 2017-11-02 13:39:51 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads
fix Circles and quads
2017-10-30 18:03:32 -07: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
ZappoMan
1000318dff tweak min dimension to match current behavior 2017-10-27 14:26:02 -07:00
Andrew Meadows
901e145712 remove redundant dimensionsChanged() 2017-10-26 22:57:33 -07:00
ZappoMan
431ee58577 more cleanup 2017-10-26 21:30:59 -07:00
ZappoMan
e5becba4e9 migrate away from updateXXX standardize on setXXX 2017-10-26 20:38:07 -07:00
Zach Fox
91333cdf7b Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-25 10:26:50 -07:00
Brad Hefta-Gaub
18a74cea91 Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023
2017-10-23: Merge RC57 into Master
2017-10-24 21:19:01 -07:00
ZappoMan
5901d1a311 clean up VERSION_ENTITIES stuff 2017-10-24 13:48:27 -07:00
Zach Fox
53081b51a6 Clean up as much as possible 2017-10-23 16:00:39 -07:00
Seth Alves
2b0285adc2 fix action (grab) deadlock 2017-10-20 15:05:21 -07:00
Zach Fox
9e68e805a0 Get marketplace public key from backend 2017-10-20 10:38:59 -07:00
Zach Fox
c99e803ab7 Error handling 2017-10-19 17:19:37 -07:00
Zach Fox
74180bc4cd Implement static cert verification correctly 2017-10-19 16:39:13 -07:00
Seth Alves
2c8c5e214c puff querybox if entity is in motion 2017-10-19 13:19:41 -07:00
Seth Alves
e8ca455547 cleanups + call updateQueryAACube when parent changes or action is deleted 2017-10-19 13:19:35 -07:00
Seth Alves
c1e8d5144c remove code which is no longer needed because of custom physics setters 2017-10-19 13:19:25 -07:00
Seth Alves
f2cb5d4aff clean-up concept of puffed queryAACube 2017-10-19 13:19:13 -07:00
Seth Alves
ae70f091c3 don't accept updates to queryAACube if this interface is simulation owner 2017-10-19 13:18:45 -07:00
Seth Alves
f75e59c0a6 keep grabbed and worn entities from spamming entity-server 2017-10-19 13:18:37 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
SamGondelman
c9d2d40e1e possibly fix registration offset issue 2017-10-03 14:44:11 -07:00
Howard Stearns
0b7af66016 more linux warnings 2017-10-02 15:38:59 -07:00
Howard Stearns
136381adb9 fatal compiler warning on mac/linux 2017-10-02 13:56:15 -07:00
Howard Stearns
5c5f052bc2 explicit free, and remove header that isn't available on mac/linux 2017-10-02 10:28:47 -07:00
Howard Stearns
73c8da99dc Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties 2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12 animation url and computing certificateID 2017-09-29 16:32:25 -07:00
SamGondelman
0ad5f47bfd trying to fix entity editing bugs, needs testing 2017-09-29 11:34:34 -07:00
Andrew Meadows
ca470d67b4 fix indentation 2017-09-29 11:34:32 -07:00
Seth Alves
72cacc4cef server only deletes and entity if it's still the child of an avatar, not if it has ever been 2017-09-28 19:56:15 -07:00
Howard Stearns
d1350a03c2 working checkpoint, but with a lot of debug/development stuff 2017-09-28 17:06:07 -07:00
Howard Stearns
4403c27b52 working checkpoint. still needs verification/hashing, etc. 2017-09-26 14:14:37 -07:00
Howard Stearns
8fdd405593 consistent comments 2017-09-22 15:10:30 -07:00
Howard Stearns
f25e22b463 entityInstanceNumber 2017-09-22 15:06:39 -07:00
Howard Stearns
7724fc204b working checkpoint 2017-09-22 14:19:54 -07:00
Anthony J. Thibault
6618ba12e9 Merge branch 'master' into feature/ant-man 2017-08-31 18:10:39 -07:00
Anthony J. Thibault
c9cdaadeb5 Better scale support in SpatiallyNestable class.
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.

Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field.  a new _dimensions member variable is used instead.  The SpatiallyNestable scale
field for entities should always be one.

Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.

Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.

Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Zach Fox
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
Brad Hefta-Gaub
d572510770 Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
update EntityItem bounding cube when on changed dimensions
2017-07-27 18:21:06 -07:00
Zach Fox
bd5f7b85d8 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_renderMOde 2017-07-26 14:11:28 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
Ryan Huffman
6817cf9db4 Fix entity properties sometimes being resent
When writing entity properties to a packet, we start off with a list of
requested properties (`requestedProperties`) and keep track of which properties
didn't fit (`propertiesDidntFit`) the packet, which is intialized to
requestedProperties. As we pack the properties, we remove them from
propertiesDidntFit if they didn't need to be written or were able to be
packed. At the end we store propertiesDidntFit, and use it in the future
as our requestedProperties when we try to pack more data into a packet.

The bug: because of the order in which propertiesDidntFit is
initialized, it ended up always being the list of all properties for
that entity. This typically wasn't an issue because we usually go
through and try to append all of the properties, and if we don't need to
append them (because they aren't in requestedProperties)
we remove them from our propertiesDidntFit list. When we
don't have enough remaining space in the current packet for even the
entity header, which is fairly small, we don't bother trying to append
any of the properties. When this happens, propertiesDidntFit contains
the full list of properties, which we save for the next pass through the
entity, and use as our requestedProperties, causing us to resend entity
data again. In the worst case we never end up sending all of the
entity's data.
2017-07-25 10:59:03 -07:00
Andrew Meadows
17323ba42a always update the bounding box 2017-07-21 10:25:03 -07:00