diff --git a/assignment-client/src/avatars/AvatarMixerClientData.cpp b/assignment-client/src/avatars/AvatarMixerClientData.cpp index e6e2fc3849..c65703b8e6 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.cpp +++ b/assignment-client/src/avatars/AvatarMixerClientData.cpp @@ -58,15 +58,13 @@ void AvatarMixerClientData::ignoreOther(SharedNodePointer self, SharedNodePointe } void AvatarMixerClientData::readViewFrustumPacket(const QByteArray& message) { - _currentViewFrustumIsValid = true; _currentViewFrustum.fromByteArray(message); } bool AvatarMixerClientData::otherAvatarInView(const AABox& otherAvatarBox) { - return !_currentViewFrustumIsValid || _currentViewFrustum.boxIntersectsKeyhole(otherAvatarBox); + return _currentViewFrustum.boxIntersectsKeyhole(otherAvatarBox); } - void AvatarMixerClientData::loadJSONStats(QJsonObject& jsonObject) const { jsonObject["display_name"] = _avatar->getDisplayName(); jsonObject["full_rate_distance"] = _fullRateDistance; diff --git a/assignment-client/src/avatars/AvatarMixerClientData.h b/assignment-client/src/avatars/AvatarMixerClientData.h index b894932ba7..78a30d8206 100644 --- a/assignment-client/src/avatars/AvatarMixerClientData.h +++ b/assignment-client/src/avatars/AvatarMixerClientData.h @@ -35,7 +35,7 @@ const QString INBOUND_AVATAR_DATA_STATS_KEY = "inbound_av_data_kbps"; class AvatarMixerClientData : public NodeData { Q_OBJECT public: - AvatarMixerClientData(const QUuid& nodeID = QUuid()) : NodeData(nodeID) {} + AvatarMixerClientData(const QUuid& nodeID = QUuid()) : NodeData(nodeID) { _currentViewFrustum.invalidate(); } virtual ~AvatarMixerClientData() {} using HRCTime = p_high_resolution_clock::time_point; @@ -125,7 +125,6 @@ private: SimpleMovingAverage _avgOtherAvatarDataRate; std::unordered_set _radiusIgnoredOthers; ViewFrustum _currentViewFrustum; - bool _currentViewFrustumIsValid { false }; int _recentOtherAvatarsInView { 0 }; int _recentOtherAvatarsOutOfView { 0 };