godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use difference in position to check whether motion in Bullet is too close 

to zero.
This commit is contained in:
Marcel Admiraal 2020-07-18 13:10:27 +01:00
parent 89f57ae122
commit 98aabe111f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/bullet/space_bullet.cpp
View File

@ -160,9 +160,6 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf
btVector3 bt_motion; btVector3 bt_motion;
G_TO_B(p_motion, bt_motion); G_TO_B(p_motion, bt_motion);
if (bt_motion.fuzzyZero())
return false;
ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape); ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape);
ERR_FAIL_COND_V(!shape, false); ERR_FAIL_COND_V(!shape, false);
@ -181,6 +178,10 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf
btTransform bt_xform_to(bt_xform_from); btTransform bt_xform_to(bt_xform_from);
bt_xform_to.getOrigin() += bt_motion; bt_xform_to.getOrigin() += bt_motion;
if ((bt_xform_to.getOrigin() - bt_xform_from.getOrigin()).fuzzyZero()) {
return false;
}
GodotClosestConvexResultCallback btResult(bt_xform_from.getOrigin(), bt_xform_to.getOrigin(), &p_exclude, p_collide_with_bodies, p_collide_with_areas); GodotClosestConvexResultCallback btResult(bt_xform_from.getOrigin(), bt_xform_to.getOrigin(), &p_exclude, p_collide_with_bodies, p_collide_with_areas);
btResult.m_collisionFilterGroup = 0; btResult.m_collisionFilterGroup = 0;
btResult.m_collisionFilterMask = p_collision_mask; btResult.m_collisionFilterMask = p_collision_mask;
@ -969,7 +970,7 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
motionVec->end(); motionVec->end();
#endif #endif
for (int shIndex = 0; shIndex < shape_count && !motion.fuzzyZero(); ++shIndex) { for (int shIndex = 0; shIndex < shape_count; ++shIndex) {
if (p_body->is_shape_disabled(shIndex)) { if (p_body->is_shape_disabled(shIndex)) {
continue; continue;
} }
@ -991,6 +992,11 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f
btTransform shape_world_to(shape_world_from); btTransform shape_world_to(shape_world_from);
shape_world_to.getOrigin() += motion; shape_world_to.getOrigin() += motion;
if ((shape_world_to.getOrigin() - shape_world_from.getOrigin()).fuzzyZero()) {
motion = btVector3(0, 0, 0);
break;
}
GodotKinClosestConvexResultCallback btResult(shape_world_from.getOrigin(), shape_world_to.getOrigin(), p_body, p_infinite_inertia); GodotKinClosestConvexResultCallback btResult(shape_world_from.getOrigin(), shape_world_to.getOrigin(), p_body, p_infinite_inertia);
btResult.m_collisionFilterGroup = p_body->get_collision_layer(); btResult.m_collisionFilterGroup = p_body->get_collision_layer();
btResult.m_collisionFilterMask = p_body->get_collision_mask(); btResult.m_collisionFilterMask = p_body->get_collision_mask();