Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 12:53:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't assign null Shape to RigidBody already in physics simulation

Browse source
This commit is contained in:
Andrew Meadows 2018-11-05 11:13:32 -08:00
parent d0181283dd
commit c6cde2d412
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/physics/src/ObjectMotionState.cpp
View file

@ -305,15 +305,16 @@ bool ObjectMotionState::handleHardAndEasyChanges(uint32_t& flags, PhysicsEngine*
} }
return true; return true;
} }
}
if (_shape == newShape) {
// the shape didn't actually change, so we clear the DIRTY_SHAPE flag
flags &= ~Simulation::DIRTY_SHAPE;
// and clear the reference we just created
getShapeManager()->releaseShape(_shape);
} else { } else {
_body->setCollisionShape(const_cast<btCollisionShape*>(newShape)); if (_shape == newShape) {
setShape(newShape); // the shape didn't actually change, so we clear the DIRTY_SHAPE flag
flags &= ~Simulation::DIRTY_SHAPE;
// and clear the reference we just created
getShapeManager()->releaseShape(_shape);
} else {
_body->setCollisionShape(const_cast<btCollisionShape*>(newShape));
setShape(newShape);
}
} }
} }
if (flags & EASY_DIRTY_PHYSICS_FLAGS) { if (flags & EASY_DIRTY_PHYSICS_FLAGS) {