diff options
| author | AndreaCatania | 2017-11-07 15:22:09 +0100 |
|---|---|---|
| committer | AndreaCatania | 2017-11-07 15:22:09 +0100 |
| commit | 10f879bf883ed364a9b0eafe40aba03c59b6fbfb (patch) | |
| tree | 12965784f364d986bcc226565c4e96d7405fb62c /scene/3d/physics_body.cpp | |
| parent | 9a78efc7c270211e49fd7b2f071b61c706febffc (diff) | |
| download | godot-10f879bf883ed364a9b0eafe40aba03c59b6fbfb.tar.gz godot-10f879bf883ed364a9b0eafe40aba03c59b6fbfb.tar.zst godot-10f879bf883ed364a9b0eafe40aba03c59b6fbfb.zip | |
Diffstat (limited to 'scene/3d/physics_body.cpp')
| -rw-r--r-- | scene/3d/physics_body.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 4c661e6a8..df137f190 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -938,7 +938,7 @@ bool KinematicBody::move_and_collide(const Vector3 &p_motion, Collision &r_colli Transform gt = get_global_transform(); PhysicsServer::MotionResult result; - bool colliding = PhysicsServer::get_singleton()->body_test_motion(get_rid(), gt, p_motion, margin, &result); + bool colliding = PhysicsServer::get_singleton()->body_test_motion(get_rid(), gt, p_motion, &result); if (colliding) { r_collision.collider_metadata = result.collider_metadata; @@ -1041,12 +1041,13 @@ bool KinematicBody::test_move(const Transform &p_from, const Vector3 &p_motion) ERR_FAIL_COND_V(!is_inside_tree(), false); - return PhysicsServer::get_singleton()->body_test_motion(get_rid(), p_from, p_motion, margin); + return PhysicsServer::get_singleton()->body_test_motion(get_rid(), p_from, p_motion); } void KinematicBody::set_safe_margin(float p_margin) { margin = p_margin; + PhysicsServer::get_singleton()->body_set_kinematic_safe_margin(get_rid(), margin); } float KinematicBody::get_safe_margin() const { |