Commit graph

131 commits

Author SHA1 Message Date
Wayne Chen
c5468fd8e9 Revert "Merge branch 'master' into fixGoToButtonInterstitial"
This reverts commit b4b0c519f3, reversing
changes made to 77d5ebf34f.
2018-09-13 17:18:49 -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
Zach Fox
f7de3cf218 Try a value of 1.8 2018-06-07 14:45:33 -07:00
Zach Fox
448a522b70 MS15673: Do some experiments on bubble size 2018-06-07 13:29:33 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Clement
1b2b70b769 Send both frustums to Avatar Mixer 2018-05-01 18:03:21 -07:00
Clement
21213e81f4 Multiview support for priority queue 2018-05-01 18:03:21 -07:00
Stephen Birarda
f3f29bb661 allow avatar data to use full segment size 2018-04-25 12:15:00 -07:00
Stephen Birarda
6c0177e2bd use the correct joint count for other avatar last sent 2018-04-25 11:50:53 -07:00
Stephen Birarda
18993a8f72 fix for AvatarData retrieval from SortableAvatar in PriorityQueue 2017-12-21 15:11:34 -08:00
Andrew Meadows
db6505493f fix avatar-mixer crash: don't use global callback 2017-12-11 14:04:39 -08:00
Andrew Meadows
eb120b1bc1 use correct timestamp of avatar's outgoin data 2017-11-30 11:03:27 -08:00
Andrew Meadows
e212ac67c1 enable custom avatar sort tuning 2017-11-28 11:30:06 -08:00
Andrew Meadows
e4436d264a simplify for-loop format 2017-11-28 09:14:05 -08:00
Andrew Meadows
deccc54965 remove cruft 2017-11-28 09:14:05 -08:00
Andrew Meadows
e068eb879c use PrioritySortUtil for outgoing avatar updates 2017-11-28 09:11:14 -08:00
ZappoMan
a7a0f03ede rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition() 2017-10-27 18:39:17 -07:00
Daniela
6941a10639 Add SensorToWorldScale factor to the bounding box dimensions in AvatarMixerSlave. 2017-09-12 21:10:19 +01:00
Daniela
5a918a3033 Add SensorToWorldScale factor to the bounding box dimensions. 2017-09-12 19:00:57 +01:00
Daniela
c88c70aa6f Add SensorToWorldScale factor to the bounding box dimensions. 2017-09-12 18:11:45 +01:00