History

add state to entity tree send thread

SamGondelman committed 9 years ago

Commit 6c066601 parent 247764b4 files · +61 −31Browse files

Showing the changes to assignment-client/src/entities/EntityTreeSendThread.cpp (1 of 4 files). Show all

Unified · Split

assignment-client/src/entities/EntityTreeSendThread.cpp+48−30
@@ -19,6 +19,12 @@ · 18 unmodified lines
1919
2020 #define SEND_SORTED_ENTITIES
2121
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+
2228 void EntityTreeSendThread::preDistributionProcessing() {
2329 auto node = _node.toStrongRef();
2430 auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData());
@@ -151,12 +157,14 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O · 126 unmodified lines
151157
152158 #ifndef SEND_SORTED_ENTITIES
153159 if (!_sendQueue.empty()) {
160+ uint64_t sendTime = usecTimestampNow();
154161 // print what needs to be sent
155162 while (!_sendQueue.empty()) {
156163 PrioritizedEntity entry = _sendQueue.top();
157164 EntityItemPointer entity = entry.getEntity();
158165 if (entity) {
159166 std::cout << "adebug send '" << entity->getName().toStdString() << "'" << " : " << entry.getPriority() << std::endl; // adebug
167+ _knownState[entity] = sendTime;
160168 }
161169 _sendQueue.pop();
162170 _entitiesInQueue.erase(entry.getRawEntityPointer());
@@ -234,6 +242,8 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 71 unmodified lines
234242 switch (type) {
235243 case DiffTraversal::First:
236244 _traversal.setScanCallback([&] (DiffTraversal::VisibleElement& next) {
245+ // When we get to a First traversal, clear the _knownState
246+ _knownState.clear();
237247 next.element->forEachEntity([&](EntityItemPointer entity) {
238248 // Bail early if we've already checked this entity this frame
239249 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
@@ -280,7 +290,8 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 40 unmodified lines
280290 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
281291 return;
282292 }
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()])) {
284295 bool success = false;
285296 AACube cube = entity->getQueryAACube(success);
286297 if (success) {
@@ -319,42 +330,44 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 32 unmodified lines
319330 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
320331 return;
321332 }
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)) {
347348 float priority = _conicalView.computePriority(cube);
348349 _sendQueue.push(PrioritizedEntity(entity, priority));
349350 _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+ }
350363 }
351364 }
352365 }
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());
353370 }
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());
358371 }
359372 });
360373 }
@@ -402,11 +415,13 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream · 41 unmodified lines
402415 }
403416
404417 LevelDetails entitiesLevel = _packetData.startLevel();
418+ uint64_t sendTime = usecTimestampNow();
405419 while(!_sendQueue.empty()) {
406420 PrioritizedEntity queuedItem = _sendQueue.top();
407421 EntityItemPointer entity = queuedItem.getEntity();
408422 if (entity) {
409423 OctreeElement::AppendState appendEntityState = entity->appendEntityData(&_packetData, params, _extraEncodeData);
424+ _knownState[entity.get()] = sendTime;
410425
411426 if (appendEntityState != OctreeElement::COMPLETED) {
412427 if (appendEntityState == OctreeElement::PARTIAL) {
@@ -439,3 +454,6 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream · 26 unmodified lines
439454 #endif // SEND_SORTED_ENTITIES
440455 }
441456
457+void EntityTreeSendThread::deletingEntityPointer(EntityItem* entity) {
458+ _knownState.erase(entity);
459+}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t