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

don't apply clock-skew to a lastEdited of 0

Browse source
This commit is contained in:
Seth Alves 2016-02-08 15:31:32 -08:00
parent e2098038f1
commit 82fcfc1d64
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityItem.cpp
View file

@ -470,7 +470,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
Q_ASSERT(parser.offset() == (unsigned int) bytesRead); Q_ASSERT(parser.offset() == (unsigned int) bytesRead);
} }
#endif #endif
quint64 lastEditedFromBufferAdjusted = lastEditedFromBuffer - clockSkew; quint64 lastEditedFromBufferAdjusted = lastEditedFromBuffer == 0 ? 0 : lastEditedFromBuffer - clockSkew;
if (lastEditedFromBufferAdjusted > now) { if (lastEditedFromBufferAdjusted > now) {
lastEditedFromBufferAdjusted = now; lastEditedFromBufferAdjusted = now;
} }

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

@ -459,6 +459,7 @@ bool EntityTreeElement::bestFitEntityBounds(EntityItemPointer entity) const {
bool success; bool success;
auto queryCube = entity->getQueryAACube(success); auto queryCube = entity->getQueryAACube(success);
if (!success) { if (!success) {
qDebug() << "EntityTreeElement::bestFitEntityBounds couldn't get queryCube for" << entity->getName() << entity->getID();
return false; return false;
} }
return bestFitBounds(queryCube); return bestFitBounds(queryCube);
@ -904,6 +905,8 @@ int EntityTreeElement::readElementDataFromBuffer(const unsigned char* data, int
_myTree->entityChanged(entityItem); _myTree->entityChanged(entityItem);
} }
bool bestFitAfter = bestFitEntityBounds(entityItem); bool bestFitAfter = bestFitEntityBounds(entityItem);
qDebug() << "got update for" << entityItem->getName() << bestFitBefore << bestFitAfter <<
entityItem->getQueryAACube();
if (bestFitBefore != bestFitAfter) { if (bestFitBefore != bestFitAfter) {
// This is the case where the entity existed, and is in some element in our tree... // This is the case where the entity existed, and is in some element in our tree...