noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #59438 from fabriceci/fix-move-and-collide-reported-collisions

Browse Source 
Fix wrong collision reported on move_and_collide
This commit is contained in:
Rémi Verschelde
2022-04-28 18:47:22 +02:00
committed by GitHub
parent 5a4e478b0f e2812fcb0f
commit 212989d467
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/2d/physics_body_2d.cpp
View File

@@ -58,7 +58,11 @@ Ref<KinematicCollision2D> PhysicsBody2D::_move(const Vector2 &p_distance, bool p
PhysicsServer2D::MotionParameters parameters(get_global_transform(), p_distance, p_margin);
PhysicsServer2D::MotionResult result;
if (move_and_collide(parameters, result, p_test_only)) {
bool collided = move_and_collide(parameters, result, p_test_only);
// Don't report collision when the whole motion is done.
if (collided && result.collision_safe_fraction < 1) {
// Create a new instance when the cached reference is invalid or still in use in script.
if (motion_cache.is_null() || motion_cache->reference_get_count() > 1) {
motion_cache.instantiate();

6
scene/3d/physics_body_3d.cpp
View File

@@ -96,7 +96,11 @@ Ref<KinematicCollision3D> PhysicsBody3D::_move(const Vector3 &p_distance, bool p
parameters.max_collisions = p_max_collisions;
PhysicsServer3D::MotionResult result;
if (move_and_collide(parameters, result, p_test_only)) {
bool collided = move_and_collide(parameters, result, p_test_only);
// Don't report collision when the whole motion is done.
if (collided && result.collision_safe_fraction < 1) {
// Create a new instance when the cached reference is invalid or still in use in script.
if (motion_cache.is_null() || motion_cache->reference_get_count() > 1) {
motion_cache.instantiate();