bullet cast_motion: reordered null check
This commit is contained in:
parent
82ad05a20e
commit
5dac3e857f
1 changed files with 3 additions and 3 deletions
|
@ -175,13 +175,13 @@ 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 (r_info) {
|
||||
if (btResult.hasHit()) {
|
||||
p_closest_safe = p_closest_unsafe = btResult.m_closestHitFraction;
|
||||
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);
|
||||
}
|
||||
CollisionObjectBullet *collision_object = static_cast<CollisionObjectBullet *>(btResult.m_hitCollisionObject->getUserPointer());
|
||||
p_closest_safe = p_closest_unsafe = btResult.m_closestHitFraction;
|
||||
B_TO_G(btResult.m_hitPointWorld, r_info->point);
|
||||
B_TO_G(btResult.m_hitNormalWorld, r_info->normal);
|
||||
r_info->rid = collision_object->get_self();
|
||||
|
|
Loading…
Reference in a new issue