Merge branch 'master' into menu-updates

assignment-client/src/Agent.cpp

@@ -548,18 +548,18 @@ void Agent::setIsAvatar(bool isAvatar) {
     if (_isAvatar && !_avatarIdentityTimer) {
         // set up the avatar timers
         _avatarIdentityTimer = new QTimer(this);
-        _avatarViewTimer = new QTimer(this);
+        _avatarQueryTimer = new QTimer(this);
 
         // connect our slot
         connect(_avatarIdentityTimer, &QTimer::timeout, this, &Agent::sendAvatarIdentityPacket);
-        connect(_avatarViewTimer, &QTimer::timeout, this, &Agent::sendAvatarViewFrustum);
+        connect(_avatarQueryTimer, &QTimer::timeout, this, &Agent::queryAvatars);
 
         static const int AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS = 1000;
         static const int AVATAR_VIEW_PACKET_SEND_INTERVAL_MSECS = 1000;
 
         // start the timers
         _avatarIdentityTimer->start(AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS);  // FIXME - we shouldn't really need to constantly send identity packets
-        _avatarViewTimer->start(AVATAR_VIEW_PACKET_SEND_INTERVAL_MSECS);
+        _avatarQueryTimer->start(AVATAR_VIEW_PACKET_SEND_INTERVAL_MSECS);
 
         // tell the avatarAudioTimer to start ticking
         QMetaObject::invokeMethod(&_avatarAudioTimer, "start");
@@ -572,9 +572,9 @@ void Agent::setIsAvatar(bool isAvatar) {
             delete _avatarIdentityTimer;
             _avatarIdentityTimer = nullptr;
 
-            _avatarViewTimer->stop();
+            _avatarQueryTimer->stop();
-            delete _avatarViewTimer;
+            delete _avatarQueryTimer;
-            _avatarViewTimer = nullptr;
+            _avatarQueryTimer = nullptr;
 
             // The avatar mixer never times out a connection (e.g., based on identity or data packets)
             // but rather keeps avatars in its list as long as "connected". As a result, clients timeout
@@ -607,20 +607,26 @@ void Agent::sendAvatarIdentityPacket() {
     }
 }
 
-void Agent::sendAvatarViewFrustum() {
+void Agent::queryAvatars() {
     auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>();
 
     ViewFrustum view;
     view.setPosition(scriptedAvatar->getWorldPosition());
     view.setOrientation(scriptedAvatar->getHeadOrientation());
     view.calculate();
+    ConicalViewFrustum conicalView { view };
+
+    auto avatarPacket = NLPacket::create(PacketType::AvatarQuery);
+    auto destinationBuffer = reinterpret_cast<unsigned char*>(avatarPacket->getPayload());
+    auto bufferStart = destinationBuffer;
 
     uint8_t numFrustums = 1;
-    auto viewFrustumByteArray = view.toByteArray();
+    memcpy(destinationBuffer, &numFrustums, sizeof(numFrustums));
+    destinationBuffer += sizeof(numFrustums);
 
-    auto avatarPacket = NLPacket::create(PacketType::ViewFrustum, viewFrustumByteArray.size() + sizeof(numFrustums));
+    destinationBuffer += conicalView.serialize(destinationBuffer);
-    avatarPacket->writePrimitive(numFrustums);
+
-    avatarPacket->write(viewFrustumByteArray);
+    avatarPacket->setPayloadSize(destinationBuffer - bufferStart);
 
     DependencyManager::get<NodeList>()->broadcastToNodes(std::move(avatarPacket),
                                                          { NodeType::AvatarMixer });

assignment-client/src/Agent.h

@@ -97,7 +97,7 @@ private:
     void setAvatarSound(SharedSoundPointer avatarSound) { _avatarSound = avatarSound; }
 
     void sendAvatarIdentityPacket();
-    void sendAvatarViewFrustum();
+    void queryAvatars();
 
     QString _scriptContents;
     QTimer* _scriptRequestTimeout { nullptr };
@@ -107,7 +107,7 @@ private:
     int _numAvatarSoundSentBytes = 0;
     bool _isAvatar = false;
     QTimer* _avatarIdentityTimer = nullptr;
-    QTimer* _avatarViewTimer = nullptr;
+    QTimer* _avatarQueryTimer = nullptr;
     QHash<QUuid, quint16> _outgoingScriptAudioSequenceNumbers;
 
     AudioGate _audioGate;

assignment-client/src/AssignmentClient.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AssignmentClient.h"
+
 #include <assert.h>
 
 #include <QProcess>
@@ -32,16 +34,14 @@
 #include <SoundCache.h>
 #include <ResourceScriptingInterface.h>
 #include <UserActivityLoggerScriptingInterface.h>
-
-#include "AssignmentFactory.h"
-#include "AssignmentDynamicFactory.h"
-
-#include "AssignmentClient.h"
-#include "AssignmentClientLogging.h"
-#include "avatars/ScriptableAvatar.h"
 #include <Trace.h>
 #include <StatTracker.h>
 
+#include "AssignmentClientLogging.h"
+#include "AssignmentDynamicFactory.h"
+#include "AssignmentFactory.h"
+#include "avatars/ScriptableAvatar.h"
+
 const QString ASSIGNMENT_CLIENT_TARGET_NAME = "assignment-client";
 const long long ASSIGNMENT_REQUEST_INTERVAL_MSECS = 1 * 1000;
 

assignment-client/src/AssignmentClientMonitor.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AssignmentClientMonitor.h"
+
 #include <memory>
 #include <signal.h>
 
@@ -19,7 +21,6 @@
 #include <LogHandler.h>
 #include <udt/PacketHeaders.h>
 
-#include "AssignmentClientMonitor.h"
 #include "AssignmentClientApp.h"
 #include "AssignmentClientChildData.h"
 #include "SharedUtil.h"

assignment-client/src/AssignmentDynamic.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "EntitySimulation.h"
-
 #include "AssignmentDynamic.h"
 
+#include "EntitySimulation.h"
+
 AssignmentDynamic::AssignmentDynamic(EntityDynamicType type, const QUuid& id, EntityItemPointer ownerEntity) :
     EntityDynamicInterface(type, id),
     _data(QByteArray()),

assignment-client/src/AssignmentFactory.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AssignmentFactory.h"
+
 #include <udt/PacketHeaders.h>
 
 #include "Agent.h"
 #include "assets/AssetServer.h"
-#include "AssignmentFactory.h"
 #include "audio/AudioMixer.h"
 #include "avatars/AvatarMixer.h"
 #include "entities/EntityServer.h"

assignment-client/src/assets/AssetServer.h

@@ -36,10 +36,11 @@ enum class BakedAssetType : int {
     Undefined
 };
 
-// ATTENTION! If you change the current version for an asset type, you will also
+// ATTENTION! Do not remove baking versions, and do not reorder them. If you add
-// need to update the function currentBakeVersionForAssetType() inside of AssetServer.cpp.
+// a new value, it will immediately become the "current" version.
 enum class ModelBakeVersion : BakeVersion {
     Initial = INITIAL_BAKE_VERSION,
+    MetaTextureJson,
 
     COUNT
 };
@@ -47,6 +48,7 @@ enum class ModelBakeVersion : BakeVersion {
 // ATTENTION! See above.
 enum class TextureBakeVersion : BakeVersion {
     Initial = INITIAL_BAKE_VERSION,
+    MetaTextureJson,
 
     COUNT
 };

assignment-client/src/audio/AudioMixerSlavePool.cpp

@@ -9,11 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioMixerSlavePool.h"
+
 #include <assert.h>
 #include <algorithm>
 
-#include "AudioMixerSlavePool.h"
-
 void AudioMixerSlaveThread::run() {
     while (true) {
         wait();

assignment-client/src/audio/AvatarAudioStream.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarAudioStream.h"
+
 #include <udt/PacketHeaders.h>
 
 #include "AudioLogging.h"
-#include "AvatarAudioStream.h"
 
 AvatarAudioStream::AvatarAudioStream(bool isStereo, int numStaticJitterFrames) :
     PositionalAudioStream(PositionalAudioStream::Microphone, isStereo, numStaticJitterFrames) {}

assignment-client/src/avatars/AvatarMixer.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarMixer.h"
+
 #include <cfloat>
 #include <chrono>
 #include <memory>
@@ -31,8 +33,6 @@
 #include <UUID.h>
 #include <TryLocker.h>
 
-#include "AvatarMixer.h"
-
 const QString AVATAR_MIXER_LOGGING_NAME = "avatar-mixer";
 
 // FIXME - what we'd actually like to do is send to users at ~50% of their present rate down to 30hz. Assume 90 for now.
@@ -47,7 +47,7 @@ AvatarMixer::AvatarMixer(ReceivedMessage& message) :
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     packetReceiver.registerListener(PacketType::AvatarData, this, "queueIncomingPacket");
     packetReceiver.registerListener(PacketType::AdjustAvatarSorting, this, "handleAdjustAvatarSorting");
-    packetReceiver.registerListener(PacketType::ViewFrustum, this, "handleViewFrustumPacket");
+    packetReceiver.registerListener(PacketType::AvatarQuery, this, "handleAvatarQueryPacket");
     packetReceiver.registerListener(PacketType::AvatarIdentity, this, "handleAvatarIdentityPacket");
     packetReceiver.registerListener(PacketType::KillAvatar, this, "handleKillAvatarPacket");
     packetReceiver.registerListener(PacketType::NodeIgnoreRequest, this, "handleNodeIgnoreRequestPacket");
@@ -517,7 +517,7 @@ void AvatarMixer::handleAdjustAvatarSorting(QSharedPointer<ReceivedMessage> mess
 }
 
 
-void AvatarMixer::handleViewFrustumPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
+void AvatarMixer::handleAvatarQueryPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
     auto start = usecTimestampNow();
     getOrCreateClientData(senderNode);
 
@@ -683,7 +683,7 @@ void AvatarMixer::sendStatsPacket() {
     incomingPacketStats["handleNodeIgnoreRequestPacket"] = TIGHT_LOOP_STAT_UINT64(_handleNodeIgnoreRequestPacketElapsedTime);
     incomingPacketStats["handleRadiusIgnoreRequestPacket"] = TIGHT_LOOP_STAT_UINT64(_handleRadiusIgnoreRequestPacketElapsedTime);
     incomingPacketStats["handleRequestsDomainListDataPacket"] = TIGHT_LOOP_STAT_UINT64(_handleRequestsDomainListDataPacketElapsedTime);
-    incomingPacketStats["handleViewFrustumPacket"] = TIGHT_LOOP_STAT_UINT64(_handleViewFrustumPacketElapsedTime);
+    incomingPacketStats["handleAvatarQueryPacket"] = TIGHT_LOOP_STAT_UINT64(_handleViewFrustumPacketElapsedTime);
 
     singleCoreTasks["incoming_packets"] = incomingPacketStats;
     singleCoreTasks["sendStats"] = (float)_sendStatsElapsedTime;

assignment-client/src/avatars/AvatarMixer.h

@@ -46,7 +46,7 @@ public slots:
 private slots:
     void queueIncomingPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node);
     void handleAdjustAvatarSorting(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
-    void handleViewFrustumPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
+    void handleAvatarQueryPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void handleAvatarIdentityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void handleKillAvatarPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void handleNodeIgnoreRequestPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);

assignment-client/src/avatars/AvatarMixerClientData.cpp

@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarMixerClientData.h"
+
 #include <udt/PacketHeaders.h>
 
 #include <DependencyManager.h>
 #include <NodeList.h>
 
-#include "AvatarMixerClientData.h"
-
 AvatarMixerClientData::AvatarMixerClientData(const QUuid& nodeID) :
     NodeData(nodeID)
 {
@@ -126,17 +126,18 @@ void AvatarMixerClientData::removeFromRadiusIgnoringSet(SharedNodePointer self,
     }
 }
 
-void AvatarMixerClientData::readViewFrustumPacket(QByteArray message) {
+void AvatarMixerClientData::readViewFrustumPacket(const QByteArray& message) {
     _currentViewFrustums.clear();
+
+    auto sourceBuffer = reinterpret_cast<const unsigned char*>(message.constData());
     
     uint8_t numFrustums = 0;
-    memcpy(&numFrustums, message.constData(), sizeof(numFrustums));
+    memcpy(&numFrustums, sourceBuffer, sizeof(numFrustums));
-    message.remove(0, sizeof(numFrustums));
+    sourceBuffer += sizeof(numFrustums);
 
     for (uint8_t i = 0; i < numFrustums; ++i) {
-        ViewFrustum frustum;
+        ConicalViewFrustum frustum;
-        auto bytesRead = frustum.fromByteArray(message);
+        sourceBuffer += frustum.deserialize(sourceBuffer);
-        message.remove(0, bytesRead);
 
         _currentViewFrustums.push_back(frustum);
     }
@@ -144,8 +145,8 @@ void AvatarMixerClientData::readViewFrustumPacket(QByteArray message) {
 
 bool AvatarMixerClientData::otherAvatarInView(const AABox& otherAvatarBox) {
     return std::any_of(std::begin(_currentViewFrustums), std::end(_currentViewFrustums),
-                       [&](const ViewFrustum& viewFrustum) {
+                       [&](const ConicalViewFrustum& viewFrustum) {
-        return viewFrustum.boxIntersectsKeyhole(otherAvatarBox);
+        return viewFrustum.intersects(otherAvatarBox);
     });
 }
 

assignment-client/src/avatars/AvatarMixerClientData.h

@@ -28,7 +28,7 @@
 #include <PortableHighResolutionClock.h>
 #include <SimpleMovingAverage.h>
 #include <UUIDHasher.h>
-#include <ViewFrustum.h>
+#include <shared/ConicalViewFrustum.h>
 
 const QString OUTBOUND_AVATAR_DATA_STATS_KEY = "outbound_av_data_kbps";
 const QString INBOUND_AVATAR_DATA_STATS_KEY = "inbound_av_data_kbps";
@@ -98,7 +98,7 @@ public:
     void removeFromRadiusIgnoringSet(SharedNodePointer self, const QUuid& other);
     void ignoreOther(SharedNodePointer self, SharedNodePointer other);
 
-    void readViewFrustumPacket(QByteArray message);
+    void readViewFrustumPacket(const QByteArray& message);
 
     bool otherAvatarInView(const AABox& otherAvatarBox);
 
@@ -110,7 +110,7 @@ public:
     bool getRequestsDomainListData() { return _requestsDomainListData; }
     void setRequestsDomainListData(bool requesting) { _requestsDomainListData = requesting; }
 
-    const ViewFrustums& getViewFrustums() const { return _currentViewFrustums; }
+    const ConicalViewFrustums& getViewFrustums() const { return _currentViewFrustums; }
 
     uint64_t getLastOtherAvatarEncodeTime(QUuid otherAvatar) const;
     void setLastOtherAvatarEncodeTime(const QUuid& otherAvatar, uint64_t time);
@@ -150,7 +150,7 @@ private:
 
     SimpleMovingAverage _avgOtherAvatarDataRate;
     std::unordered_set<QUuid> _radiusIgnoredOthers;
-    ViewFrustums _currentViewFrustums;
+    ConicalViewFrustums _currentViewFrustums;
 
     int _recentOtherAvatarsInView { 0 };
     int _recentOtherAvatarsOutOfView { 0 };

assignment-client/src/avatars/AvatarMixerSlave.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarMixerSlave.h"
+
 #include <algorithm>
 #include <random>
 
@@ -28,10 +30,8 @@
 #include <StDev.h>
 #include <UUID.h>
 
-
 #include "AvatarMixer.h"
 #include "AvatarMixerClientData.h"
-#include "AvatarMixerSlave.h"
 
 void AvatarMixerSlave::configure(ConstIter begin, ConstIter end) {
     _begin = begin;

assignment-client/src/avatars/AvatarMixerSlave.h

@@ -12,6 +12,8 @@
 #ifndef hifi_AvatarMixerSlave_h
 #define hifi_AvatarMixerSlave_h
 
+#include <NodeList.h>
+
 class AvatarMixerClientData;
 
 class AvatarMixerSlaveStats {

assignment-client/src/avatars/AvatarMixerSlavePool.cpp

@@ -9,11 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarMixerSlavePool.h"
+
 #include <assert.h>
 #include <algorithm>
 
-#include "AvatarMixerSlavePool.h"
-
 void AvatarMixerSlaveThread::run() {
     while (true) {
         wait();

assignment-client/src/avatars/ScriptableAvatar.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ScriptableAvatar.h"
+
 #include <QDebug>
 #include <QThread>
 #include <glm/gtx/transform.hpp>
@@ -16,7 +18,6 @@
 #include <shared/QtHelpers.h>
 #include <GLMHelpers.h>
 #include <AnimUtil.h>
-#include "ScriptableAvatar.h"
 
 
 QByteArray ScriptableAvatar::toByteArrayStateful(AvatarDataDetail dataDetail, bool dropFaceTracking) {

assignment-client/src/entities/EntityPriorityQueue.cpp

@@ -1,76 +0,0 @@
-//
-//  EntityPriorityQueue.cpp
-//  assignment-client/src/entities
-//
-//  Created by Andrew Meadows 2017.08.08
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include "EntityPriorityQueue.h"
-
-const float PrioritizedEntity::DO_NOT_SEND = -1.0e-6f;
-const float PrioritizedEntity::FORCE_REMOVE = -1.0e-5f;
-const float PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY = 1.0f;
-
-void ConicalViewFrustum::set(const ViewFrustum& viewFrustum) {
-    // The ConicalView has two parts: a central sphere (same as ViewFrustum) and a circular cone that bounds the frustum part.
-    // Why?  Because approximate intersection tests are much faster to compute for a cone than for a frustum.
-    _position = viewFrustum.getPosition();
-    _direction = viewFrustum.getDirection();
-
-    // We cache the sin and cos of the half angle of the cone that bounds the frustum.
-    // (the math here is left as an exercise for the reader)
-    float A = viewFrustum.getAspectRatio();
-    float t = tanf(0.5f * viewFrustum.getFieldOfView());
-    _cosAngle = 1.0f / sqrtf(1.0f + (A * A + 1.0f) * (t * t));
-    _sinAngle = sqrtf(1.0f - _cosAngle * _cosAngle);
-
-    _radius = viewFrustum.getCenterRadius();
-}
-
-float ConicalViewFrustum::computePriority(const AACube& cube) const {
-    glm::vec3 p = cube.calcCenter() - _position; // position of bounding sphere in view-frame
-    float d = glm::length(p); // distance to center of bounding sphere
-    float r = 0.5f * cube.getScale(); // radius of bounding sphere
-    if (d < _radius + r) {
-        return r;
-    }
-    // We check the angle between the center of the cube and the _direction of the view.
-    // If it is less than the sum of the half-angle from center of cone to outer edge plus
-    // the half apparent angle of the bounding sphere then it is in view.
-    //
-    // The math here is left as an exercise for the reader with the following hints:
-    // (1) We actually check the dot product of the cube's local position rather than the angle and
-    // (2) we take advantage of this trig identity: cos(A+B) = cos(A)*cos(B) - sin(A)*sin(B)
-    if (glm::dot(p, _direction) > sqrtf(d * d - r * r) * _cosAngle - r * _sinAngle) {
-        const float AVOID_DIVIDE_BY_ZERO = 0.001f;
-        return r / (d + AVOID_DIVIDE_BY_ZERO);
-    }
-    return PrioritizedEntity::DO_NOT_SEND;
-}
-
-
-void ConicalView::set(const DiffTraversal::View& view) {
-    auto size = view.viewFrustums.size();
-    _conicalViewFrustums.resize(size);
-    for (size_t i = 0; i < size; ++i) {
-        _conicalViewFrustums[i].set(view.viewFrustums[i]);
-    }
-}
-
-float ConicalView::computePriority(const AACube& cube) const {
-    if (_conicalViewFrustums.empty()) {
-        return PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
-    }
-
-    float priority = PrioritizedEntity::DO_NOT_SEND;
-
-    for (const auto& view : _conicalViewFrustums) {
-        priority = std::max(priority, view.computePriority(cube));
-    }
-
-    return priority;
-}

assignment-client/src/entities/EntityServer.cpp

@@ -9,21 +9,23 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "EntityServer.h"
+
 #include <QtCore/QEventLoop>
 #include <QTimer>
+#include <QJsonArray>
+#include <QJsonDocument>
+
 #include <EntityTree.h>
 #include <SimpleEntitySimulation.h>
 #include <ResourceCache.h>
 #include <ScriptCache.h>
 #include <EntityEditFilters.h>
 #include <NetworkingConstants.h>
-#include <QJsonArray>
-#include <QJsonDocument>
 #include <AddressManager.h>
 
 #include "AssignmentParentFinder.h"
 #include "EntityNodeData.h"
-#include "EntityServer.h"
 #include "EntityServerConsts.h"
 #include "EntityTreeSendThread.h"
 

assignment-client/src/entities/EntityTreeSendThread.cpp

@@ -107,16 +107,7 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
 
 
         DiffTraversal::View newView;
-
+        newView.viewFrustums = nodeData->getCurrentViews();
-        ViewFrustum viewFrustum;
-        if (nodeData->hasMainViewFrustum()) {
-            nodeData->copyCurrentMainViewFrustum(viewFrustum);
-            newView.viewFrustums.push_back(viewFrustum);
-        }
-        if (nodeData->hasSecondaryViewFrustum()) {
-            nodeData->copyCurrentSecondaryViewFrustum(viewFrustum);
-            newView.viewFrustums.push_back(viewFrustum);
-        }
 
         int32_t lodLevelOffset = nodeData->getBoundaryLevelAdjust() + (viewFrustumChanged ? LOW_RES_MOVING_ADJUST : NO_BOUNDARY_ADJUST);
         newView.lodScaleFactor = powf(2.0f, lodLevelOffset);
@@ -141,16 +132,8 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
                     if (forceRemove) {
                         priority = PrioritizedEntity::FORCE_REMOVE;
                     } else {
-                        bool success = false;
+                        const auto& view = _traversal.getCurrentView();
-                        AACube cube = entity->getQueryAACube(success);
+                        priority = view.computePriority(entity);
-                        if (success) {
-                            const auto& view = _traversal.getCurrentView();
-                            if (view.intersects(cube) && view.isBigEnough(cube)) {
-                                priority = _conicalView.computePriority(cube);
-                            }
-                        } else {
-                            priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
-                        }
                     }
 
                     if (priority != PrioritizedEntity::DO_NOT_SEND) {
@@ -235,11 +218,6 @@ void EntityTreeSendThread::startNewTraversal(const DiffTraversal::View& view, En
     //      (3) Differential = view has changed --> find what has changed or in new view but not old
     //
     // The "scanCallback" we provide to the traversal depends on the type:
-    //
-    // The _conicalView is updated here as a cached view approximation used by the lambdas for efficient
-    // computation of entity sorting priorities.
-    //
-    _conicalView.set(_traversal.getCurrentView());
 
     switch (type) {
         case DiffTraversal::First:
@@ -251,25 +229,8 @@ void EntityTreeSendThread::startNewTraversal(const DiffTraversal::View& view, En
                     if (_sendQueue.contains(entity.get())) {
                         return;
                     }
-                    float priority = PrioritizedEntity::DO_NOT_SEND;
+                    const auto& view = _traversal.getCurrentView();
-
+                    float priority = view.computePriority(entity);
-
-                    bool success = false;
-                    AACube cube = entity->getQueryAACube(success);
-                    if (success) {
-                        const auto& view = _traversal.getCurrentView();
-                        // Check the size of the entity, it's possible that a "too small to see" entity is included in a
-                        // larger octree cell because of its position (for example if it crosses the boundary of a cell it
-                        // pops to the next higher cell. So we want to check to see that the entity is large enough to be seen
-                        // before we consider including it.
-                        if ((next.intersection == ViewFrustum::INSIDE || view.intersects(cube)) &&
-                            view.isBigEnough(cube)) {
-                            priority = _conicalView.computePriority(cube);
-                        }
-                    } else {
-                        priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
-                    }
-
 
                     if (priority != PrioritizedEntity::DO_NOT_SEND) {
                         _sendQueue.emplace(entity, priority);
@@ -288,21 +249,11 @@ void EntityTreeSendThread::startNewTraversal(const DiffTraversal::View& view, En
                         }
                         float priority = PrioritizedEntity::DO_NOT_SEND;
 
-
                         auto knownTimestamp = _knownState.find(entity.get());
                         if (knownTimestamp == _knownState.end()) {
-                            bool success = false;
+                            const auto& view = _traversal.getCurrentView();
-                            AACube cube = entity->getQueryAACube(success);
+                            priority = view.computePriority(entity);
-                            if (success) {
+
-                                const auto& view = _traversal.getCurrentView();
-                                // See the DiffTraversal::First case for an explanation of the "entity is too small" check
-                                if ((next.intersection == ViewFrustum::INSIDE || view.intersects(cube)) &&
-                                    view.isBigEnough(cube)) {
-                                    priority = _conicalView.computePriority(cube);
-                                }
-                            } else {
-                                priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
-                            }
                         } else if (entity->getLastEdited() > knownTimestamp->second ||
                                    entity->getLastChangedOnServer() > knownTimestamp->second) {
                             // it is known and it changed --> put it on the queue with any priority
@@ -310,7 +261,6 @@ void EntityTreeSendThread::startNewTraversal(const DiffTraversal::View& view, En
                             priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
                         }
 
-
                         if (priority != PrioritizedEntity::DO_NOT_SEND) {
                             _sendQueue.emplace(entity, priority);
                         }
@@ -328,21 +278,11 @@ void EntityTreeSendThread::startNewTraversal(const DiffTraversal::View& view, En
                     }
                     float priority = PrioritizedEntity::DO_NOT_SEND;
 
-
                     auto knownTimestamp = _knownState.find(entity.get());
                     if (knownTimestamp == _knownState.end()) {
-                        bool success = false;
+                        const auto& view = _traversal.getCurrentView();
-                        AACube cube = entity->getQueryAACube(success);
+                        priority = view.computePriority(entity);
-                        if (success) {
+
-                            const auto& view = _traversal.getCurrentView();
-                            // See the DiffTraversal::First case for an explanation of the "entity is too small" check
-                            if ((next.intersection == ViewFrustum::INSIDE || view.intersects(cube)) &&
-                                view.isBigEnough(cube)) {
-                                    priority = _conicalView.computePriority(cube);
-                            }
-                        } else {
-                            priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
-                        }
                     } else if (entity->getLastEdited() > knownTimestamp->second ||
                                entity->getLastChangedOnServer() > knownTimestamp->second) {
                         // it is known and it changed --> put it on the queue with any priority
@@ -350,7 +290,6 @@ void EntityTreeSendThread::startNewTraversal(const DiffTraversal::View& view, En
                         priority = PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY;
                     }
 
-
                     if (priority != PrioritizedEntity::DO_NOT_SEND) {
                         _sendQueue.emplace(entity, priority);
                     }
@@ -463,14 +402,13 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream
 void EntityTreeSendThread::editingEntityPointer(const EntityItemPointer& entity) {
     if (entity) {
         if (!_sendQueue.contains(entity.get()) && _knownState.find(entity.get()) != _knownState.end()) {
-            bool success = false;
+            const auto& view = _traversal.getCurrentView();
-            AACube cube = entity->getQueryAACube(success);
+            float priority = view.computePriority(entity);
-            if (success) {
+
-                // We can force a removal from _knownState if the current view is used and entity is out of view
+            // We can force a removal from _knownState if the current view is used and entity is out of view
-                if (_traversal.doesCurrentUseViewFrustum() && !_traversal.getCurrentView().intersects(cube)) {
+            if (priority == PrioritizedEntity::DO_NOT_SEND) {
-                    _sendQueue.emplace(entity, PrioritizedEntity::FORCE_REMOVE, true);
+                _sendQueue.emplace(entity, PrioritizedEntity::FORCE_REMOVE, true);
-                }
+            } else if (priority == PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY) {
-            } else {
                 _sendQueue.emplace(entity, PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY, true);
             }
         }

assignment-client/src/entities/EntityTreeSendThread.h

@@ -17,8 +17,9 @@
 #include "../octree/OctreeSendThread.h"
 
 #include <DiffTraversal.h>
+#include <EntityPriorityQueue.h>
+#include <shared/ConicalViewFrustum.h>
 
-#include "EntityPriorityQueue.h"
 
 class EntityNodeData;
 class EntityItem;
@@ -51,7 +52,6 @@ private:
     DiffTraversal _traversal;
     EntityPriorityQueue _sendQueue;
     std::unordered_map<EntityItem*, uint64_t> _knownState;
-    ConicalView _conicalView; // cached optimized view for fast priority calculations
 
     // packet construction stuff
     EntityTreeElementExtraEncodeDataPointer _extraEncodeData { new EntityTreeElementExtraEncodeData() };

assignment-client/src/messages/MessagesMixer.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "MessagesMixer.h"
+
 #include <QtCore/QCoreApplication>
 #include <QtCore/QJsonObject>
 #include <QBuffer>
@@ -16,7 +18,6 @@
 #include <MessagesClient.h>
 #include <NodeList.h>
 #include <udt/PacketHeaders.h>
-#include "MessagesMixer.h"
 
 const QString MESSAGES_MIXER_LOGGING_NAME = "messages-mixer";
 

assignment-client/src/octree/OctreeHeadlessViewer.cpp

@@ -19,7 +19,10 @@ void OctreeHeadlessViewer::queryOctree() {
     PacketType packetType = getMyQueryMessageType();
 
     if (_hasViewFrustum) {
-        _octreeQuery.setMainViewFrustum(_viewFrustum);
+        ConicalViewFrustums views { _viewFrustum };
+        _octreeQuery.setConicalViews(views);
+    } else {
+        _octreeQuery.clearConicalViews();
     }
 
     auto nodeList = DependencyManager::get<NodeList>();

assignment-client/src/octree/OctreeInboundPacketProcessor.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OctreeInboundPacketProcessor.h"
+
 #include <limits>
 
 #include <NumericalConstants.h>
@@ -17,7 +19,6 @@
 
 #include "OctreeServer.h"
 #include "OctreeServerConsts.h"
-#include "OctreeInboundPacketProcessor.h"
 
 static QUuid DEFAULT_NODE_ID_REF;
 const quint64 TOO_LONG_SINCE_LAST_NACK = 1 * USECS_PER_SECOND;

assignment-client/src/octree/OctreeSendThread.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OctreeSendThread.h"
+
 #include <chrono>
 #include <thread>
 
@@ -17,7 +19,6 @@
 #include <udt/PacketHeaders.h>
 #include <PerfStat.h>
 
-#include "OctreeSendThread.h"
 #include "OctreeServer.h"
 #include "OctreeServerConsts.h"
 #include "OctreeLogging.h"
@@ -330,7 +331,7 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
     } else {
         // we aren't forcing a full scene, check if something else suggests we should
         isFullScene = nodeData->haveJSONParametersChanged() ||
-                      (nodeData->hasMainViewFrustum() &&
+                      (nodeData->hasConicalViews() &&
                        (nodeData->getViewFrustumJustStoppedChanging() ||
                         nodeData->hasLodChanged()));
     }

domain-server/src/DomainServerNodeData.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DomainServerNodeData.h"
+
 #include <QtCore/QDataStream>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
@@ -17,8 +19,6 @@
 
 #include <udt/PacketHeaders.h>
 
-#include "DomainServerNodeData.h"
-
 DomainServerNodeData::StringPairHash DomainServerNodeData::_overrideHash;
 
 DomainServerNodeData::DomainServerNodeData() {

domain-server/src/DomainServerNodeData.h

@@ -15,6 +15,7 @@
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QHash>
 #include <QtCore/QUuid>
+#include <QtCore/QJsonObject>
 
 #include <HifiSockAddr.h>
 #include <NLPacket.h>

domain-server/src/DomainServerWebSessionData.cpp

@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DomainServerWebSessionData.h"
+
 #include <QtCore/QDataStream>
 #include <QtCore/QDebug>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 
-#include "DomainServerWebSessionData.h"
-
 DomainServerWebSessionData::DomainServerWebSessionData() :
     _username(),
     _roles()

gvr-interface/src/Client.cpp

@@ -9,14 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Client.h"
+
 #include <AccountManager.h>
 #include <AddressManager.h>
 #include <HifiSockAddr.h>
 #include <NodeList.h>
 #include <PacketHeaders.h>
 
-#include "Client.h"
-
 Client::Client(QObject* parent) :
     QObject(parent)
 {   
@@ -70,4 +70,4 @@ void Client::processDatagrams() {
             processVerifiedPacket(senderSockAddr, incomingPacket);
         }
     }
-}
+}

gvr-interface/src/GVRInterface.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "GVRInterface.h"
+
 #ifdef ANDROID
 
 #include <jni.h>
@@ -32,8 +34,6 @@
 #include "GVRMainWindow.h"
 #include "RenderingClient.h"
 
-#include "GVRInterface.h"
-
 static QString launchURLString = QString();
 
 #ifdef ANDROID

gvr-interface/src/GVRMainWindow.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "GVRMainWindow.h"
+
 #include <QtGui/QKeyEvent>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QInputDialog>
@@ -37,8 +39,6 @@ const float LIBOVR_LONG_PRESS_DURATION = 0.75f;
 #include "LoginDialog.h"
 #include "RenderingClient.h"
 
-#include "GVRMainWindow.h"
-
 
 
 GVRMainWindow::GVRMainWindow(QWidget* parent) :

gvr-interface/src/LoginDialog.cpp

@@ -9,14 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LoginDialog.h"
+
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QGridLayout>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QPushButton>
 
-#include "LoginDialog.h"
-
 LoginDialog::LoginDialog(QWidget* parent) :
     QDialog(parent)
 {
@@ -66,4 +66,4 @@ void LoginDialog::setupGUI() {
 void LoginDialog::loginButtonClicked() {
     emit credentialsEntered(_usernameLineEdit->text(), _passwordLineEdit->text());
     close();
-}
+}

gvr-interface/src/RenderingClient.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "RenderingClient.h"
+
 #include <QtCore/QThread>
 #include <QtWidgets/QInputDialog>
 
@@ -17,8 +19,6 @@
 #include <AvatarHashMap.h>
 #include <NodeList.h>
 
-#include "RenderingClient.h"
-
 RenderingClient* RenderingClient::_instance = NULL;
 
 RenderingClient::RenderingClient(QObject *parent, const QString& launchURLString) :

interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml

@@ -47,6 +47,13 @@ Item {
 
         onWalletAuthenticatedStatusResult: {
             submitPassphraseInputButton.enabled = true;
+
+            // It's not possible to auth with a blank passphrase,
+            // so bail early if we get this signal without anything in the passphrase field
+            if (passphraseField.text === "") {
+                return;
+            }
+
             if (!isAuthenticated) {
                 errorText.text = "Authentication failed - please try again.";
                 passphraseField.error = true;
@@ -211,6 +218,10 @@ Item {
                     error = false;
                     focus = true;
                     forceActiveFocus();
+                } else {
+                    showPassphrase.checked = false;
+                    passphraseField.text = "";
+                    error = false;
                 }
             }
 

interface/src/Application.cpp

@@ -967,7 +967,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     _entitySimulation(new PhysicalEntitySimulation()),
     _physicsEngine(new PhysicsEngine(Vectors::ZERO)),
     _entityClipboard(new EntityTree()),
-    _lastQueriedTime(usecTimestampNow()),
     _previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION),
     _fieldOfView("fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES),
     _hmdTabletScale("hmdTabletScale", DEFAULT_HMD_TABLET_SCALE_PERCENT),
@@ -1325,6 +1324,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     // Create the main thread context, the GPU backend, and the display plugins
     initializeGL();
+    DependencyManager::get<TextureCache>()->setGPUContext(_gpuContext);
     qCDebug(interfaceapp, "Initialized Display.");
     // Create the rendering engine.  This can be slow on some machines due to lots of 
     // GPU pipeline creation.
@@ -5081,7 +5081,7 @@ void Application::reloadResourceCaches() {
     resetPhysicsReadyInformation();
 
     // Query the octree to refresh everything in view
-    _lastQueriedTime = 0;
+    _queryExpiry = SteadyClock::now();
     _octreeQuery.incrementConnectionID();
 
     queryOctree(NodeType::EntityServer, PacketType::EntityQuery);
@@ -5224,13 +5224,12 @@ void Application::updateSecondaryCameraViewFrustum() {
     auto renderConfig = _renderEngine->getConfiguration();
     assert(renderConfig);
     auto camera = dynamic_cast<SecondaryCameraJobConfig*>(renderConfig->getConfig("SecondaryCamera"));
-    assert(camera);
 
-    if (!camera->isEnabled()) {
+    if (!camera || !camera->isEnabled()) {
-        _hasSecondaryViewFrustum = false;
         return;
     }
 
+    ViewFrustum secondaryViewFrustum;
     if (camera->mirrorProjection && !camera->attachedEntityId.isNull()) {
         auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
         auto entityProperties = entityScriptingInterface->getEntityProperties(camera->attachedEntityId);
@@ -5255,36 +5254,37 @@ void Application::updateSecondaryCameraViewFrustum() {
 
         // set frustum position to be mirrored camera and set orientation to mirror's adjusted rotation
         glm::quat mirrorCameraOrientation = glm::quat_cast(worldFromMirrorRotation);
-        _secondaryViewFrustum.setPosition(mirrorCameraPositionWorld);
+        secondaryViewFrustum.setPosition(mirrorCameraPositionWorld);
-        _secondaryViewFrustum.setOrientation(mirrorCameraOrientation);
+        secondaryViewFrustum.setOrientation(mirrorCameraOrientation);
 
         // build frustum using mirror space translation of mirrored camera
         float nearClip = mirrorCameraPositionMirror.z + mirrorPropertiesDimensions.z * 2.0f;
         glm::vec3 upperRight = halfMirrorPropertiesDimensions - mirrorCameraPositionMirror;
         glm::vec3 bottomLeft = -halfMirrorPropertiesDimensions - mirrorCameraPositionMirror;
         glm::mat4 frustum = glm::frustum(bottomLeft.x, upperRight.x, bottomLeft.y, upperRight.y, nearClip, camera->farClipPlaneDistance);
-        _secondaryViewFrustum.setProjection(frustum);
+        secondaryViewFrustum.setProjection(frustum);
     } else {
         if (!camera->attachedEntityId.isNull()) {
             auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
             auto entityProperties = entityScriptingInterface->getEntityProperties(camera->attachedEntityId);
-            _secondaryViewFrustum.setPosition(entityProperties.getPosition());
+            secondaryViewFrustum.setPosition(entityProperties.getPosition());
-            _secondaryViewFrustum.setOrientation(entityProperties.getRotation());
+            secondaryViewFrustum.setOrientation(entityProperties.getRotation());
         } else {
-            _secondaryViewFrustum.setPosition(camera->position);
+            secondaryViewFrustum.setPosition(camera->position);
-            _secondaryViewFrustum.setOrientation(camera->orientation);
+            secondaryViewFrustum.setOrientation(camera->orientation);
         }
 
         float aspectRatio = (float)camera->textureWidth / (float)camera->textureHeight;
-        _secondaryViewFrustum.setProjection(camera->vFoV,
+        secondaryViewFrustum.setProjection(camera->vFoV,
                                             aspectRatio,
                                             camera->nearClipPlaneDistance,
                                             camera->farClipPlaneDistance);
     }
     // Without calculating the bound planes, the secondary camera will use the same culling frustum as the main camera,
     // which is not what we want here.
-    _secondaryViewFrustum.calculate();
+    secondaryViewFrustum.calculate();
-    _hasSecondaryViewFrustum = true;
+
+    _conicalViews.push_back(secondaryViewFrustum);
 }
 
 static bool domainLoadingInProgress = false;
@@ -5641,6 +5641,8 @@ void Application::update(float deltaTime) {
         QMutexLocker viewLocker(&_viewMutex);
         _myCamera.loadViewFrustum(_viewFrustum);
 
+        _conicalViews.clear();
+        _conicalViews.push_back(_viewFrustum);
         // TODO: Fix this by modeling the way the secondary camera works on how the main camera works
         // ie. Use a camera object stored in the game logic and informs the Engine on where the secondary
         // camera should be.
@@ -5654,21 +5656,31 @@ void Application::update(float deltaTime) {
         PROFILE_RANGE_EX(app, "QueryOctree", 0xffff0000, (uint64_t)getActiveDisplayPlugin()->presentCount());
         PerformanceTimer perfTimer("queryOctree");
         QMutexLocker viewLocker(&_viewMutex);
-        quint64 sinceLastQuery = now - _lastQueriedTime;
+
-        const quint64 TOO_LONG_SINCE_LAST_QUERY = 3 * USECS_PER_SECOND;
+        bool viewIsDifferentEnough = false;
-        bool queryIsDue = sinceLastQuery > TOO_LONG_SINCE_LAST_QUERY;
+        if (_conicalViews.size() == _lastQueriedViews.size()) {
-        bool viewIsDifferentEnough = !_lastQueriedViewFrustum.isVerySimilar(_viewFrustum);
+            for (size_t i = 0; i < _conicalViews.size(); ++i) {
-        viewIsDifferentEnough |= _hasSecondaryViewFrustum && !_lastQueriedSecondaryViewFrustum.isVerySimilar(_secondaryViewFrustum);
+                if (!_conicalViews[i].isVerySimilar(_lastQueriedViews[i])) {
+                    viewIsDifferentEnough = true;
+                    break;
+                }
+            }
+        } else {
+            viewIsDifferentEnough = true;
+        }
+
         
         // if it's been a while since our last query or the view has significantly changed then send a query, otherwise suppress it
-        if (queryIsDue || viewIsDifferentEnough) {
+        static const std::chrono::seconds MIN_PERIOD_BETWEEN_QUERIES { 3 };
-            _lastQueriedTime = now;
+        auto now = SteadyClock::now();
+        if (now > _queryExpiry || viewIsDifferentEnough) {
             if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) {
                 queryOctree(NodeType::EntityServer, PacketType::EntityQuery);
             }
-            sendAvatarViewFrustum();
+            queryAvatars();
-            _lastQueriedViewFrustum = _viewFrustum;
+
-            _lastQueriedSecondaryViewFrustum = _secondaryViewFrustum;
+            _lastQueriedViews = _conicalViews;
+            _queryExpiry = now + MIN_PERIOD_BETWEEN_QUERIES;
         }
     }
 
@@ -5840,18 +5852,20 @@ void Application::update(float deltaTime) {
     }
 }
 
-void Application::sendAvatarViewFrustum() {
+void Application::queryAvatars() {
-    uint8_t numFrustums = 1;
+    auto avatarPacket = NLPacket::create(PacketType::AvatarQuery);
-    QByteArray viewFrustumByteArray = _viewFrustum.toByteArray();
+    auto destinationBuffer = reinterpret_cast<unsigned char*>(avatarPacket->getPayload());
+    unsigned char* bufferStart = destinationBuffer;
 
-    if (_hasSecondaryViewFrustum) {
+    uint8_t numFrustums = (uint8_t)_conicalViews.size();
-        ++numFrustums;
+    memcpy(destinationBuffer, &numFrustums, sizeof(numFrustums));
-        viewFrustumByteArray += _secondaryViewFrustum.toByteArray();
+    destinationBuffer += sizeof(numFrustums);
+
+    for (const auto& view : _conicalViews) {
+        destinationBuffer += view.serialize(destinationBuffer);
     }
 
-    auto avatarPacket = NLPacket::create(PacketType::ViewFrustum, viewFrustumByteArray.size() + sizeof(numFrustums));
+    avatarPacket->setPayloadSize(destinationBuffer - bufferStart);
-    avatarPacket->writePrimitive(numFrustums);
-    avatarPacket->write(viewFrustumByteArray);
 
     DependencyManager::get<NodeList>()->broadcastToNodes(std::move(avatarPacket), NodeSet() << NodeType::AvatarMixer);
 }
@@ -5913,16 +5927,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType) {
         return; // bail early if settings are not loaded
     }
 
-    ViewFrustum viewFrustum;
+    _octreeQuery.setConicalViews(_conicalViews);
-    copyViewFrustum(viewFrustum);
-    _octreeQuery.setMainViewFrustum(viewFrustum);
-
-    if (hasSecondaryViewFrustum()) {
-        copySecondaryViewFrustum(viewFrustum);
-        _octreeQuery.setSecondaryViewFrustum(viewFrustum);
-    } else {
-        _octreeQuery.clearSecondaryViewFrustum();
-    }
 
     auto lodManager = DependencyManager::get<LODManager>();
     _octreeQuery.setOctreeSizeScale(lodManager->getOctreeSizeScale());
@@ -6007,11 +6012,6 @@ void Application::copyDisplayViewFrustum(ViewFrustum& viewOut) const {
     viewOut = _displayViewFrustum;
 }
 
-void Application::copySecondaryViewFrustum(ViewFrustum& viewOut) const {
-    QMutexLocker viewLocker(&_viewMutex);
-    viewOut = _secondaryViewFrustum;
-}
-
 void Application::resetSensors(bool andReload) {
     DependencyManager::get<DdeFaceTracker>()->reset();
     DependencyManager::get<EyeTracker>()->reset();
@@ -6137,7 +6137,7 @@ void Application::nodeActivated(SharedNodePointer node) {
     // If we get a new EntityServer activated, reset lastQueried time
     // so we will do a proper query during update
     if (node->getType() == NodeType::EntityServer) {
-        _lastQueriedTime = 0;
+        _queryExpiry = SteadyClock::now();
         _octreeQuery.incrementConnectionID();
     }
 
@@ -6146,6 +6146,8 @@ void Application::nodeActivated(SharedNodePointer node) {
     }
 
     if (node->getType() == NodeType::AvatarMixer) {
+        _queryExpiry = SteadyClock::now();
+
         // new avatar mixer, send off our identity packet on next update loop
         // Reset skeletonModelUrl if the last server modified our choice.
         // Override the avatar url (but not model name) here too.

interface/src/Application.h

@@ -47,6 +47,7 @@
 #include <AbstractUriHandler.h>
 #include <shared/RateCounter.h>
 #include <ThreadSafeValueCache.h>
+#include <shared/ConicalViewFrustum.h>
 #include <shared/FileLogger.h>
 
 #include <RunningMarker.h>
@@ -110,7 +111,8 @@ class Application : public QApplication,
                     public AbstractViewStateInterface,
                     public AbstractScriptingServicesInterface,
                     public AbstractUriHandler,
-                    public PluginContainer {
+                    public PluginContainer
+{
     Q_OBJECT
 
     // TODO? Get rid of those
@@ -175,14 +177,14 @@ public:
     Camera& getCamera() { return _myCamera; }
     const Camera& getCamera() const { return _myCamera; }
     // Represents the current view frustum of the avatar.
-    void copyViewFrustum(ViewFrustum& viewOut) const override;
+    void copyViewFrustum(ViewFrustum& viewOut) const;
-    void copySecondaryViewFrustum(ViewFrustum& viewOut) const override;
-    bool hasSecondaryViewFrustum() const override { return _hasSecondaryViewFrustum; }
     // Represents the view frustum of the current rendering pass,
     // which might be different from the viewFrustum, i.e. shadowmap
     // passes, mirror window passes, etc
     void copyDisplayViewFrustum(ViewFrustum& viewOut) const;
 
+    const ConicalViewFrustums& getConicalViews() const override { return _conicalViews; }
+
     const OctreePacketProcessor& getOctreePacketProcessor() const { return _octreeProcessor; }
     QSharedPointer<EntityTreeRenderer> getEntities() const { return DependencyManager::get<EntityTreeRenderer>(); }
     QUndoStack* getUndoStack() { return &_undoStack; }
@@ -491,9 +493,9 @@ private:
     void updateDialogs(float deltaTime) const;
 
     void queryOctree(NodeType_t serverType, PacketType packetType);
+    void queryAvatars();
 
     int sendNackPackets();
-    void sendAvatarViewFrustum();
 
     std::shared_ptr<MyAvatar> getMyAvatar() const;
 
@@ -574,12 +576,14 @@ private:
 
     mutable QMutex _viewMutex { QMutex::Recursive };
     ViewFrustum _viewFrustum; // current state of view frustum, perspective, orientation, etc.
-    ViewFrustum _lastQueriedViewFrustum; // last view frustum used to query octree servers
     ViewFrustum _displayViewFrustum;
-    ViewFrustum _secondaryViewFrustum;
+
-    ViewFrustum _lastQueriedSecondaryViewFrustum; // last secondary view frustum used to query octree servers
+    ConicalViewFrustums _conicalViews;
-    bool _hasSecondaryViewFrustum;
+    ConicalViewFrustums _lastQueriedViews; // last views used to query servers
-    quint64 _lastQueriedTime;
+
+    using SteadyClock = std::chrono::steady_clock;
+    using TimePoint = SteadyClock::time_point;
+    TimePoint _queryExpiry;
 
     OctreeQuery _octreeQuery { true }; // NodeData derived class for querying octee cells from octree servers
 

interface/src/AvatarBookmarks.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarBookmarks.h"
+
 #include <QAction>
 #include <QInputDialog>
 #include <QMessageBox>
@@ -27,7 +29,6 @@
 
 #include "MainWindow.h"
 #include "Menu.h"
-#include "AvatarBookmarks.h"
 #include "InterfaceLogging.h"
 
 #include "QVariantGLM.h"

interface/src/Bookmarks.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Bookmarks.h"
+
 #include <QAction>
 #include <QDebug>
 #include <QInputDialog>
@@ -22,8 +24,6 @@
 #include "Menu.h"
 #include "InterfaceLogging.h"
 
-#include "Bookmarks.h"
-
 Bookmarks::Bookmarks() :
 _isMenuSorted(false)
 {

interface/src/DiscoverabilityManager.cpp

@@ -9,7 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DiscoverabilityManager.h"
+
 #include <QtCore/QJsonDocument>
+#include <QThread>
 
 #include <AccountManager.h>
 #include <AddressManager.h>
@@ -21,11 +24,8 @@
 #include <UUID.h>
 
 #include "Crashpad.h"
-#include "DiscoverabilityManager.h"
 #include "Menu.h"
 
-#include <QThread>
-
 const Discoverability::Mode DEFAULT_DISCOVERABILITY_MODE = Discoverability::Connections;
 
 DiscoverabilityManager::DiscoverabilityManager() :

interface/src/DiscoverabilityManager.h

@@ -12,9 +12,13 @@
 #ifndef hifi_DiscoverabilityManager_h
 #define hifi_DiscoverabilityManager_h
 
+#include <QJsonObject>
+
 #include <DependencyManager.h>
 #include <SettingHandle.h>
 
+class QNetworkReply;
+
 namespace Discoverability {
     enum Mode {
         None,

interface/src/GLCanvas.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-// FIXME ordering of headers
-#include "Application.h"
 #include "GLCanvas.h"
 
+#include "Application.h"
+
 bool GLCanvas::event(QEvent* event) {
     if (QEvent::Paint == event->type() && qApp->isAboutToQuit()) {
         return true;

interface/src/InterfaceDynamicFactory.cpp

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-
+#include "InterfaceDynamicFactory.h"
 
 #include <avatar/AvatarActionHold.h>
 #include <avatar/AvatarActionFarGrab.h>
@@ -22,9 +22,6 @@
 #include <ObjectConstraintConeTwist.h>
 #include <LogHandler.h>
 
-#include "InterfaceDynamicFactory.h"
-
-
 EntityDynamicPointer interfaceDynamicFactory(EntityDynamicType type, const QUuid& id, EntityItemPointer ownerEntity) {
     switch (type) {
         case DYNAMIC_TYPE_NONE:

interface/src/InterfaceParentFinder.cpp

@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "InterfaceParentFinder.h"
+
 #include <Application.h>
+#include <AvatarData.h>
+#include <avatar/AvatarManager.h>
 #include <EntityTree.h>
 #include <EntityTreeRenderer.h>
-#include <avatar/AvatarManager.h>
-#include <AvatarData.h>
-
-#include "InterfaceParentFinder.h"
 
 SpatiallyNestableWeakPointer InterfaceParentFinder::find(QUuid parentID, bool& success, SpatialParentTree* entityTree) const {
     SpatiallyNestableWeakPointer parent;

interface/src/LODManager.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LODManager.h"
+
 #include <SettingHandle.h>
 #include <OctreeUtils.h>
 #include <Util.h>
@@ -17,8 +19,6 @@
 #include "ui/DialogsManager.h"
 #include "InterfaceLogging.h"
 
-#include "LODManager.h"
-
 
 Setting::Handle<float> desktopLODDecreaseFPS("desktopLODDecreaseFPS", DEFAULT_DESKTOP_LOD_DOWN_FPS);
 Setting::Handle<float> hmdLODDecreaseFPS("hmdLODDecreaseFPS", DEFAULT_HMD_LOD_DOWN_FPS);

interface/src/LocationBookmarks.cpp

@@ -9,21 +9,16 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LocationBookmarks.h"
+
 #include <QAction>
-#include <QInputDialog>
-#include <QMessageBox>
 #include <QStandardPaths>
 
 #include <AddressManager.h>
-#include <Application.h>
 #include <OffscreenUi.h>
 
-#include "MainWindow.h"
 #include "Menu.h"
 
-#include "LocationBookmarks.h"
-#include <QtQuick/QQuickWindow>
-
 const QString LocationBookmarks::HOME_BOOKMARK = "Home";
 
 LocationBookmarks::LocationBookmarks() {

interface/src/LocationBookmarks.h

@@ -13,6 +13,7 @@
 #define hifi_LocationBookmarks_h
 
 #include <DependencyManager.h>
+
 #include "Bookmarks.h"
 
 class LocationBookmarks : public Bookmarks, public  Dependency  {

interface/src/Menu.cpp

@@ -9,6 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Menu.h"
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QMenuBar>
@@ -54,8 +55,6 @@
 #include "SpeechRecognizer.h"
 #endif
 
-#include "Menu.h"
-
 extern bool DEV_DECIMATE_TEXTURES;
 
 Menu* Menu::getInstance() {

interface/src/ModelPackager.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelPackager.h"
+
 #include <QFile>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -21,8 +23,6 @@
 #include "ModelPropertiesDialog.h"
 #include "InterfaceLogging.h"
 
-#include "ModelPackager.h"
-
 static const int MAX_TEXTURE_SIZE = 1024;
 
 void copyDirectoryContent(QDir& from, QDir& to) {

interface/src/ModelPackager.h

@@ -12,11 +12,15 @@
 #ifndef hifi_ModelPackager_h
 #define hifi_ModelPackager_h
 
+#include <memory>
+
 #include <QFileInfo>
 #include <QVariantHash>
 
 #include "ui/ModelsBrowser.h"
 
+class FBXGeometry;
+
 class ModelPackager : public QObject {
 public:
     static bool package();

interface/src/ModelPropertiesDialog.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelPropertiesDialog.h"
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
@@ -23,8 +25,6 @@
 #include <GLMHelpers.h>
 #include <OffscreenUi.h>
 
-#include "ModelPropertiesDialog.h"
-
 
 ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
                                              const QString& basePath, const FBXGeometry& geometry) :

interface/src/ModelSelector.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelSelector.h"
+
 #include <QDialogButtonBox>
 #include <QComboBox>
 #include <QFileDialog>
@@ -16,8 +18,6 @@
 #include <QPushButton>
 #include <QStandardPaths>
 
-#include "ModelSelector.h"
-
 static const QString AVATAR_HEAD_AND_BODY_STRING = "Avatar Body with Head";
 static const QString AVATAR_ATTACHEMENT_STRING = "Avatar Attachment";
 static const QString ENTITY_MODEL_STRING = "Entity Model";
@@ -82,4 +82,4 @@ void ModelSelector::browse() {
         _browseButton->setText(fileInfo.fileName());
         lastModelBrowseLocation.set(fileInfo.path());
     }
-}
+}

interface/src/SecondaryCamera.cpp

@@ -9,13 +9,16 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Application.h"
 #include "SecondaryCamera.h"
-#include <TextureCache.h>
+
-#include <gpu/Context.h>
-#include <EntityScriptingInterface.h>
 #include <glm/gtx/transform.hpp>
 
+#include <EntityScriptingInterface.h>
+#include <gpu/Context.h>
+#include <TextureCache.h>
+
+#include "Application.h"
+
 using RenderArgsPointer = std::shared_ptr<RenderArgs>;
 
 void MainRenderTask::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs, render::CullFunctor cullFunctor, bool isDeferred) {    
@@ -213,4 +216,4 @@ void SecondaryCameraRenderTask::build(JobModel& task, const render::Varying& inp
         task.addJob<RenderDeferredTask>("RenderDeferredTask", items);
     }
     task.addJob<EndSecondaryCameraFrame>("EndSecondaryCamera", cachedArg);
-}
+}

interface/src/SecondaryCamera.h

@@ -17,6 +17,8 @@
 #include <render/RenderFetchCullSortTask.h>
 #include <RenderDeferredTask.h>
 #include <RenderForwardTask.h>
+#include <TextureCache.h>
+#include <ViewFrustum.h>
 
 class MainRenderTask {
 public:

interface/src/SpeechRecognizer.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "SpeechRecognizer.h"
+
 #include <QtGlobal>
 #include <QDebug>
 
 #include "InterfaceLogging.h"
-#include "SpeechRecognizer.h"
 
 #if defined(Q_OS_WIN)
 

interface/src/SpeechRecognizer.mm

@@ -16,10 +16,10 @@
 #import <AppKit/NSSpeechRecognizer.h>
 #import <AppKit/NSWorkspace.h>
 
-#include <QDebug>
-
 #include "SpeechRecognizer.h"
 
+#include <QDebug>
+
 @interface SpeechRecognizerDelegate : NSObject <NSSpeechRecognizerDelegate> {
     SpeechRecognizer* _listener;
 }

interface/src/UIUtil.cpp

@@ -9,11 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "UIUtil.h"
+
 #include <QStyle>
 #include <QStyleOptionTitleBar>
 
-#include "UIUtil.h"
-
 int UIUtil::getWindowTitleBarHeight(const QWidget* window) {
     QStyleOptionTitleBar options;
     options.titleBarState = 1;

interface/src/audio/AudioScope.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioScope.h"
+
 #include <qvector2d.h>
 #include <limits>
 
@@ -19,8 +21,6 @@
 #include <gpu/Context.h>
 #include <GLMHelpers.h>
 
-#include "AudioScope.h"
-
 static const unsigned int DEFAULT_FRAMES_PER_SCOPE = 5;
 static const unsigned int MULTIPLIER_SCOPE_HEIGHT = 20;
 static const unsigned int SCOPE_HEIGHT = 2 * 15 * MULTIPLIER_SCOPE_HEIGHT;

interface/src/avatar/AvatarManager.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AvatarManager.h"
+
 #include <string>
 
 #include <QScriptEngine>
@@ -35,9 +37,9 @@
 #include <UsersScriptingInterface.h>
 #include <UUID.h>
 #include <avatars-renderer/OtherAvatar.h>
+#include <shared/ConicalViewFrustum.h>
 
 #include "Application.h"
-#include "AvatarManager.h"
 #include "InterfaceLogging.h"
 #include "Menu.h"
 #include "MyAvatar.h"
@@ -156,17 +158,7 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
     };
 
 
-    ViewFrustums views;
+    const auto& views = qApp->getConicalViews();
-
-    ViewFrustum view;
-    qApp->copyCurrentViewFrustum(view);
-    views.push_back(view);
-
-    if (qApp->hasSecondaryViewFrustum()) {
-        qApp->copySecondaryViewFrustum(view);
-        views.push_back(view);
-    }
-
     PrioritySortUtil::PriorityQueue<SortableAvatar> sortedAvatars(views,
             AvatarData::_avatarSortCoefficientSize,
             AvatarData::_avatarSortCoefficientCenter,

interface/src/commerce/Ledger.cpp

@@ -9,16 +9,19 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Ledger.h"
+
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QTimeZone>
 #include <QJsonDocument>
-#include "Wallet.h"
+
-#include "Ledger.h"
-#include "CommerceLogging.h"
 #include <NetworkingConstants.h>
 #include <AddressManager.h>
 
+#include "Wallet.h"
+#include "CommerceLogging.h"
+
 // inventory answers {status: 'success', data: {assets: [{id: "guid", title: "name", preview: "url"}....]}}
 // balance answers {status: 'success', data: {balance: integer}}
 // buy and receive_at answer {status: 'success'}

interface/src/commerce/Wallet.cpp

@@ -9,22 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "CommerceLogging.h"
-#include "Ledger.h"
 #include "Wallet.h"
-#include "Application.h"
-#include "ui/SecurityImageProvider.h"
-#include "scripting/HMDScriptingInterface.h"
-#include <ui/TabletScriptingInterface.h>
-
-#include <PathUtils.h>
-#include <OffscreenUi.h>
-#include <AccountManager.h>
-
-#include <QFile>
-#include <QCryptographicHash>
-#include <QQmlContext>
-#include <QBuffer>
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
@@ -33,7 +18,6 @@
 #include <openssl/evp.h>
 #include <openssl/aes.h>
 #include <openssl/ecdsa.h>
-
 // I know, right?  But per https://www.openssl.org/docs/faq.html
 // this avoids OPENSSL_Uplink(00007FF847238000,08): no OPENSSL_Applink
 // at runtime.
@@ -41,6 +25,22 @@
 #include <openssl/applink.c>
 #endif
 
+#include <QFile>
+#include <QCryptographicHash>
+#include <QQmlContext>
+#include <QBuffer>
+
+#include <PathUtils.h>
+#include <OffscreenUi.h>
+#include <AccountManager.h>
+#include <ui/TabletScriptingInterface.h>
+
+#include "Application.h"
+#include "CommerceLogging.h"
+#include "Ledger.h"
+#include "ui/SecurityImageProvider.h"
+#include "scripting/HMDScriptingInterface.h"
+
 static const char* KEY_FILE = "hifikey";
 static const char* INSTRUCTIONS_FILE = "backup_instructions.html";
 static const char* IMAGE_HEADER = "-----BEGIN SECURITY IMAGE-----\n";

interface/src/networking/CloseEventSender.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "CloseEventSender.h"
+
 #include <QtCore/QDateTime>
 #include <QtCore/QEventLoop>
 #include <QtCore/QJsonDocument>
@@ -22,8 +24,6 @@
 #include <UserActivityLogger.h>
 #include <UUID.h>
 
-#include "CloseEventSender.h"
-
 QNetworkRequest createNetworkRequest() {
 
     QNetworkRequest request;

interface/src/octree/OctreePacketProcessor.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OctreePacketProcessor.h"
+
 #include <PerfStat.h>
 
 #include "Application.h"
 #include "Menu.h"
-#include "OctreePacketProcessor.h"
 #include "SceneScriptingInterface.h"
 
 OctreePacketProcessor::OctreePacketProcessor() {

interface/src/scripting/AccountServicesScriptingInterface.cpp

@@ -9,13 +9,13 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AccountServicesScriptingInterface.h"
+
 #include "AccountManager.h"
 #include "Application.h"
 #include "DiscoverabilityManager.h"
 #include "ResourceCache.h"
 
-#include "AccountServicesScriptingInterface.h"
-
 AccountServicesScriptingInterface::AccountServicesScriptingInterface() {
     auto accountManager = DependencyManager::get<AccountManager>();
     connect(accountManager.data(), &AccountManager::usernameChanged, this, &AccountServicesScriptingInterface::onUsernameChanged);

interface/src/scripting/AccountServicesScriptingInterface.h

@@ -18,6 +18,8 @@
 #include <QScriptValue>
 #include <QString>
 #include <QStringList>
+
+#include <AccountManager.h>
 #include <DiscoverabilityManager.h>
 
 class DownloadInfoResult {

interface/src/scripting/AudioDevices.cpp

@@ -9,18 +9,17 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioDevices.h"
+
 #include <map>
 #include <algorithm>
 
 #include <shared/QtHelpers.h>
 #include <plugins/DisplayPlugin.h>
 
-#include "AudioDevices.h"
-
 #include "Application.h"
 #include "AudioClient.h"
 #include "Audio.h"
-
 #include "UserActivityLogger.h"
 
 using namespace scripting;

interface/src/scripting/GooglePolyScriptingInterface.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "GooglePolyScriptingInterface.h"
+
 #include <QEventLoop>
 #include <QtGlobal>
 #include <QJsonArray>
@@ -20,9 +22,7 @@
 #include <QString>
 #include <QTime>
 #include <QUrl>
-#include <random>
 
-#include "GooglePolyScriptingInterface.h"
 #include "ScriptEngineLogging.h"
 
 const QString LIST_POLY_URL = "https://poly.googleapis.com/v1/assets?";

interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp

@@ -9,13 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LimitlessVoiceRecognitionScriptingInterface.h"
+
 #include <QtConcurrent/QtConcurrentRun>
 
 #include <ThreadHelpers.h>
-#include <src/InterfaceLogging.h>
-#include <src/ui/AvatarInputs.h>
 
-#include "LimitlessVoiceRecognitionScriptingInterface.h"
+#include "InterfaceLogging.h"
+#include "ui/AvatarInputs.h"
 
 const float LimitlessVoiceRecognitionScriptingInterface::_audioLevelThreshold = 0.33f;
 const int LimitlessVoiceRecognitionScriptingInterface::_voiceTimeoutDuration = 2000;

interface/src/ui/DomainConnectionDialog.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "DomainConnectionDialog.h"
+
 #include <QtCore/QMetaEnum>
 #include <QtWidgets/QHBoxLayout>
 #include <QtWidgets/QHeaderView>
@@ -17,8 +19,6 @@
 #include <NodeList.h>
 #include <NumericalConstants.h>
 
-#include "DomainConnectionDialog.h"
-
 DomainConnectionDialog::DomainConnectionDialog(QWidget* parent) :
     QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint)
 {

interface/src/ui/HMDToolsDialog.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "HMDToolsDialog.h"
+
 #include <QDesktopWidget>
 #include <QDialogButtonBox>
 #include <QFormLayout>
@@ -25,8 +27,7 @@
 #include "Application.h"
 #include "MainWindow.h"
 #include "Menu.h"
-#include "ui/DialogsManager.h"
+#include "DialogsManager.h"
-#include "ui/HMDToolsDialog.h"
 
 static const int WIDTH = 350;
 static const int HEIGHT = 100;

interface/src/ui/LodToolsDialog.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "LodToolsDialog.h"
+
 #include <QCheckBox>
 #include <QColor>
 #include <QDialogButtonBox>
@@ -23,7 +25,6 @@
 #include <LODManager.h>
 
 #include "Menu.h"
-#include "ui/LodToolsDialog.h"
 
 
 LodToolsDialog::LodToolsDialog(QWidget* parent) :

interface/src/ui/ModelsBrowser.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelsBrowser.h"
+
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QGridLayout>
@@ -27,8 +29,6 @@
 #include <NetworkAccessManager.h>
 #include <SharedUtil.h>
 
-#include "ModelsBrowser.h"
-
 const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "skeletons", "attachments" };
 
 static const QString S3_URL = "http://s3.amazonaws.com/hifi-public";

interface/src/ui/OctreeStatsDialog.cpp

@@ -9,20 +9,19 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OctreeStatsDialog.h"
+
 #include <sstream>
 
 #include <QFormLayout>
 #include <QDialogButtonBox>
-
 #include <QPalette>
 #include <QColor>
 
 #include <OctreeSceneStats.h>
 
 #include "Application.h"
-
 #include "../octree/OctreePacketProcessor.h"
-#include "ui/OctreeStatsDialog.h"
 
 OctreeStatsDialog::OctreeStatsDialog(QWidget* parent, NodeToOctreeSceneStats* model) :
     QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint),

interface/src/ui/OctreeStatsDialog.h

@@ -19,7 +19,6 @@
 #include <OctreeSceneStats.h>
 
 #define MAX_STATS 100
-#define DEFAULT_COLOR 0
 
 class OctreeStatsDialog : public QDialog {
     Q_OBJECT
@@ -42,7 +41,7 @@ protected:
     // Emits a 'closed' signal when this dialog is closed.
     void closeEvent(QCloseEvent*) override;
 
-    int AddStatItem(const char* caption, unsigned colorRGBA = DEFAULT_COLOR);
+    int AddStatItem(const char* caption, unsigned colorRGBA = 0);
     void RemoveStatItem(int item);
     void showAllOctreeServers();
 

interface/src/ui/OctreeStatsProvider.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "Application.h"
+#include "OctreeStatsProvider.h"
 
-#include "../octree/OctreePacketProcessor.h"
+#include "Application.h"
-#include "ui/OctreeStatsProvider.h"
+#include "octree/OctreePacketProcessor.h"
 
 OctreeStatsProvider::OctreeStatsProvider(QObject* parent, NodeToOctreeSceneStats* model) :
     QObject(parent),

interface/src/ui/OverlayConductor.cpp

@@ -8,13 +8,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "OverlayConductor.h"
+
 #include <OffscreenUi.h>
 #include <display-plugins/CompositorHelper.h>
 
 #include "Application.h"
 #include "avatar/AvatarManager.h"
 #include "InterfaceLogging.h"
-#include "OverlayConductor.h"
 
 OverlayConductor::OverlayConductor() {
 

interface/src/ui/OverlayConductor.h

@@ -11,6 +11,8 @@
 #ifndef hifi_OverlayConductor_h
 #define hifi_OverlayConductor_h
 
+#include <cstdint>
+
 class OverlayConductor {
 public:
     OverlayConductor();
@@ -34,12 +36,12 @@ private:
     bool _hmdMode { false };
 
     // used by updateAvatarHasDriveInput
-    quint64 _desiredDrivingTimer { 0 };
+    uint64_t _desiredDrivingTimer { 0 };
     bool _desiredDriving { false };
     bool _currentDriving { false };
 
     // used by updateAvatarIsAtRest
-    quint64 _desiredAtRestTimer { 0 };
+    uint64_t _desiredAtRestTimer { 0 };
     bool _desiredAtRest { true };
     bool _currentAtRest { true };
 };

interface/src/ui/Snapshot.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "Snapshot.h"
+
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -31,7 +33,6 @@
 #include <SharedUtil.h>
 
 #include "Application.h"
-#include "Snapshot.h"
 #include "SnapshotUploader.h"
 
 // filename format: hifi-snap-by-%username%-on-%date%_%time%_@-%location%.jpg

interface/src/ui/Snapshot.h

@@ -16,6 +16,7 @@
 
 #include <QString>
 #include <QStandardPaths>
+#include <QUrl>
 
 #include <SettingHandle.h>
 #include <DependencyManager.h>

interface/src/ui/SnapshotAnimated.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "SnapshotAnimated.h"
+
 #include <QtCore/QDateTime>
 #include <QtCore/QObject>
 #include <QtCore/QString>
@@ -16,7 +18,6 @@
 #include <QtConcurrent/QtConcurrentRun>
 
 #include <plugins/DisplayPlugin.h>
-#include "SnapshotAnimated.h"
 
 QTimer* SnapshotAnimated::snapshotAnimatedTimer = NULL;
 qint64 SnapshotAnimated::snapshotAnimatedTimestamp = 0;

interface/src/ui/SnapshotUploader.cpp

@@ -9,11 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "SnapshotUploader.h"
+
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>
+
 #include <AddressManager.h>
+
 #include "scripting/WindowScriptingInterface.h"
-#include "SnapshotUploader.h"
 
 SnapshotUploader::SnapshotUploader(QUrl inWorldLocation, QString pathname) :
     _inWorldLocation(inWorldLocation),

interface/src/ui/StandAloneJSConsole.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "StandAloneJSConsole.h"
+
 #include <QMainWindow>
 #include <QDialog>
 #include <QVBoxLayout>
@@ -16,8 +18,6 @@
 #include <Application.h>
 #include <MainWindow.h>
 
-#include "StandAloneJSConsole.h"
-
 void StandAloneJSConsole::toggleConsole()  {
     QMainWindow* mainWindow = qApp->getWindow();
     if (!_jsConsole) {

interface/src/ui/TestingDialog.cpp

@@ -9,10 +9,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ScriptEngines.h"
+#include "TestingDialog.h"
 
-#include "ui/TestingDialog.h"
 #include "Application.h"
+#include "ScriptEngines.h"
 
 TestingDialog::TestingDialog(QWidget* parent) :
     QDialog(parent, Qt::Window | Qt::WindowCloseButtonHint | Qt::WindowStaysOnTopHint),

interface/src/ui/overlays/ModelOverlay.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "ModelOverlay.h"
+
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/transform.hpp>
 
-#include "ModelOverlay.h"
 #include <Rig.h>
 
 #include "Application.h"

libraries/animation/src/AnimClip.cpp

@@ -8,8 +8,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "GLMHelpers.h"
 #include "AnimClip.h"
+
+#include "GLMHelpers.h"
 #include "AnimationLogging.h"
 #include "AnimUtil.h"
 

libraries/animation/src/AnimExpression.cpp

@@ -8,10 +8,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <StreamUtils.h>
+#include "AnimExpression.h"
+
 #include <QRegExp>
 
-#include "AnimExpression.h"
+#include <StreamUtils.h>
+
 #include "AnimationLogging.h"
 
 AnimExpression::AnimExpression(const QString& str) :

libraries/animation/src/AnimNode.cpp

@@ -8,9 +8,10 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <QtGlobal>
 #include "AnimNode.h"
 
+#include <QtGlobal>
+
 AnimNode::Pointer AnimNode::getParent() {
     return _parent.lock();
 }

libraries/animation/src/AnimNodeLoader.cpp

@@ -8,6 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AnimNodeLoader.h"
+
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
@@ -19,7 +21,6 @@
 #include "AnimBlendLinearMove.h"
 #include "AnimationLogging.h"
 #include "AnimOverlay.h"
-#include "AnimNodeLoader.h"
 #include "AnimStateMachine.h"
 #include "AnimManipulator.h"
 #include "AnimInverseKinematics.h"

libraries/animation/src/AnimVariant.cpp

@@ -1,5 +1,5 @@
 //
-//  AnimVariantMap.cpp
+//  AnimVariant.cpp
 //  library/animation
 //
 //  Created by Howard Stearns on 10/15/15.
@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AnimVariant.h" // which has AnimVariant/AnimVariantMap
+
 #include <QScriptEngine>
 #include <QScriptValueIterator>
 #include <QThread>
 #include <RegisteredMetaTypes.h>
-#include "AnimVariant.h" // which has AnimVariant/AnimVariantMap
 
 const AnimVariant AnimVariant::False = AnimVariant();
 

libraries/animation/src/AnimationObject.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AnimationObject.h"
+
 #include <QScriptEngine>
 
 #include "AnimationCache.h"
-#include "AnimationObject.h"
 
 QStringList AnimationObject::getJointNames() const {
     return qscriptvalue_cast<AnimationPointer>(thisObject())->getJointNames();

libraries/audio-client/src/AudioClient.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioClient.h"
+
 #include <cstring>
 #include <math.h>
 #include <sys/stat.h>
@@ -50,8 +52,6 @@
 #include "AudioLogging.h"
 #include "AudioHelpers.h"
 
-#include "AudioClient.h"
-
 const int AudioClient::MIN_BUFFER_FRAMES = 1;
 
 const int AudioClient::MAX_BUFFER_FRAMES = 20;

libraries/audio-client/src/AudioIOStats.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioIOStats.h"
+
 #include <AudioConstants.h>
 #include <MixedProcessedAudioStream.h>
 #include <NodeList.h>
@@ -16,8 +18,6 @@
 
 #include "AudioClient.h"
 
-#include "AudioIOStats.h"
-
 // This is called 1x/sec (see AudioClient) and we want it to log the last 5s
 static const int INPUT_READS_WINDOW = 5;
 static const int INPUT_UNPLAYED_WINDOW = 5;

libraries/audio/src/AudioFOA.cpp

@@ -9,10 +9,11 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioFOA.h"
+
 #include <string.h>
 #include <assert.h>
 
-#include "AudioFOA.h"
 #include "AudioFOAData.h"
 
 #if defined(_MSC_VER)

libraries/audio/src/AudioGate.cpp

@@ -6,12 +6,13 @@
 //  Copyright 2017 High Fidelity, Inc.
 //
 
+#include "AudioGate.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
 
 #include "AudioDynamics.h"
-#include "AudioGate.h"
 
 // log2 domain headroom bits above 0dB (int32_t)
 static const int LOG2_HEADROOM_Q30 = 1;

libraries/audio/src/AudioHRTF.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioHRTF.h"
+
 #include <math.h>
 #include <string.h>
 #include <assert.h>
 
-#include "AudioHRTF.h"
 #include "AudioHRTFData.h"
 
 #if defined(_MSC_VER)

libraries/audio/src/AudioLimiter.cpp

@@ -6,10 +6,11 @@
 //  Copyright 2016 High Fidelity, Inc.
 //
 
+#include "AudioLimiter.h"
+
 #include <assert.h>
 
 #include "AudioDynamics.h"
-#include "AudioLimiter.h"
 
 //
 // Limiter (common)

libraries/audio/src/AudioReverb.cpp

@@ -6,12 +6,12 @@
 //  Copyright 2015 High Fidelity, Inc.
 //
 
+#include "AudioReverb.h"
+
 #include <stdint.h>
 #include <string.h>
 #include <math.h>
 
-#include "AudioReverb.h"
-
 #ifdef _MSC_VER
 #include <intrin.h>
 #define MULHI(a,b)  ((int32_t)(__emul(a, b) >> 32))

libraries/audio/src/AudioRingBuffer.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioRingBuffer.h"
+
 #include <cstdlib>
 #include <cstring>
 #include <functional>
@@ -21,8 +23,6 @@
 
 #include "AudioLogging.h"
 
-#include "AudioRingBuffer.h"
-
 static const QString RING_BUFFER_OVERFLOW_DEBUG { "AudioRingBuffer::writeData has overflown the buffer. Overwriting old data." };
 static const QString DROPPED_SILENT_DEBUG { "AudioRingBuffer::addSilentSamples dropping silent samples to prevent overflow." };
 

libraries/audio/src/AudioSRC.cpp

@@ -9,11 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "AudioSRC.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "AudioSRC.h"
 #include "AudioSRCData.h"
 
 #ifndef MAX

libraries/audio/src/InboundAudioStream.cpp

@@ -9,13 +9,14 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "InboundAudioStream.h"
+
 #include <glm/glm.hpp>
 
 #include <NLPacket.h>
 #include <Node.h>
 #include <NodeList.h>
 
-#include "InboundAudioStream.h"
 #include "AudioLogging.h"
 
 const bool InboundAudioStream::DEFAULT_DYNAMIC_JITTER_BUFFER_ENABLED = true;

libraries/audio/src/InjectedAudioStream.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "InjectedAudioStream.h"
+
 #include <cstring>
 
 #include <QtCore/QDataStream>
@@ -17,7 +19,6 @@
 #include <udt/PacketHeaders.h>
 #include <UUID.h>
 
-#include "InjectedAudioStream.h"
 #include "AudioHelpers.h"
 
 InjectedAudioStream::InjectedAudioStream(const QUuid& streamIdentifier, bool isStereo, int numStaticJitterFrames) :