Commit graph

149 commits

Author SHA1 Message Date
Simon Walton
0a78eeaf1a Merge branch 'master' into avatar-mixer-improvements 2018-10-23 15:56:56 -07:00
Simon Walton
0b77eb5e9c Control UUID inclusion in avatar data with new param
Increase estimate of avatars to be sent; remove start/end segment
in avatar identity writes.
2018-10-16 14:25:38 -07:00
Clement
8e625e9a89 Don't have the mixer treat non-avatar agent as avatars 2018-10-08 17:35:37 -07:00
Simon Walton
6f659db3b5 Merge branch 'master' into avatar-mixer-improvements 2018-10-08 15:18:29 -07:00
Stephen Birarda
88f76ac760 suppress traits larger than INT16_MAX bytes 2018-10-05 09:46:55 -07:00
Stephen Birarda
371de312cc enumerate a vector of mixable streams for each listener 2018-09-28 14:54:50 -07:00
Simon Walton
7a0043c010 Send AvatarIdentity in NLPacketList; be more selective 2018-09-28 11:01:41 -07:00
Simon Walton
13890f1d16 Use local ID in place of UUID in a couple more cases 2018-09-26 09:47:26 -07:00
Simon Walton
f95ab1b040 Clean-up & other small changes 2018-09-25 12:07:59 -07:00
Simon Walton
07bdaeede7 Split avatar joint-data across multiple packets if necessary 2018-09-24 18:23:49 -07:00
Simon Walton
f2e69d5c81 Make default bubble-box AvatarData property for efficiency
Also a use of getClientGlobalPosition(), etc
2018-09-20 17:37:39 -07:00
Simon Walton
328ed8d976 Remove unused variable 2018-09-20 09:31:01 -07:00
Simon Walton
f1b7097edb Priority experiment 2018-09-19 15:32:56 -07:00
Simon Walton
04c47943ba Handle small packet space correctly 2018-09-19 13:45:08 -07:00
Simon Walton
c88a713ef8 Use Local ID for last time & sequence #
Also try to fix size_t warnings on gcc
2018-09-19 12:05:06 -07:00
Simon Walton
5d91396e91 Fixes for client & other clean-up
Handle grab-joints better; fix packet size calc;
remove dead code; other improvements.
2018-09-18 17:49:23 -07:00
Simon Walton
0c7dee730c Pack partial avatar data in bulk packets using space available
Keep a single packet in-hand and send when full rather than
a packet list.
2018-09-18 10:25:59 -07:00
Simon Walton
ca300db410 Send only avatar data that will fit in packet (WIP) 2018-09-14 18:24:08 -07:00
Simon Walton
6a1c76d14d Only sort an estimated number of avatars 2018-09-14 12:19:55 -07:00
Simon Walton
9628615c44 Fix bandwidth quota calculation now we're dropping excess 2018-09-10 17:16:16 -07:00
Simon Walton
6bb143da42 Make maxAvatarBytesPerFrame int rather than float; other clean-up 2018-09-07 18:14:39 -07:00
Simon Walton
22cfad2483 Squelch (false) warning from gcc 2018-09-06 18:32:37 -07:00
SamGondelman
ed7f993c0d avatar mixer and manager perf improvements and cleanup 2018-09-06 16:57:20 -07:00
Simon Walton
f6fd27a76b
Merge pull request #1 from AndrewMeadows/avatar-mixer-scaling-2
tweak avatar sort coefficients and fix bad avatar bounding box calculations
2018-09-06 16:39:20 -07:00
Andrew Meadows
92210f28b5 cleanup and use correct avatar bounding box 2018-09-06 16:33:30 -07:00
Simon Walton
9e0c21065e Stop sending avatars when over bandwidth quota 2018-09-06 16:20:46 -07:00
Andrew Meadows
229e9624e6 remove bad bounding box calculations in avatar-mixer 2018-09-06 15:34:28 -07:00
Simon Walton
e1aba52c23 Revert to statics for priority sort weights; update defaults from Andrew 2018-09-06 12:09:44 -07:00
Simon Walton
d2650f7ede Modified priority function from Andrew 2018-09-05 17:22:07 -07:00
Simon Walton
f7e84995b4 Only build the sortable vector once, now we're using vectors for the priority sort 2018-09-05 10:58:37 -07:00
Simon Walton
0738bcaebc Unused variable from merge 2018-09-04 18:08:34 -07:00
Simon Walton
262dbaf5ed Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling 2018-09-04 15:27:41 -07:00
Simon Walton
6ae2ca1576 Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling
Merge of Samuel's change to use simple sort instead of priority queue
2018-09-04 15:26:26 -07:00
SamGondelman
ade58a52cc reserve priority sort util vectors 2018-09-04 11:21:43 -07:00
SamGondelman
5f08ed5027 misc perf improvements 2018-08-30 16:55:15 -07:00
Simon Walton
c2ac2b9ab0 Various tweaks; fix clang warning 2018-08-30 10:59:55 -07:00
Simon Walton
7b7f369c39 Further reductions in shared pointers, getWorldPosition(). 2018-08-29 18:25:10 -07:00
Simon Walton
4b7f6a346f Use AvatarData::getClientGlobalPosition() for position in priority queue
It looks like it's the same as world position with the avatar mixer.
Also use one time stamp for current time in priority queue; use
std::chrono for some other timestamps in hope that it's faster.
Fix priority-code logic bug.
2018-08-28 16:21:47 -07:00
Simon Walton
027d117364 Remove deadlock caused by trying readlock on NodeList
Also just use refs to other SharedNodes as the NodeList
is locked.
2018-08-28 09:41:09 -07:00
Simon Walton
44f253c482 Reduce use of shared pointers and maps 2018-08-27 14:54:37 -07:00
Simon Walton
402ed4fb76 More shared pointer tweaks 2018-08-27 10:35:17 -07:00
Simon Walton
ab810f4505 Try reducing use of shared pointers in O(n2) code 2018-08-24 17:33:06 -07:00
Stephen Birarda
3e2d4dc696 fixes and improvments addressing CR comments 2018-08-21 10:53:52 -07:00
Stephen Birarda
6c204b682d include trait bytes written in over budget calculation 2018-08-21 10:32:05 -07:00
Stephen Birarda
e6b419d283 add instanced traits and migrate avatar entities 2018-08-21 10:31:15 -07:00
Stephen Birarda
be7eb57205 handle whitelist avatar URL override via traits 2018-08-21 10:31:14 -07:00
Stephen Birarda
26a1f03314 send traits in bulk to avatar mixer client 2018-08-21 10:31:14 -07:00
Stephen Birarda
4142280e2b
Merge pull request #12999 from birarda/bug/avatar-data-max-allowed
allow avatar data to use full segment size
2018-06-13 14:00:26 -07:00
Zach Fox
688d82b286 Go back to 60% 2018-06-11 13:23:41 -07:00
Zach Fox
76b5dae721 Let's try 20% 2018-06-08 10:19:55 -07:00