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
19 19
20#define SEND_SORTED_ENTITIES20#define SEND_SORTED_ENTITIES
21 21
22EntityTreeSendThread::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
22void EntityTreeSendThread::preDistributionProcessing() {28void EntityTreeSendThread::preDistributionProcessing() {
23 auto node = _node.toStrongRef();29 auto node = _node.toStrongRef();
24 auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData());30 auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData());
@@ -151,12 +157,14 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O · 126 unmodified lines
151 157
152#ifndef SEND_SORTED_ENTITIES158#ifndef SEND_SORTED_ENTITIES
153 if (!_sendQueue.empty()) {159 if (!_sendQueue.empty()) {
160 uint64_t sendTime = usecTimestampNow();
154 // print what needs to be sent161 // print what needs to be sent
155 while (!_sendQueue.empty()) {162 while (!_sendQueue.empty()) {
156 PrioritizedEntity entry = _sendQueue.top();163 PrioritizedEntity entry = _sendQueue.top();
157 EntityItemPointer entity = entry.getEntity();164 EntityItemPointer entity = entry.getEntity();
158 if (entity) {165 if (entity) {
159 std::cout << "adebug send '" << entity->getName().toStdString() << "'" << " : " << entry.getPriority() << std::endl; // adebug166 std::cout << "adebug send '" << entity->getName().toStdString() << "'" << " : " << entry.getPriority() << std::endl; // adebug
167 _knownState[entity] = sendTime;
160 }168 }
161 _sendQueue.pop();169 _sendQueue.pop();
162 _entitiesInQueue.erase(entry.getRawEntityPointer());170 _entitiesInQueue.erase(entry.getRawEntityPointer());
@@ -234,6 +242,8 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 71 unmodified lines
234 switch (type) {242 switch (type) {
235 case DiffTraversal::First:243 case DiffTraversal::First:
236 _traversal.setScanCallback([&] (DiffTraversal::VisibleElement& next) {244 _traversal.setScanCallback([&] (DiffTraversal::VisibleElement& next) {
245 // When we get to a First traversal, clear the _knownState
246 _knownState.clear();
237 next.element->forEachEntity([&](EntityItemPointer entity) {247 next.element->forEachEntity([&](EntityItemPointer entity) {
238 // Bail early if we've already checked this entity this frame248 // Bail early if we've already checked this entity this frame
239 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {249 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
@@ -280,7 +290,8 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 40 unmodified lines
280 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {290 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
281 return;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 bool success = false;295 bool success = false;
285 AACube cube = entity->getQueryAACube(success);296 AACube cube = entity->getQueryAACube(success);
286 if (success) {297 if (success) {
@@ -319,42 +330,44 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 32 unmodified lines
319 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {330 if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
320 return;331 return;
321 }332 }
322 bool success = false;333 if (_knownState.find(entity.get()) == _knownState.end() ||
323 AACube cube = entity->getQueryAACube(success);334 (_knownState.find(entity.get()) != _knownState.end() && entity->getLastEdited() > _knownState[entity.get()])) {
324 if (success) {335 bool success = false;
325 if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {336 AACube cube = entity->getQueryAACube(success);
326 // See the DiffTraversal::First case for an explanation of the "entity is too small" check337 if (success) {
327 float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(),338 if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {
328 cube,339 // See the DiffTraversal::First case for an explanation of the "entity is too small" check
329 _traversal.getCurrentRootSizeScale(),340 float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(),
330 _traversal.getCurrentLODOffset());341 cube,
331 342 _traversal.getCurrentRootSizeScale(),
332 // Only send entities if they are large enough to see343 _traversal.getCurrentLODOffset());
333 if (renderAccuracy > 0.0f) {344
334 if (entity->getLastEdited() > startOfCompletedTraversal ||345 // Only send entities if they are large enough to see
335 !_traversal.getCompletedView().cubeIntersectsKeyhole(cube)) {346 if (renderAccuracy > 0.0f) {
336 float priority = _conicalView.computePriority(cube);347 if (!_traversal.getCompletedView().cubeIntersectsKeyhole(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) {
347 float priority = _conicalView.computePriority(cube);348 float priority = _conicalView.computePriority(cube);
348 _sendQueue.push(PrioritizedEntity(entity, priority));349 _sendQueue.push(PrioritizedEntity(entity, priority));
349 _entitiesInQueue.insert(entity.get());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 LevelDetails entitiesLevel = _packetData.startLevel();417 LevelDetails entitiesLevel = _packetData.startLevel();
418 uint64_t sendTime = usecTimestampNow();
405 while(!_sendQueue.empty()) {419 while(!_sendQueue.empty()) {
406 PrioritizedEntity queuedItem = _sendQueue.top();420 PrioritizedEntity queuedItem = _sendQueue.top();
407 EntityItemPointer entity = queuedItem.getEntity();421 EntityItemPointer entity = queuedItem.getEntity();
408 if (entity) {422 if (entity) {
409 OctreeElement::AppendState appendEntityState = entity->appendEntityData(&_packetData, params, _extraEncodeData);423 OctreeElement::AppendState appendEntityState = entity->appendEntityData(&_packetData, params, _extraEncodeData);
424 _knownState[entity.get()] = sendTime;
410 425
411 if (appendEntityState != OctreeElement::COMPLETED) {426 if (appendEntityState != OctreeElement::COMPLETED) {
412 if (appendEntityState == OctreeElement::PARTIAL) {427 if (appendEntityState == OctreeElement::PARTIAL) {
@@ -439,3 +454,6 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream · 26 unmodified lines
439#endif // SEND_SORTED_ENTITIES454#endif // SEND_SORTED_ENTITIES
440}455}
441 456
457void 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