Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use a 1 m offset for position test; call-out nonavatars in stats web page

Browse source
This commit is contained in:
Simon Walton 2019-03-22 15:40:13 -07:00
parent a1660dad95
commit 137c25f907
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -843,7 +843,7 @@ void AvatarMixer::sendStatsPacket() {
QJsonObject avatarsObject; QJsonObject avatarsObject;
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
// add stats for each listerner // add stats for each listener
nodeList->eachNode([&](const SharedNodePointer& node) { nodeList->eachNode([&](const SharedNodePointer& node) {
QJsonObject avatarStats; QJsonObject avatarStats;
@ -867,6 +867,12 @@ void AvatarMixer::sendStatsPacket() {
avatarStats["delta_full_vs_avatar_data_kbps"] = avatarStats["delta_full_vs_avatar_data_kbps"] =
(double)outboundAvatarDataKbps - avatarStats[OUTBOUND_AVATAR_DATA_STATS_KEY].toDouble(); (double)outboundAvatarDataKbps - avatarStats[OUTBOUND_AVATAR_DATA_STATS_KEY].toDouble();
} }
if (node->getType() != NodeType::Agent) { // Nodes that aren't avatars
const QString displayName
{ node->getType() == NodeType::EntityScriptServer ? "ENTITY SCRIPT SERVER" : "ENTITY SERVER" };
avatarStats["display_name"] = displayName;
}
} }
avatarsObject[uuidStringWithoutCurlyBraces(node->getUUID())] = avatarStats; avatarsObject[uuidStringWithoutCurlyBraces(node->getUUID())] = avatarStats;

8
assignment-client/src/avatars/AvatarMixerClientData.cpp
View file

@ -23,6 +23,9 @@
#include "AvatarMixerSlave.h" #include "AvatarMixerSlave.h"
// Offset from reported position for priority-zone purposes:
const glm::vec3 AvatarMixerClientData::AVATAR_CENTER_OFFSET { 0.0f, 1.0f, 0.0 };
AvatarMixerClientData::AvatarMixerClientData(const QUuid& nodeID, Node::LocalID nodeLocalID) : AvatarMixerClientData::AvatarMixerClientData(const QUuid& nodeID, Node::LocalID nodeLocalID) :
NodeData(nodeID, nodeLocalID) { NodeData(nodeID, nodeLocalID) {
// in case somebody calls getSessionUUID on the AvatarData instance, make sure it has the right ID // in case somebody calls getSessionUUID on the AvatarData instance, make sure it has the right ID
@ -143,13 +146,10 @@ int AvatarMixerClientData::parseData(ReceivedMessage& message, const SlaveShared
auto newPosition = getPosition(); auto newPosition = getPosition();
if (newPosition != oldPosition || _avatar->getNeedsHeroCheck()) { if (newPosition != oldPosition || _avatar->getNeedsHeroCheck()) {
EntityTree& entityTree = *slaveSharedData.entityTree; EntityTree& entityTree = *slaveSharedData.entityTree;
FindPriorityZone findPriorityZone { newPosition, false } ; FindPriorityZone findPriorityZone { newPosition + AVATAR_CENTER_OFFSET } ;
entityTree.recurseTreeWithOperation(&FindPriorityZone::operation, &findPriorityZone); entityTree.recurseTreeWithOperation(&FindPriorityZone::operation, &findPriorityZone);
_avatar->setHasPriority(findPriorityZone.isInPriorityZone); _avatar->setHasPriority(findPriorityZone.isInPriorityZone);
_avatar->setNeedsHeroCheck(false); _avatar->setNeedsHeroCheck(false);
if (findPriorityZone.isInPriorityZone) {
qCWarning(avatars) << "Avatar" << _avatar->getSessionDisplayName() << "in hero zone";
}
} }
return true; return true;

1
assignment-client/src/avatars/AvatarMixerClientData.h
View file

@ -223,6 +223,7 @@ private:
PerNodeTraitVersions _perNodeSentTraitVersions; PerNodeTraitVersions _perNodeSentTraitVersions;
std::atomic_bool _isIgnoreRadiusEnabled { false }; std::atomic_bool _isIgnoreRadiusEnabled { false };
static const glm::vec3 AVATAR_CENTER_OFFSET;
}; };
#endif // hifi_AvatarMixerClientData_h #endif // hifi_AvatarMixerClientData_h