Initial code for AC side of Enabling Physics plan

When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.

assignment-client/src/entities/EntityTreeSendThread.cpp

@@ -17,6 +17,8 @@
 
 #include "EntityServer.h"
 
+// Initially just send all items within this distance.
+const float EntityTreeSendThread::INITIAL_RADIUS = 50.0f;
 
 EntityTreeSendThread::EntityTreeSendThread(OctreeServer* myServer, const SharedNodePointer& node) :
     OctreeSendThread(myServer, node)
@@ -112,6 +114,13 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
         int32_t lodLevelOffset = nodeData->getBoundaryLevelAdjust() + (viewFrustumChanged ? LOW_RES_MOVING_ADJUST : NO_BOUNDARY_ADJUST);
         newView.lodScaleFactor = powf(2.0f, lodLevelOffset);
 
+        if (nodeData->wantReportInitialResult() && !newView.viewFrustums.empty()) {
+            auto& mainView = newView.viewFrustums[0];
+            // Force acceptance within INITIAL_RADIUS.
+            mainView.setSimpleRadius(INITIAL_RADIUS);
+            newView.lodScaleFactor = 0.0f;
+        }
+
         startNewTraversal(newView, root);
 
         // When the viewFrustum changed the sort order may be incorrect, so we re-sort

assignment-client/src/entities/EntityTreeSendThread.h

@@ -58,6 +58,8 @@ private:
     int32_t _numEntitiesOffset { 0 };
     uint16_t _numEntities { 0 };
 
+    const static float INITIAL_RADIUS;
+
 private slots:
     void editingEntityPointer(const EntityItemPointer& entity);
     void deletingEntityPointer(EntityItem* entity);

assignment-client/src/octree/OctreeSendThread.cpp

@@ -195,6 +195,7 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
             // actually send it
             OctreeServer::didCallWriteDatagram(this);
             DependencyManager::get<NodeList>()->sendUnreliablePacket(statsPacket, *node);
+            _lastSequenceNumber = (decltype(_lastSequenceNumber)) statsPacket.getSequenceNumber();
         } else {
             // not enough room in the packet, send two packets
 
@@ -211,10 +212,9 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
             //_totalWastedBytes += 0;
             _trueBytesSent += numBytes;
             numPackets++;
+            NLPacket& sentPacket = nodeData->getPacket();
 
             if (debug) {
-                NLPacket& sentPacket = nodeData->getPacket();
-
                 sentPacket.seek(sizeof(OCTREE_PACKET_FLAGS));
 
                 OCTREE_PACKET_SEQUENCE sequence;
@@ -231,9 +231,10 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
 
             // second packet
             OctreeServer::didCallWriteDatagram(this);
-            DependencyManager::get<NodeList>()->sendUnreliablePacket(nodeData->getPacket(), *node);
+            DependencyManager::get<NodeList>()->sendUnreliablePacket(sentPacket, *node);
+            _lastSequenceNumber = (decltype(_lastSequenceNumber)) sentPacket.getSequenceNumber();
 
-            numBytes = nodeData->getPacket().getDataSize();
+            numBytes = sentPacket.getDataSize();
             _totalBytes += numBytes;
             _totalPackets++;
             // we count wasted bytes here because we were unable to fit the stats packet
@@ -243,8 +244,6 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
             numPackets++;
 
             if (debug) {
-                NLPacket& sentPacket = nodeData->getPacket();
-
                 sentPacket.seek(sizeof(OCTREE_PACKET_FLAGS));
 
                 OCTREE_PACKET_SEQUENCE sequence;
@@ -265,9 +264,11 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
         if (nodeData->isPacketWaiting() && !nodeData->isShuttingDown()) {
             // just send the octree packet
             OctreeServer::didCallWriteDatagram(this);
-            DependencyManager::get<NodeList>()->sendUnreliablePacket(nodeData->getPacket(), *node);
+            NLPacket& sentPacket = nodeData->getPacket();
+            DependencyManager::get<NodeList>()->sendUnreliablePacket(sentPacket, *node);
+            _lastSequenceNumber = (decltype(_lastSequenceNumber)) sentPacket.getSequenceNumber();
 
-            int numBytes = nodeData->getPacket().getDataSize();
+            int numBytes = sentPacket.getDataSize();
             _totalBytes += numBytes;
             _totalPackets++;
             int thisWastedBytes = udt::MAX_PACKET_SIZE - numBytes;
@@ -276,8 +277,6 @@ int OctreeSendThread::handlePacketSend(SharedNodePointer node, OctreeQueryNode*
             _trueBytesSent += numBytes;
 
             if (debug) {
-                NLPacket& sentPacket = nodeData->getPacket();
-
                 sentPacket.seek(sizeof(OCTREE_PACKET_FLAGS));
 
                 OCTREE_PACKET_SEQUENCE sequence;
@@ -512,6 +511,17 @@ void OctreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, Octre
         OctreeServer::trackInsideTime((float)(usecTimestampNow() - startInside));
     }
 
+    if (params.stopReason == EncodeBitstreamParams::FINISHED && nodeData->wantReportInitialResult()) {
+        // Dealt with nearby entities.
+        nodeData->setReportInitialResult(false);
+
+        // send EntityQueryInitialResultsComplete reliable packet ...
+        auto initialCompletion = NLPacket::create(PacketType::EntityQueryInitialResultsComplete, -1, true);
+        QDataStream initialCompletionStream(initialCompletion.get());
+        initialCompletionStream << _lastSequenceNumber;
+        DependencyManager::get<NodeList>()->sendPacket(std::move(initialCompletion), *node.data());
+    }
+
     if (somethingToSend && _myServer->wantsVerboseDebug()) {
         qCDebug(octree) << "Hit PPS Limit, packetsSentThisInterval =" << _packetsSentThisInterval
                         << "  maxPacketsPerInterval = " << maxPacketsPerInterval

assignment-client/src/octree/OctreeSendThread.h

@@ -60,6 +60,7 @@ protected:
     QWeakPointer<Node> _node;
     OctreeServer* _myServer { nullptr };
     QUuid _nodeUuid;
+    udt::SequenceNumber::Type _lastSequenceNumber { 0 };
     
 private:
     /// Called before a packetDistributor pass to allow for pre-distribution processing

interface/src/Application.cpp

@@ -6134,6 +6134,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType) {
     auto lodManager = DependencyManager::get<LODManager>();
     _octreeQuery.setOctreeSizeScale(lodManager->getOctreeSizeScale());
     _octreeQuery.setBoundaryLevelAdjust(lodManager->getBoundaryLevelAdjust());
+    _octreeQuery.setReportInitialResult(true);
 
     auto nodeList = DependencyManager::get<NodeList>();
 

libraries/networking/src/udt/PacketHeaders.cpp

@@ -95,7 +95,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::AvatarIdentityRequest:
             return 22;
         default:
-            return 21;
+            return 22;
     }
 }
 

libraries/networking/src/udt/PacketHeaders.h

@@ -126,6 +126,7 @@ public:
         EntityScriptCallMethod,
         ChallengeOwnershipRequest,
         ChallengeOwnershipReply,
+        EntityQueryInitialResultsComplete,
 
         OctreeDataFileRequest,
         OctreeDataFileReply,

libraries/octree/src/OctreeQuery.cpp

@@ -27,6 +27,10 @@ OctreeQuery::OctreeQuery(bool randomizeConnectionID) {
     }
 }
 
+const OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, int rhs) {
+    return lhs = OctreeQuery::OctreeQueryFlags(lhs | rhs);
+}
+
 int OctreeQuery::getBroadcastData(unsigned char* destinationBuffer) {
     unsigned char* bufferStart = destinationBuffer;
 
@@ -77,6 +81,11 @@ int OctreeQuery::getBroadcastData(unsigned char* destinationBuffer) {
         destinationBuffer += binaryParametersBytes;
     }
 
+    OctreeQueryFlags queryFlags { NoFlags };
+    queryFlags |= (_reportInitialResult ? OctreeQuery::WantInitialResult : 0);
+    memcpy(destinationBuffer, &queryFlags, sizeof(queryFlags));
+    destinationBuffer += sizeof(queryFlags);
+
     return destinationBuffer - bufferStart;
 }
 
@@ -151,5 +160,11 @@ int OctreeQuery::parseData(ReceivedMessage& message) {
         _jsonParameters = newJsonDocument.object();
     }
 
+    OctreeQueryFlags queryFlags;
+    memcpy(&queryFlags, sourceBuffer, sizeof(queryFlags));
+    sourceBuffer += sizeof(queryFlags);
+
+    _reportInitialResult = bool(queryFlags & OctreeQueryFlags::WantInitialResult);
+
     return sourceBuffer - startPosition;
 }

libraries/octree/src/OctreeQuery.h

@@ -52,6 +52,10 @@ public:
 
     bool hasReceivedFirstQuery() const  { return _hasReceivedFirstQuery; }
 
+    // Want a report when the initial query is complete.
+    bool wantReportInitialResult() const { return _reportInitialResult; }
+    void setReportInitialResult(bool reportInitialResult) { _reportInitialResult = reportInitialResult; }
+
 signals:
     void incomingConnectionIDChanged();
 
@@ -74,7 +78,11 @@ protected:
     QJsonObject _jsonParameters;
     QReadWriteLock _jsonParametersLock;
     
+    enum OctreeQueryFlags : uint16_t { NoFlags = 0x0, WantInitialResult = 0x1 };
+    friend const OctreeQuery::OctreeQueryFlags operator|=(OctreeQuery::OctreeQueryFlags& lhs, const int rhs);
+
     bool _hasReceivedFirstQuery { false };
+    bool _reportInitialResult { false };
 };
 
 #endif // hifi_OctreeQuery_h

libraries/shared/src/shared/ConicalViewFrustum.cpp

@@ -144,3 +144,8 @@ int ConicalViewFrustum::deserialize(const unsigned char* sourceBuffer) {
 
     return sourceBuffer - startPosition;
 }
+
+void ConicalViewFrustum::setSimpleRadius(float radius) {
+    _radius = radius;
+    _farClip = radius / 2.0f;
+}

libraries/shared/src/shared/ConicalViewFrustum.h

@@ -54,6 +54,9 @@ public:
     int serialize(unsigned char* destinationBuffer) const;
     int deserialize(const unsigned char* sourceBuffer);
 
+    // Just test for within radius.
+    void setSimpleRadius(float radius);
+
 private:
     glm::vec3 _position { 0.0f, 0.0f, 0.0f };
     glm::vec3 _direction { 0.0f, 0.0f, 1.0f };

tools/dissectors/1-hfudt.lua

@@ -86,12 +86,12 @@ local packet_types = {
   [22] = "ICEServerPeerInformation",
   [23] = "ICEServerQuery",
   [24] = "OctreeStats",
-  [25] = "Jurisdiction",
+  [25] = "UNUSED_PACKET_TYPE_1",
   [26] = "AvatarIdentityRequest",
   [27] = "AssignmentClientStatus",
   [28] = "NoisyMute",
   [29] = "AvatarIdentity",
-  [30] = "AvatarBillboard",
+  [30] = "NodeIgnoreRequest",
   [31] = "DomainConnectRequest",
   [32] = "DomainServerRequireDTLS",
   [33] = "NodeJsonStats",
@@ -115,7 +115,52 @@ local packet_types = {
   [51] = "AssetUpload",
   [52] = "AssetUploadReply",
   [53] = "AssetGetInfo",
-  [54] = "AssetGetInfoReply"
+  [54] = "AssetGetInfoReply",
+  [55] = "DomainDisconnectRequest",
+  [56] = "DomainServerRemovedNode",
+  [57] = "MessagesData",
+  [58] = "MessagesSubscribe",
+  [59] = "MessagesUnsubscribe",
+  [60] = "ICEServerHeartbeatDenied",
+  [61] = "AssetMappingOperation",
+  [62] = "AssetMappingOperationReply",
+  [63] = "ICEServerHeartbeatACK",
+  [64] = "NegotiateAudioFormat",
+  [65] = "SelectedAudioFormat",
+  [66] = "MoreEntityShapes",
+  [67] = "NodeKickRequest",
+  [68] = "NodeMuteRequest",
+  [69] = "RadiusIgnoreRequest",
+  [70] = "UsernameFromIDRequest",
+  [71] = "UsernameFromIDReply",
+  [72] = "AvatarQuery",
+  [73] = "RequestsDomainListData",
+  [74] = "PerAvatarGainSet",
+  [75] = "EntityScriptGetStatus",
+  [76] = "EntityScriptGetStatusReply",
+  [77] = "ReloadEntityServerScript",
+  [78] = "EntityPhysics",
+  [79] = "EntityServerScriptLog",
+  [80] = "AdjustAvatarSorting",
+  [81] = "OctreeFileReplacement",
+  [82] = "CollisionEventChanges",
+  [83] = "ReplicatedMicrophoneAudioNoEcho",
+  [84] = "ReplicatedMicrophoneAudioWithEcho",
+  [85] = "ReplicatedInjectAudio",
+  [86] = "ReplicatedSilentAudioFrame",
+  [87] = "ReplicatedAvatarIdentity",
+  [88] = "ReplicatedKillAvatar",
+  [89] = "ReplicatedBulkAvatarData",
+  [90] = "DomainContentReplacementFromUrl",
+  [91] = "ChallengeOwnership",
+  [92] = "EntityScriptCallMethod",
+  [93] = "ChallengeOwnershipRequest",
+  [94] = "ChallengeOwnershipReply",
+  [95] = "EntityQueryInitialResultsComplete",
+  [96] = "OctreeDataFileRequest",
+  [97] = "OctreeDataFileReply",
+  [98] = "OctreeDataPersist",
+  [99] = "EntityClone"
 }
 
 local unsourced_packet_types = {