Merge pull request #51487 from nekomatata/fix-moving-platform-3d-snap

Fix 3D character snap on moving platforms
This commit is contained in:
Camille Mohr-Daurat 2021-08-17 08:55:48 -07:00 committed by GitHub
commit 6cea7ebae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1176,11 +1176,6 @@ bool CharacterBody3D::move_and_slide() {
}
}
if (!on_floor && !on_wall) {
// Add last platform velocity when just left a moving platform.
linear_velocity += current_floor_velocity;
}
if (was_on_floor && snap != Vector3()) {
// Apply snap.
Transform3D gt = get_global_transform();
@ -1213,6 +1208,11 @@ bool CharacterBody3D::move_and_slide() {
}
}
if (!on_floor && !on_wall) {
// Add last platform velocity when just left a moving platform.
linear_velocity += current_floor_velocity;
}
return motion_results.size() > 0;
}