asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Ensure move and slide snap respects stop on slope, fixes #26180

Browse source
This commit is contained in:
Juan Linietsky 2019-02-23 10:23:38 -03:00
parent 24097811e4
commit 9dfe3b6d9e
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/2d/physics_body_2d.cpp
View file

@ -1341,6 +1341,12 @@ Vector2 KinematicBody2D::move_and_slide_with_snap(const Vector2 &p_linear_veloci
on_floor = true; on_floor = true;
on_floor_body = col.collider_rid; on_floor_body = col.collider_rid;
floor_velocity = col.collider_vel; floor_velocity = col.collider_vel;
if (p_stop_on_slope) {
// move and collide may stray the object a bit because of pre un-stucking,
// so only ensure that motion happens on floor direction in this case.
col.travel = p_floor_direction * p_floor_direction.dot(col.travel);
}
} else { } else {
apply = false; apply = false;
} }

5
scene/3d/physics_body.cpp
View file

@ -1288,6 +1288,11 @@ Vector3 KinematicBody::move_and_slide_with_snap(const Vector3 &p_linear_velocity
on_floor = true; on_floor = true;
on_floor_body = col.collider_rid; on_floor_body = col.collider_rid;
floor_velocity = col.collider_vel; floor_velocity = col.collider_vel;
if (p_stop_on_slope) {
// move and collide may stray the object a bit because of pre un-stucking,
// so only ensure that motion happens on floor direction in this case.
col.travel = p_floor_direction * p_floor_direction.dot(col.travel);
}
} else { } else {
apply = false; //snapped with floor direction, but did not snap to a floor, do not snap. apply = false; //snapped with floor direction, but did not snap to a floor, do not snap.
} }