From fb3e74398fd6d733279892d09ce0efa2d67c2be5 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 7 Sep 2017 16:03:20 -0700 Subject: [PATCH] don't invalidate viewFrustum sent to server --- interface/src/Application.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6762217485..60a653fdc9 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5433,6 +5433,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node << perUnknownServer << " to send us jurisdiction."; } + // TODO: remove this hackery: it no longer makes sense for streaming of entities in scene. // set the query's position/orientation to be degenerate in a manner that will get the scene quickly // If there's only one server, then don't do this, and just let the normal voxel query pass through // as expected... this way, we will actually get a valid scene if there is one to be seen @@ -5455,16 +5456,6 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node _octreeQuery.setMaxQueryPacketsPerSecond(0); } - // if asked to forceResend, then set the query's position/orientation to be degenerate in a manner - // that will cause our next query to be guarenteed to be different and the server will resend to us - if (forceResend) { - _octreeQuery.setCameraPosition(glm::vec3(-0.1, -0.1, -0.1)); - const glm::quat OFF_IN_NEGATIVE_SPACE = glm::quat(-0.5, 0, -0.5, 1.0); - _octreeQuery.setCameraOrientation(OFF_IN_NEGATIVE_SPACE); - _octreeQuery.setCameraNearClip(0.1f); - _octreeQuery.setCameraFarClip(0.1f); - } - // encode the query data int packetSize = _octreeQuery.getBroadcastData(reinterpret_cast(queryPacket->getPayload())); queryPacket->setPayloadSize(packetSize);