Showing the changes to assignment-client/src/entities/EntityTreeSendThread.cpp (1 of 4 files). Show all
Unified · Split
| @@ -19,6 +19,12 @@ · 18 unmodified lines | ||
| 19 | 19 | |
| 20 | 20 | #define SEND_SORTED_ENTITIES |
| 21 | 21 | |
| 22 | +EntityTreeSendThread::EntityTreeSendThread(OctreeServer* myServer, const SharedNodePointer& node) : | |
| 23 | + OctreeSendThread(myServer, node) | |
| 24 | +{ | |
| 25 | + connect(std::static_pointer_cast<EntityTree>(myServer->getOctree()).get(), &EntityTree::deletingEntityPointer, this, &EntityTreeSendThread::deletingEntityPointer, Qt::QueuedConnection); | |
| 26 | +} | |
| 27 | + | |
| 22 | 28 | void EntityTreeSendThread::preDistributionProcessing() { |
| 23 | 29 | auto node = _node.toStrongRef(); |
| 24 | 30 | auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData()); |
| @@ -151,12 +157,14 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O · 126 unmodified lines | ||
| 151 | 157 | |
| 152 | 158 | #ifndef SEND_SORTED_ENTITIES |
| 153 | 159 | if (!_sendQueue.empty()) { |
| 160 | + uint64_t sendTime = usecTimestampNow(); | |
| 154 | 161 | // print what needs to be sent |
| 155 | 162 | while (!_sendQueue.empty()) { |
| 156 | 163 | PrioritizedEntity entry = _sendQueue.top(); |
| 157 | 164 | EntityItemPointer entity = entry.getEntity(); |
| 158 | 165 | if (entity) { |
| 159 | 166 | std::cout << "adebug send '" << entity->getName().toStdString() << "'" << " : " << entry.getPriority() << std::endl; // adebug |
| 167 | + _knownState[entity] = sendTime; | |
| 160 | 168 | } |
| 161 | 169 | _sendQueue.pop(); |
| 162 | 170 | _entitiesInQueue.erase(entry.getRawEntityPointer()); |
| @@ -234,6 +242,8 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 71 unmodified lines | ||
| 234 | 242 | switch (type) { |
| 235 | 243 | case DiffTraversal::First: |
| 236 | 244 | _traversal.setScanCallback([&] (DiffTraversal::VisibleElement& next) { |
| 245 | + // When we get to a First traversal, clear the _knownState | |
| 246 | + _knownState.clear(); | |
| 237 | 247 | next.element->forEachEntity([&](EntityItemPointer entity) { |
| 238 | 248 | // Bail early if we've already checked this entity this frame |
| 239 | 249 | if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) { |
| @@ -280,7 +290,8 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 40 unmodified lines | ||
| 280 | 290 | if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) { |
| 281 | 291 | return; |
| 282 | 292 | } |
| 283 | − if (entity->getLastEdited() > startOfCompletedTraversal) { | |
| 293 | + if (_knownState.find(entity.get()) == _knownState.end() || | |
| 294 | + (_knownState.find(entity.get()) != _knownState.end() && entity->getLastEdited() > _knownState[entity.get()])) { | |
| 284 | 295 | bool success = false; |
| 285 | 296 | AACube cube = entity->getQueryAACube(success); |
| 286 | 297 | if (success) { |
| @@ -319,42 +330,44 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 32 unmodified lines | ||
| 319 | 330 | if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) { |
| 320 | 331 | return; |
| 321 | 332 | } |
| 322 | − bool success = false; | |
| 323 | − AACube cube = entity->getQueryAACube(success); | |
| 324 | − if (success) { | |
| 325 | − if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) { | |
| 326 | − // See the DiffTraversal::First case for an explanation of the "entity is too small" check | |
| 327 | − float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), | |
| 328 | − cube, | |
| 329 | − _traversal.getCurrentRootSizeScale(), | |
| 330 | − _traversal.getCurrentLODOffset()); | |
| 331 | − | |
| 332 | − // Only send entities if they are large enough to see | |
| 333 | − if (renderAccuracy > 0.0f) { | |
| 334 | − if (entity->getLastEdited() > startOfCompletedTraversal || | |
| 335 | − !_traversal.getCompletedView().cubeIntersectsKeyhole(cube)) { | |
| 336 | − float priority = _conicalView.computePriority(cube); | |
| 337 | − _sendQueue.push(PrioritizedEntity(entity, priority)); | |
| 338 | − _entitiesInQueue.insert(entity.get()); | |
| 339 | − } else { | |
| 340 | − // If this entity was skipped last time because it was too small, we still need to send it | |
| 341 | − float lastRenderAccuracy = calculateRenderAccuracy(_traversal.getCompletedView().getPosition(), | |
| 342 | − cube, | |
| 343 | − _traversal.getCompletedRootSizeScale(), | |
| 344 | − _traversal.getCompletedLODOffset()); | |
| 345 | − | |
| 346 | − if (lastRenderAccuracy <= 0.0f) { | |
| 333 | + if (_knownState.find(entity.get()) == _knownState.end() || | |
| 334 | + (_knownState.find(entity.get()) != _knownState.end() && entity->getLastEdited() > _knownState[entity.get()])) { | |
| 335 | + bool success = false; | |
| 336 | + AACube cube = entity->getQueryAACube(success); | |
| 337 | + if (success) { | |
| 338 | + if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) { | |
| 339 | + // See the DiffTraversal::First case for an explanation of the "entity is too small" check | |
| 340 | + float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), | |
| 341 | + cube, | |
| 342 | + _traversal.getCurrentRootSizeScale(), | |
| 343 | + _traversal.getCurrentLODOffset()); | |
| 344 | + | |
| 345 | + // Only send entities if they are large enough to see | |
| 346 | + if (renderAccuracy > 0.0f) { | |
| 347 | + if (!_traversal.getCompletedView().cubeIntersectsKeyhole(cube)) { | |
| 347 | 348 | float priority = _conicalView.computePriority(cube); |
| 348 | 349 | _sendQueue.push(PrioritizedEntity(entity, priority)); |
| 349 | 350 | _entitiesInQueue.insert(entity.get()); |
| 351 | + } else { | |
| 352 | + // If this entity was skipped last time because it was too small, we still need to send it | |
| 353 | + float lastRenderAccuracy = calculateRenderAccuracy(_traversal.getCompletedView().getPosition(), | |
| 354 | + cube, | |
| 355 | + _traversal.getCompletedRootSizeScale(), | |
| 356 | + _traversal.getCompletedLODOffset()); | |
| 357 | + | |
| 358 | + if (lastRenderAccuracy <= 0.0f) { | |
| 359 | + float priority = _conicalView.computePriority(cube); | |
| 360 | + _sendQueue.push(PrioritizedEntity(entity, priority)); | |
| 361 | + _entitiesInQueue.insert(entity.get()); | |
| 362 | + } | |
| 350 | 363 | } |
| 351 | 364 | } |
| 352 | 365 | } |
| 366 | + } else { | |
| 367 | + const float WHEN_IN_DOUBT_PRIORITY = 1.0f; | |
| 368 | + _sendQueue.push(PrioritizedEntity(entity, WHEN_IN_DOUBT_PRIORITY)); | |
| 369 | + _entitiesInQueue.insert(entity.get()); | |
| 353 | 370 | } |
| 354 | − } else { | |
| 355 | − const float WHEN_IN_DOUBT_PRIORITY = 1.0f; | |
| 356 | − _sendQueue.push(PrioritizedEntity(entity, WHEN_IN_DOUBT_PRIORITY)); | |
| 357 | − _entitiesInQueue.insert(entity.get()); | |
| 358 | 371 | } |
| 359 | 372 | }); |
| 360 | 373 | } |
| @@ -402,11 +415,13 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream · 41 unmodified lines | ||
| 402 | 415 | } |
| 403 | 416 | |
| 404 | 417 | LevelDetails entitiesLevel = _packetData.startLevel(); |
| 418 | + uint64_t sendTime = usecTimestampNow(); | |
| 405 | 419 | while(!_sendQueue.empty()) { |
| 406 | 420 | PrioritizedEntity queuedItem = _sendQueue.top(); |
| 407 | 421 | EntityItemPointer entity = queuedItem.getEntity(); |
| 408 | 422 | if (entity) { |
| 409 | 423 | OctreeElement::AppendState appendEntityState = entity->appendEntityData(&_packetData, params, _extraEncodeData); |
| 424 | + _knownState[entity.get()] = sendTime; | |
| 410 | 425 | |
| 411 | 426 | if (appendEntityState != OctreeElement::COMPLETED) { |
| 412 | 427 | if (appendEntityState == OctreeElement::PARTIAL) { |
| @@ -439,3 +454,6 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream · 26 unmodified lines | ||
| 439 | 454 | #endif // SEND_SORTED_ENTITIES |
| 440 | 455 | } |
| 441 | 456 | |
| 457 | +void EntityTreeSendThread::deletingEntityPointer(EntityItem* entity) { | |
| 458 | + _knownState.erase(entity); | |
| 459 | +} | |