From c7432ffe5f483638ceb50794476873e21ff353c9 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 9 May 2019 13:48:07 -0700 Subject: [PATCH] also update easy flags when rebuilding avatar shape --- interface/src/avatar/AvatarManager.cpp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index ac74d0ab20..51fcaf0357 100755 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -504,23 +504,18 @@ void AvatarManager::buildPhysicsTransaction(PhysicsEngine::Transaction& transact } } else if (isInPhysics) { AvatarMotionState* motionState = avatar->_motionState; + uint32_t flags = motionState->getIncomingDirtyFlags(); + if (flags & EASY_DIRTY_PHYSICS_FLAGS) { + motionState->handleEasyChanges(flags); + } + // NOTE: we don't call detailedMotionState->handleEasyChanges() here because they are KINEMATIC + // and Bullet will automagically call DetailedMotionState::getWorldTransform() on all that are active. + if (motionState->needsNewShape()) { rebuildAvatarPhysics(transaction, avatar); - } else { - uint32_t flags = motionState->getIncomingDirtyFlags(); + } else if (flags & (Simulation::DIRTY_MOTION_TYPE | Simulation::DIRTY_COLLISION_GROUP)) { + transaction.objectsToReinsert.push_back(motionState); motionState->clearIncomingDirtyFlags(); - if (flags & EASY_DIRTY_PHYSICS_FLAGS) { - motionState->handleEasyChanges(flags); - } - // NOTE: we don't call detailedMotionState->handleEasyChanges() here because they are KINEMATIC - // and Bullet will automagically call DetailedMotionState::getWorldTransform() on all that are active. - - if (flags & (Simulation::DIRTY_MOTION_TYPE | Simulation::DIRTY_COLLISION_GROUP)) { - transaction.objectsToReinsert.push_back(motionState); - for (auto detailedMotionState : avatar->getDetailedMotionStates()) { - transaction.objectsToReinsert.push_back(detailedMotionState); - } - } } } }