Fixed ccd enabled by default on Bullet bodies
It was due to main_shape_changed being called two times for each
added body. The first time it disables ccd, which sets the internal ccd
threshold to be 10000. The second time, it enables ccd again because
the internal threshold is > 0.
Bodies are now consistently set with a ccd threshold of 0 when ccd is
disabled.
This was causing crashing asserts in Bullet when adding bodies in some
scenarios, in btVector3::normalize():
btAssert(!fuzzyZero());
These crashes will still happen with ccd enabled.
(cherry picked from commit faca8b77aa
)
This commit is contained in:
parent
5d7b3e10ee
commit
622ef48dae
1 changed files with 2 additions and 2 deletions
|
@ -766,7 +766,7 @@ void RigidBodyBullet::set_continuous_collision_detection(bool p_enable) {
|
|||
}
|
||||
btBody->setCcdSweptSphereRadius(radius * 0.2);
|
||||
} else {
|
||||
btBody->setCcdMotionThreshold(10000.0);
|
||||
btBody->setCcdMotionThreshold(0.);
|
||||
btBody->setCcdSweptSphereRadius(0.);
|
||||
}
|
||||
}
|
||||
|
@ -846,7 +846,7 @@ void RigidBodyBullet::reload_shapes() {
|
|||
btBody->updateInertiaTensor();
|
||||
|
||||
reload_kinematic_shapes();
|
||||
set_continuous_collision_detection(btBody->getCcdMotionThreshold() < 9998.0);
|
||||
set_continuous_collision_detection(is_continuous_collision_detection_enabled());
|
||||
reload_body();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue