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

trying another solution

Browse source
This commit is contained in:
Dante Ruiz 2018-01-30 10:23:19 -08:00
parent bed2ea052d
commit 4c0a173287
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ public:
EntityTree::EntityTree(bool shouldReaverage) : EntityTree::EntityTree(bool shouldReaverage) :
Octree(shouldReaverage), _needsParentFixupLock(QReadWriteLock::Recursive) Octree(shouldReaverage)
{ {
resetClientEditStats(); resetClientEditStats();
@ -1682,10 +1682,14 @@ void EntityTree::entityChanged(EntityItemPointer entity) {
void EntityTree::fixupNeedsParentFixups() { void EntityTree::fixupNeedsParentFixups() {
PROFILE_RANGE(simulation_physics, "FixupParents"); PROFILE_RANGE(simulation_physics, "FixupParents");
MovingEntitiesOperator moveOperator; MovingEntitiesOperator moveOperator;
QVector<EntityItemWeakPointer> entitiesToFixup;
{
QWriteLocker locker(&_needsParentFixupLock); QWriteLocker locker(&_needsParentFixupLock);
entitiesToFixup = _needsParentFixup;
_needsParentFixup.clear();
}
QMutableVectorIterator<EntityItemWeakPointer> iter(_needsParentFixup); QMutableVectorIterator<EntityItemWeakPointer> iter(entitiesToFixup);
while (iter.hasNext()) { while (iter.hasNext()) {
EntityItemWeakPointer entityWP = iter.next(); EntityItemWeakPointer entityWP = iter.next();
EntityItemPointer entity = entityWP.lock(); EntityItemPointer entity = entityWP.lock();
@ -1748,6 +1752,12 @@ void EntityTree::fixupNeedsParentFixups() {
PerformanceTimer perfTimer("recurseTreeWithOperator"); PerformanceTimer perfTimer("recurseTreeWithOperator");
recurseTreeWithOperator(&moveOperator); recurseTreeWithOperator(&moveOperator);
} }
{
QWriteLocker locker(&_needsParentFixupLock);
// add back the entities that did not get fixup
_needsParentFixup.append(entitiesToFixup);
}
} }
void EntityTree::deleteDescendantsOfAvatar(QUuid avatarID) { void EntityTree::deleteDescendantsOfAvatar(QUuid avatarID) {