maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Correctly set safe_motion on cast_motion query Fixes: #21212

Browse source
This commit is contained in:
Andrea Catania 2018-08-26 12:09:52 +02:00
parent 2e722caead
commit 64b5eaf43c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/bullet/space_bullet.cpp
View file

@ -178,7 +178,9 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf
space->dynamicsWorld->convexSweepTest(bt_convex_shape, bt_xform_from, bt_xform_to, btResult, 0.002);
if (btResult.hasHit()) {
p_closest_safe = p_closest_unsafe = btResult.m_closestHitFraction;
const btScalar l = bt_motion.length();
p_closest_unsafe = btResult.m_closestHitFraction;
p_closest_safe = MAX(p_closest_unsafe - (1 - ((l - 0.01) / l)), 0);
if (r_info) {
if (btCollisionObject::CO_RIGID_BODY == btResult.m_hitCollisionObject->getInternalType()) {
B_TO_G(static_cast<const btRigidBody *>(btResult.m_hitCollisionObject)->getVelocityInLocalPoint(btResult.m_hitPointWorld), r_info->linear_velocity);