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

Fix PathFollow2D motion. 

Fixes #13361.
This commit is contained in:
Ferenc Arn 2017-11-29 21:57:48 -05:00 committed by Rémi Verschelde
parent 9725f33ac6
commit 40a7b7e391
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scene/2d/path_2d.cpp
View File

@ -117,29 +117,27 @@ void PathFollow2D::_update_transform() {
Vector2 pos = c->interpolate_baked(o, cubic);
Vector2 offset = Vector2(h_offset, v_offset);
Transform2D t = get_transform();
t.set_origin(pos);
Vector2 displacement_offset = Vector2(h_offset, v_offset);
if (rotate) {
Vector2 t_prev = (pos - c->interpolate_baked(o - delta_offset, cubic)).normalized();
Vector2 t_cur = (c->interpolate_baked(o + delta_offset, cubic) - pos).normalized();
Vector2 t_next = (c->interpolate_baked(o + delta_offset, cubic) - pos).normalized();
float dot = t_prev.dot(t_cur);
float angle = Math::acos(CLAMP(dot, -1, 1));
float angle = t_prev.angle_to(t_next);
t.rotate(angle);
set_rotation(get_rotation() + angle);
t.translate(offset);
Vector2 n = t_next;
Vector2 t = -n.tangent();
pos += n * h_offset + t * v_offset;
} else {
t.set_origin(t.get_origin() + offset);
pos += displacement_offset;
}
set_transform(t);
set_position(pos);
}
void PathFollow2D::_notification(int p_what) {