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

fix a couple of missing-parent bugs

Browse source
This commit is contained in:
Seth Alves 2015-12-16 10:09:46 -08:00
parent b55596689f
commit 45d19167c9
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/entities/AssignmentParentFinder.cpp
View file

@ -15,10 +15,9 @@ SpatiallyNestableWeakPointer AssignmentParentFinder::find(QUuid parentID, bool&
SpatiallyNestableWeakPointer parent; SpatiallyNestableWeakPointer parent;
// search entities // search entities
parent = _tree->findEntityByEntityItemID(parentID); parent = _tree->findEntityByEntityItemID(parentID);
if (parent.lock()) { if (parent.expired()) {
success = true;
} else {
success = false; success = false;
} }
success = true;
return parent; return parent;
} }

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

@ -1254,6 +1254,8 @@ const AABox& EntityItem::getAABox(bool& success) const {
_cachedAABox = AABox(rotatedExtentsRelativeToRegistrationPoint); _cachedAABox = AABox(rotatedExtentsRelativeToRegistrationPoint);
_recalcAABox = false; _recalcAABox = false;
} }
} else {
success = true;
} }
return _cachedAABox; return _cachedAABox;
} }

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

@ -240,8 +240,8 @@ bool EntityTree::updateEntityWithElement(EntityItemPointer entity, const EntityI
bool success; bool success;
AACube queryCube = childEntity->getQueryAACube(success); AACube queryCube = childEntity->getQueryAACube(success);
if (!success) { if (!success) {
qCDebug(entities) << "Can't update child -- failed to get query-cube for" << childEntity->getID(); _missingParent.append(childEntity);
// XXX put on a list for later checking? continue;
} }
UpdateEntityOperator theChildOperator(getThisPointer(), containingElement, childEntity, queryCube); UpdateEntityOperator theChildOperator(getThisPointer(), containingElement, childEntity, queryCube);