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

computeMotionType() returns KINEMATIC for things with grab

Browse source
This commit is contained in:
Andrew Meadows 2019-01-23 21:30:15 -08:00
parent 965d0ccf60
commit d948168727
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -211,6 +211,7 @@ PhysicsMotionType EntityMotionState::computePhysicsMotionType() const {
} }
if (_entity->isMovingRelativeToParent() || if (_entity->isMovingRelativeToParent() ||
_entity->hasActions() || _entity->hasActions() ||
_entity->hasGrabs() ||
_entity->hasAncestorOfType(NestableType::Avatar)) { _entity->hasAncestorOfType(NestableType::Avatar)) {
return MOTION_TYPE_KINEMATIC; return MOTION_TYPE_KINEMATIC;
} }
@ -767,6 +768,7 @@ bool EntityMotionState::shouldSendBid() const {
// NOTE: this method is only ever called when the entity's simulation is NOT locally owned // NOTE: this method is only ever called when the entity's simulation is NOT locally owned
return _body->isActive() return _body->isActive()
&& (_region == workload::Region::R1) && (_region == workload::Region::R1)
&& _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();
} }