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

don't bid for sim ownership of kinematic unless grabbed

Browse source
This commit is contained in:
Andrew Meadows 2019-09-06 08:57:10 -07:00
parent 227b99859d
commit e546ef23a8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -740,7 +740,8 @@ bool EntityMotionState::shouldSendBid() const {
&& (_region == workload::Region::R1) && (_region == workload::Region::R1)
&& _ownershipState != EntityMotionState::OwnershipState::Unownable && _ownershipState != EntityMotionState::OwnershipState::Unownable
&& glm::max(glm::max(VOLUNTEER_SIMULATION_PRIORITY, _bumpedPriority), _entity->getScriptSimulationPriority()) >= _entity->getSimulationPriority() && glm::max(glm::max(VOLUNTEER_SIMULATION_PRIORITY, _bumpedPriority), _entity->getScriptSimulationPriority()) >= _entity->getSimulationPriority()
&& !_entity->getLocked(); && !_entity->getLocked()
&& (!_body->isStaticOrKinematicObject() || _entity->stillHasMyGrab());
} }
void EntityMotionState::setRigidBody(btRigidBody* body) { void EntityMotionState::setRigidBody(btRigidBody* body) {