diff options
author | Juan Linietsky <reduzio@gmail.com> | 2018-08-20 17:31:55 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2018-08-20 17:31:55 -0300 |
commit | d88d0d457d2828db2016f4854efff8c5f8b90e91 (patch) | |
tree | 86cd7e57ec38b9b36b8787dc3cdef3d87d2c1acb /modules/bullet/bullet_physics_server.cpp | |
parent | 031f763d4fda4e0dbcdf90a170aad3124c50c062 (diff) | |
download | redot-engine-d88d0d457d2828db2016f4854efff8c5f8b90e91.tar.gz |
Fixes to move and slide and ray separation, implement separation in Godot physics
Diffstat (limited to 'modules/bullet/bullet_physics_server.cpp')
-rw-r--r-- | modules/bullet/bullet_physics_server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp index 032654c3f7..0139842470 100644 --- a/modules/bullet/bullet_physics_server.cpp +++ b/modules/bullet/bullet_physics_server.cpp @@ -861,12 +861,12 @@ PhysicsDirectBodyState *BulletPhysicsServer::body_get_direct_state(RID p_body) { return BulletPhysicsDirectBodyState::get_singleton(body); } -bool BulletPhysicsServer::body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result) { +bool BulletPhysicsServer::body_test_motion(RID p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, MotionResult *r_result, bool p_exclude_raycast_shapes) { RigidBodyBullet *body = rigid_body_owner.get(p_body); ERR_FAIL_COND_V(!body, false); ERR_FAIL_COND_V(!body->get_space(), false); - return body->get_space()->test_body_motion(body, p_from, p_motion, p_infinite_inertia, r_result); + return body->get_space()->test_body_motion(body, p_from, p_motion, p_infinite_inertia, r_result, p_exclude_raycast_shapes); } int BulletPhysicsServer::body_test_ray_separation(RID p_body, const Transform &p_transform, bool p_infinite_inertia, Vector3 &r_recover_motion, SeparationResult *r_results, int p_result_max, float p_margin) { |