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/space_bullet.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/space_bullet.cpp')
| -rw-r--r-- | modules/bullet/space_bullet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp index c0fea910c2..e1a4e88db0 100644 --- a/modules/bullet/space_bullet.cpp +++ b/modules/bullet/space_bullet.cpp @@ -819,7 +819,7 @@ static Ref<SpatialMaterial> red_mat; static Ref<SpatialMaterial> blue_mat; #endif -bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, PhysicsServer::MotionResult *r_result) { +bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, PhysicsServer::MotionResult *r_result, bool p_exclude_raycast_shapes) { #if debug_test_motion /// Yes I know this is not good, but I've used it as fast debugging hack. @@ -895,7 +895,7 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f continue; } - if (p_body->get_bt_shape(shIndex)->getShapeType() == CUSTOM_CONVEX_SHAPE_TYPE) { + if (p_exclude_raycast_shapes && p_body->get_bt_shape(shIndex)->getShapeType() == CUSTOM_CONVEX_SHAPE_TYPE) { // Skip rayshape in order to implement custom separation process continue; } |