godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change snapping to only happen when the floor normal remains as floor, fixes #22312

Browse Source
This commit is contained in:
Juan Linietsky 2019-02-16 15:49:55 -03:00
parent 1aadb9f454
commit 0cee7ab4c9
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scene/2d/physics_body_2d.cpp
View File

@ -1338,13 +1338,21 @@ Vector2 KinematicBody2D::move_and_slide_with_snap(const Vector2 &p_linear_veloci
Transform2D gt = get_global_transform(); Transform2D gt = get_global_transform();
if (move_and_collide(p_snap, p_infinite_inertia, col, false, true)) { if (move_and_collide(p_snap, p_infinite_inertia, col, false, true)) {
gt.elements[2] += col.travel; bool apply = true;
if (p_floor_direction != Vector2() && Math::acos(p_floor_direction.normalized().dot(col.normal)) < p_floor_max_angle) { if (p_floor_direction != Vector2()) {
on_floor = true; if (Math::acos(p_floor_direction.normalized().dot(col.normal)) < p_floor_max_angle) {
on_floor_body = col.collider_rid; on_floor = true;
floor_velocity = col.collider_vel; on_floor_body = col.collider_rid;
floor_velocity = col.collider_vel;
} else {
apply = false;
}
}
if (apply) {
gt.elements[2] += col.travel;
set_global_transform(gt);
} }
set_global_transform(gt);
} }
return ret; return ret;

20
scene/3d/physics_body.cpp
View File

@ -1281,13 +1281,21 @@ Vector3 KinematicBody::move_and_slide_with_snap(const Vector3 &p_linear_velocity
Transform gt = get_global_transform(); Transform gt = get_global_transform();
if (move_and_collide(p_snap, p_infinite_inertia, col, true)) { if (move_and_collide(p_snap, p_infinite_inertia, col, true)) {
gt.origin += col.travel;
if (p_floor_direction != Vector3() && Math::acos(p_floor_direction.normalized().dot(col.normal)) < p_floor_max_angle) { bool apply = true;
on_floor = true; if (p_floor_direction != Vector3()) {
on_floor_body = col.collider_rid; if (Math::acos(p_floor_direction.normalized().dot(col.normal)) < p_floor_max_angle) {
floor_velocity = col.collider_vel; on_floor = true;
on_floor_body = col.collider_rid;
floor_velocity = col.collider_vel;
} else {
apply = false; //snapped with floor direction, but did not snap to a floor, do not snap.
}
}
if (apply) {
gt.origin += col.travel;
set_global_transform(gt);
} }
set_global_transform(gt);
} }
return ret; return ret;