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

Merge pull request #30588 from Demiu/patch-1 

Fix 3D move_and_slide with stop_on_slope
This commit is contained in:
Rémi Verschelde 2019-11-07 15:11:53 +01:00 committed by GitHub
parent 77816fea8b fead4e369a
commit d596e169dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/3d/physics_body.cpp
View File

@ -1201,7 +1201,7 @@ Vector3 KinematicBody::move_and_slide(const Vector3 &p_linear_velocity, const Ve
if (p_stop_on_slope) { if (p_stop_on_slope) {
if ((lv_n + p_floor_direction).length() < 0.01 && collision.travel.length() < 1) { if ((lv_n + p_floor_direction).length() < 0.01 && collision.travel.length() < 1) {
Transform gt = get_global_transform(); Transform gt = get_global_transform();
gt.origin -= collision.travel; gt.origin -= collision.travel.slide(p_floor_direction);
set_global_transform(gt); set_global_transform(gt);
return Vector3(); return Vector3();
} }
@ -1265,7 +1265,7 @@ Vector3 KinematicBody::move_and_slide_with_snap(const Vector3 &p_linear_velocity
if (p_stop_on_slope) { if (p_stop_on_slope) {
// move and collide may stray the object a bit because of pre un-stucking, // 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. // so only ensure that motion happens on floor direction in this case.
col.travel = p_floor_direction * p_floor_direction.dot(col.travel); col.travel = col.travel.project(p_floor_direction);
} }
} 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.