Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 09:37:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

erase in _entitiesInQueue when pop _sendQueue

Browse source
This commit is contained in:
Andrew Meadows 2017-08-25 11:04:24 -07:00
parent 535d84abc7
commit 6edba6d545
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/entities/EntityTreeSendThread.cpp
View file

@ -143,8 +143,10 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
#endif #endif
_traversal.traverse(TIME_BUDGET); _traversal.traverse(TIME_BUDGET);
uint64_t dt = usecTimestampNow() - startTime; if (_sendQueue.size() > 0) {
std::cout << "adebug traversal complete " << " Q.size = " << _sendQueue.size() << " dt = " << dt << std::endl; // adebug uint64_t dt = usecTimestampNow() - startTime;
std::cout << "adebug traversal complete " << " Q.size = " << _sendQueue.size() << " dt = " << dt << std::endl; // adebug
}
} }
#ifndef SEND_SORTED_ENTITIES #ifndef SEND_SORTED_ENTITIES
@ -416,8 +418,10 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream
++_numEntities; ++_numEntities;
} }
_sendQueue.pop(); _sendQueue.pop();
_entitiesInQueue.erase(entity.get());
} }
if (_sendQueue.empty()) { if (_sendQueue.empty()) {
assert(_entitiesInQueue.empty());
params.stopReason = EncodeBitstreamParams::FINISHED; params.stopReason = EncodeBitstreamParams::FINISHED;
_extraEncodeData->entities.clear(); _extraEncodeData->entities.clear();
} }