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

handle deactivation of avatar entities differently

Browse source
This commit is contained in:
Andrew Meadows 2018-06-25 10:36:36 -07:00
parent b7069fff71
commit 5e2a08b3c2
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/physics/src/PhysicalEntitySimulation.cpp
View file

@ -312,11 +312,26 @@ void PhysicalEntitySimulation::handleDeactivatedMotionStates(const VectorOfMotio
assert(state); assert(state);
if (state->getType() == MOTIONSTATE_TYPE_ENTITY) { if (state->getType() == MOTIONSTATE_TYPE_ENTITY) {
EntityMotionState* entityState = static_cast<EntityMotionState*>(state); EntityMotionState* entityState = static_cast<EntityMotionState*>(state);
if (!serverlessMode) {
entityState->handleDeactivation();
}
EntityItemPointer entity = entityState->getEntity(); EntityItemPointer entity = entityState->getEntity();
_entitiesToSort.insert(entity); _entitiesToSort.insert(entity);
if (!serverlessMode) {
if (entity->getClientOnly()) {
switch (entityState->getOwnershipState()) {
case EntityMotionState::OwnershipState::PendingBid:
_bids.removeFirst(entityState);
entityState->clearOwnershipState();
break;
case EntityMotionState::OwnershipState::LocallyOwned:
_owned.removeFirst(entityState);
entityState->clearOwnershipState();
break;
default:
break;
}
} else {
entityState->handleDeactivation();
}
}
} }
} }
} }

8
libraries/physics/src/PhysicalEntitySimulation.h
View file

@ -37,6 +37,14 @@ public:
} }
pop_back(); pop_back();
} }
void removeFirst(EntityMotionState* state) {
for (uint32_t i = 0; i < size(); ++i) {
if ((*this)[i] == state) {
remove(i);
break;
}
}
}
}; };
class PhysicalEntitySimulation : public EntitySimulation { class PhysicalEntitySimulation : public EntitySimulation {