Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 07:13:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug causing sim ownership thrash

Browse source
This commit is contained in:
Andrew Meadows 2018-01-04 12:07:00 -08:00
parent 7e01f97f8f
commit 6638b1deae
1 changed files with 6 additions and 2 deletions

8
libraries/physics/src/EntityMotionState.cpp
View file

@ -155,7 +155,7 @@ void EntityMotionState::handleEasyChanges(uint32_t& flags) {
// (1) we own it but may need to change the priority OR...
// (2) we don't own it but should bid (because a local script has been changing physics properties)
uint8_t newPriority = isLocallyOwned() ? _entity->getSimulationOwner().getPriority() : _entity->getSimulationOwner().getPendingPriority();
_outgoingPriority = glm::max(_outgoingPriority, newPriority);
upgradeOutgoingPriority(newPriority);
// reset bid expiry so that we bid ASAP
_nextOwnershipBid = 0;
@ -403,7 +403,8 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
}
if (_entity->dynamicDataNeedsTransmit()) {
_outgoingPriority = _entity->hasActions() ? SCRIPT_GRAB_SIMULATION_PRIORITY : SCRIPT_POKE_SIMULATION_PRIORITY;
uint8_t priority = _entity->hasActions() ? SCRIPT_GRAB_SIMULATION_PRIORITY : SCRIPT_POKE_SIMULATION_PRIORITY;
upgradeOutgoingPriority(priority);
return true;
}
@ -513,6 +514,9 @@ bool EntityMotionState::shouldSendUpdate(uint32_t simulationStep) {
_nextOwnershipBid = usecTimestampNow() + USECS_BETWEEN_OWNERSHIP_BIDS;
}
return shouldBid;
} else {
// make sure _outgoingPriority is not less than current owned priority
upgradeOutgoingPriority(_entity->getSimulationPriority());
}
return remoteSimulationOutOfSync(simulationStep);