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

tweak

Browse source
This commit is contained in:
Seth Alves 2015-10-13 13:50:43 -07:00
parent 54eac099b9
commit 8b72f6e7c6
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/avatar/AvatarActionHold.cpp
View file

@ -65,9 +65,6 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
gotLock = withTryWriteLock([&]{ gotLock = withTryWriteLock([&]{
if (_positionalTarget != position || _rotationalTarget != rotation) { if (_positionalTarget != position || _rotationalTarget != rotation) {
auto ownerEntity = _ownerEntity.lock(); auto ownerEntity = _ownerEntity.lock();
if (ownerEntity) {
ownerEntity->setActionDataDirty(true);
}
_positionalTarget = position; _positionalTarget = position;
_rotationalTarget = rotation; _rotationalTarget = rotation;
} }

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

@ -280,11 +280,6 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
} }
_lastStep = simulationStep; _lastStep = simulationStep;
if (_entity->shouldSuppressEdits()) {
return false;
}
if (glm::length2(_serverVelocity) > 0.0f) { if (glm::length2(_serverVelocity) > 0.0f) {
_serverVelocity += _serverAcceleration * dt; _serverVelocity += _serverAcceleration * dt;
_serverVelocity *= powf(1.0f - _body->getLinearDamping(), dt); _serverVelocity *= powf(1.0f - _body->getLinearDamping(), dt);
@ -296,6 +291,10 @@ bool EntityMotionState::remoteSimulationOutOfSync(uint32_t simulationStep) {
return true; return true;
} }
if (_entity->shouldSuppressEdits()) {
return false;
}
// Else we measure the error between current and extrapolated transform (according to expected behavior // Else we measure the error between current and extrapolated transform (according to expected behavior
// of remote EntitySimulation) and return true if the error is significant. // of remote EntitySimulation) and return true if the error is significant.