Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 01:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert to statics for priority sort weights; update defaults from Andrew

Browse source
This commit is contained in:
Simon Walton 2018-09-06 12:09:44 -07:00
parent adf0a9a414
commit e1aba52c23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/avatars/AvatarMixerSlave.cpp
View file

@ -313,9 +313,9 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
// prepare to sort
const auto& cameraViews = nodeData->getViewFrustums();
PrioritySortUtil::PriorityQueue<SortableAvatar> sortedAvatars(cameraViews,
/*AvatarData::_avatarSortCoefficientSize*/ 1.0f, // Suggested weights from Andrew M.
/*AvatarData::_avatarSortCoefficientCenter*/ 0.5f,
/*AvatarData::_avatarSortCoefficientAge*/ 0.25f);
AvatarData::_avatarSortCoefficientSize,
AvatarData::_avatarSortCoefficientCenter,
AvatarData::_avatarSortCoefficientAge);
sortedAvatars.reserve(_end - _begin);
for (auto listedNode = _begin; listedNode != _end; ++listedNode) {

4
libraries/avatars/src/AvatarData.cpp
View file

@ -2822,8 +2822,8 @@ void RayToAvatarIntersectionResultFromScriptValue(const QScriptValue& object, Ra
const float AvatarData::OUT_OF_VIEW_PENALTY = -10.0f;
float AvatarData::_avatarSortCoefficientSize { 1.0f };
float AvatarData::_avatarSortCoefficientCenter { 0.25 };
float AvatarData::_avatarSortCoefficientSize { 4.0f };
float AvatarData::_avatarSortCoefficientCenter { 4.0f };
float AvatarData::_avatarSortCoefficientAge { 1.0f };
QScriptValue AvatarEntityMapToScriptValue(QScriptEngine* engine, const AvatarEntityMap& value) {