Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 3D character snap on moving platforms #51487

Merged
merged 1 commit into from
Aug 17, 2021
Merged

Fix 3D character snap on moving platforms #51487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions scene/3d/physics_body_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
}

Expand Down