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

Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic

Browse source 
don't zero kinematic velocities when releasing simulation ownership
This commit is contained in:
John Conklin II 2018-09-14 15:18:06 -07:00 committed by GitHub
commit 49e578ebef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -446,8 +446,9 @@ bool EntityMotionState::shouldSendUpdate(uint32_t simulationStep) {
void EntityMotionState::updateSendVelocities() { void EntityMotionState::updateSendVelocities() {
if (!_body->isActive()) { if (!_body->isActive()) {
// make sure all derivatives are zero if (!_body->isKinematicObject()) {
clearObjectVelocities(); clearObjectVelocities();
}
// we pretend we sent the inactive update for this object // we pretend we sent the inactive update for this object
_numInactiveUpdates = 1; _numInactiveUpdates = 1;
} else { } else {

1
libraries/physics/src/PhysicalEntitySimulation.cpp
View file

@ -138,7 +138,6 @@ void PhysicalEntitySimulation::changeEntityInternal(EntityItemPointer entity) {
btRigidBody* body = motionState->getRigidBody(); btRigidBody* body = motionState->getRigidBody();
if (body) { if (body) {
body->forceActivationState(ISLAND_SLEEPING); body->forceActivationState(ISLAND_SLEEPING);
motionState->updateSendVelocities(); // has side-effect of zeroing entity velocities for inactive body
} }
// send packet to remove ownership // send packet to remove ownership