Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 10:26:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

isMovingVsServer function

Browse source
This commit is contained in:
Seth Alves 2015-05-06 16:13:07 -07:00
parent e73503a53d
commit 630f1ce9d9
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,6 +93,15 @@ bool EntityMotionState::isMoving() const {
return _entity && _entity->isMoving(); return _entity && _entity->isMoving();
} }
bool EntityMotionState::isMovingVsServer() const {
auto alignmentDot = glm::abs(glm::dot(_sentRotation, _entity->getRotation()));
if (glm::distance(_sentPosition, _entity->getPosition()) > IGNORE_POSITION_DELTA ||
alignmentDot < IGNORE_ALIGNMENT_DOT) {
return true;
}
return false;
}
// This callback is invoked by the physics simulation in two cases: // This callback is invoked by the physics simulation in two cases:
// (1) when the RigidBody is first added to the world // (1) when the RigidBody is first added to the world
// (irregardless of MotionType: STATIC, DYNAMIC, or KINEMATIC) // (irregardless of MotionType: STATIC, DYNAMIC, or KINEMATIC)
@ -133,15 +142,9 @@ void EntityMotionState::setWorldTransform(const btTransform& worldTrans) {
_entity->setLastSimulated(usecTimestampNow()); _entity->setLastSimulated(usecTimestampNow());
// if (_entity->getSimulatorID().isNull() && isMoving()) { // if (_entity->getSimulatorID().isNull() && isMoving()) {
if (_entity->getSimulatorID().isNull()) { if (_entity->getSimulatorID().isNull() && isMovingVsServer()) {
// if object is moving and has no owner, attempt to claim simulation ownership. // if object is moving and has no owner, attempt to claim simulation ownership.
auto alignmentDot = glm::abs(glm::dot(_sentRotation, _entity->getRotation())); _movingStepsWithoutSimulationOwner++;
if (glm::distance(_sentPosition, _entity->getPosition()) > IGNORE_POSITION_DELTA ||
alignmentDot < IGNORE_ALIGNMENT_DOT) {
_movingStepsWithoutSimulationOwner++;
} else {
_movingStepsWithoutSimulationOwner = 0;
}
} else { } else {
_movingStepsWithoutSimulationOwner = 0; _movingStepsWithoutSimulationOwner = 0;
} }

1
libraries/physics/src/EntityMotionState.h
View file

@ -36,6 +36,7 @@ public:
virtual MotionType computeObjectMotionType() const; virtual MotionType computeObjectMotionType() const;
virtual bool isMoving() const; virtual bool isMoving() const;
virtual bool isMovingVsServer() const;
// this relays incoming position/rotation to the RigidBody // this relays incoming position/rotation to the RigidBody
virtual void getWorldTransform(btTransform& worldTrans) const; virtual void getWorldTransform(btTransform& worldTrans) const;