Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 01:43:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-03-08 15:29:04 -08:00
parent 35d6afbe77
commit 8d4ef28411
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -583,12 +583,16 @@ int OctreeSendThread::packetDistributor(SharedNodePointer node, OctreeQueryNode*
nodeData->updateLastKnownViewFrustum(); nodeData->updateLastKnownViewFrustum();
nodeData->setViewSent(true); nodeData->setViewSent(true);
// If this was a full scene then make sure we really send out a stats packet at this point so that
// the clients will know the scene is stable
if (isFullScene) { if (isFullScene) {
int thisTrueBytesSent = 0; int thisTrueBytesSent = 0;
int thisTruePacketsSent = 0; int thisTruePacketsSent = 0;
nodeData->stats.sceneCompleted(); nodeData->stats.sceneCompleted();
// FIXME - are we accounting for packets sent correctly here????
int packetsJustSent = handlePacketSend(node, nodeData, thisTrueBytesSent, thisTruePacketsSent, true); int packetsJustSent = handlePacketSend(node, nodeData, thisTrueBytesSent, thisTruePacketsSent, true);
_totalBytes += thisTrueBytesSent;
_totalPackets += thisTruePacketsSent;
truePacketsSent += packetsJustSent;
} }
} }

4
libraries/entities/src/EntityTreeElement.cpp
View file

@ -351,9 +351,7 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
} else { } else {
// if the extra data included this entity, and we've decided to not include the entity, then // if the extra data included this entity, and we've decided to not include the entity, then
// we can treat it as if it was completed. // we can treat it as if it was completed.
if (entityTreeElementExtraEncodeData->entities.contains(entity->getEntityItemID())) { entityTreeElementExtraEncodeData->entities.remove(entity->getEntityItemID());
entityTreeElementExtraEncodeData->entities.remove(entity->getEntityItemID());
}
} }
} }
} }