|
@@ -152,6 +152,15 @@ int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Tra
|
|
|
}
|
|
|
|
|
|
bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &r_closest_safe, float &r_closest_unsafe, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_collide_with_bodies, bool p_collide_with_areas, ShapeRestInfo *r_info) {
|
|
|
+ r_closest_safe = 0.0f;
|
|
|
+ r_closest_unsafe = 0.0f;
|
|
|
+ btVector3 bt_motion;
|
|
|
+ G_TO_B(p_motion, bt_motion);
|
|
|
+
|
|
|
+ if (bt_motion.fuzzyZero()) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->getornull(p_shape);
|
|
|
|
|
|
btCollisionShape *btShape = shape->create_bt_shape(p_xform.basis.get_scale(), p_margin);
|
|
@@ -162,9 +171,6 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf
|
|
|
}
|
|
|
btConvexShape *bt_convex_shape = static_cast<btConvexShape *>(btShape);
|
|
|
|
|
|
- btVector3 bt_motion;
|
|
|
- G_TO_B(p_motion, bt_motion);
|
|
|
-
|
|
|
btTransform bt_xform_from;
|
|
|
G_TO_B(p_xform, bt_xform_from);
|
|
|
UNSCALE_BT_BASIS(bt_xform_from);
|
|
@@ -178,9 +184,6 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf
|
|
|
|
|
|
space->dynamicsWorld->convexSweepTest(bt_convex_shape, bt_xform_from, bt_xform_to, btResult, space->dynamicsWorld->getDispatchInfo().m_allowedCcdPenetration);
|
|
|
|
|
|
- r_closest_unsafe = 1.0;
|
|
|
- r_closest_safe = 1.0;
|
|
|
-
|
|
|
if (btResult.hasHit()) {
|
|
|
const btScalar l = bt_motion.length();
|
|
|
r_closest_unsafe = btResult.m_closestHitFraction;
|
|
@@ -196,6 +199,9 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf
|
|
|
r_info->collider_id = collision_object->get_instance_id();
|
|
|
r_info->shape = btResult.m_shapeId;
|
|
|
}
|
|
|
+ } else {
|
|
|
+ r_closest_safe = 1.0f;
|
|
|
+ r_closest_unsafe = 1.0f;
|
|
|
}
|
|
|
|
|
|
bulletdelete(bt_convex_shape);
|