Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanups

Browse source
This commit is contained in:
Seth Alves 2016-02-10 18:32:05 -08:00
parent ecf22cd8b8
commit 3fe01ccf10
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -314,9 +314,9 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
// before we consider including it. // before we consider including it.
if (includeThisEntity) { if (includeThisEntity) {
success = true; success = true;
// we can't cull a parent-entity by it's dimensions because the child may be larger. we need to // we can't cull a parent-entity by its dimensions because the child may be larger. we need to
// avoid sending details about a child but not the parent. the parent's queryAACube should have // avoid sending details about a child but not the parent. the parent's queryAACube should have
// been adjusted to encompase the queryAACube of the child. // been adjusted to encompass the queryAACube of the child.
AABox entityBounds = entity->hasChildren() ? AABox(entityCube) : entity->getAABox(success); AABox entityBounds = entity->hasChildren() ? AABox(entityCube) : entity->getAABox(success);
if (!success) { if (!success) {
// if this entity is a child of an avatar, the entity-server wont be able to determine its // if this entity is a child of an avatar, the entity-server wont be able to determine its

3
libraries/shared/src/SpatiallyNestable.cpp
View file

@ -101,13 +101,11 @@ SpatiallyNestablePointer SpatiallyNestable::getParentPointer(bool& success) cons
// we have a _parentID but no parent pointer, or our parent pointer was to the wrong thing // we have a _parentID but no parent pointer, or our parent pointer was to the wrong thing
QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>(); QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>();
if (!parentFinder) { if (!parentFinder) {
qDebug() << "SpatiallyNestable::getParentPointer -- no parentFinder";
success = false; success = false;
return nullptr; return nullptr;
} }
_parent = parentFinder->find(parentID, success); _parent = parentFinder->find(parentID, success);
if (!success) { if (!success) {
qDebug() << "parentFinder failed for " << parentID;
return nullptr; return nullptr;
} }
@ -120,7 +118,6 @@ SpatiallyNestablePointer SpatiallyNestable::getParentPointer(bool& success) cons
if (parent || parentID.isNull()) { if (parent || parentID.isNull()) {
success = true; success = true;
} else { } else {
qDebug() << "SpatiallyNestable::getParentPointer -- couldn't resolve parent: " << parentID;
success = false; success = false;
} }